Revert "Don't hold css::uno::Type instances by pointer"

This reverts commit 90f91088d238469b4a2262c91de3117ba40f5bde for now:
Ach, old GCC doesn't like plain string literals to initialize members
of OUString type...

Change-Id: I50563a00406259bb5d41831e2a2796762450d097

89 files changed, 4524 insertions, 4474 deletions

diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 8d8e8e8a1920..8c563b1f1f0a 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -61,6 +61,7 @@ using ::osl::MutexGuard;
 namespace
 {
 #define LOCAL_CONST_STR(i, x) sal_Char const i[sizeof(x)] = x
+#define MAP_LEN(x) x, sizeof(x) - 1
 
 LOCAL_CONST_STR( sXML_metaStreamName,       "meta.xml");
 LOCAL_CONST_STR( sXML_styleStreamName,      "styles.xml" );
@@ -339,28 +340,28 @@ sal_Int32 XMLFilter::impl_Import(
 
         // create XPropertySet with extra informatio for the filter
         /** property map for import info set */
-        comphelper::PropertyMapEntry const aImportInfoMap[] =
+        comphelper::PropertyMapEntry aImportInfoMap[] =
         {
             // necessary properties for XML progress bar at load time
-            { "ProgressRange",   0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "ProgressMax",     0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "ProgressCurrent", 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "PrivateData", 0,
-                ::getCppuType( (Reference<XInterface> *)0 ),
+            { MAP_LEN( "ProgressRange" ),   0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "ProgressMax" ),     0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "PrivateData" ), 0,
+                &::getCppuType( (Reference<XInterface> *)0 ),
                 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "BaseURI", 0,
-                ::getCppuType( (OUString *)0 ),
+            { MAP_LEN( "BaseURI" ), 0,
+                &::getCppuType( (OUString *)0 ),
                 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamRelPath", 0,
-                ::getCppuType( (OUString *)0 ),
+            { MAP_LEN( "StreamRelPath" ), 0,
+                &::getCppuType( (OUString *)0 ),
                 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamName", 0,
-                ::getCppuType( (OUString *)0 ),
+            { MAP_LEN( "StreamName" ), 0,
+                &::getCppuType( (OUString *)0 ),
                 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "BuildId", 0,
-                ::getCppuType( (OUString *)0 ),
+            { MAP_LEN( "BuildId" ), 0,
+                &::getCppuType( (OUString *)0 ),
                 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            {}
+            { NULL, 0, 0, NULL, 0, 0 }
         };
         uno::Reference< beans::XPropertySet > xImportInfo(
                     comphelper::GenericPropertySet_CreateInstance(
@@ -613,14 +614,14 @@ sal_Int32 XMLFilter::impl_Export(
             m_xContext, xStorage );
 
         // property map for export info set
-        comphelper::PropertyMapEntry const aExportInfoMap[] =
+        comphelper::PropertyMapEntry aExportInfoMap[] =
         {
-            { "UsePrettyPrinting", 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
-            { "BaseURI", 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamRelPath", 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamName", 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "ExportTableNumberList", 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
-            {}
+            { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
+            { NULL, 0, 0, NULL, 0, 0 }
         };
 
         uno::Reference< beans::XPropertySet > xInfoSet =
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 24eb6d9c78d6..3e305b94506a 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -55,22 +55,22 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
 {
     static const SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] =
     {
-        {"ShowPositiveError",0,getBooleanCppuType(), 0, 0},
-        {"ShowNegativeError",1,getBooleanCppuType(), 0, 0},
-        {"PositiveError",2,getCppuType((const double*)0),0,0},
-        {"NegativeError",3,getCppuType((const double*)0), 0, 0},
-        {"PercentageError",4,getCppuType((const double*)0), 0, 0},
-        {"ErrorBarStyle",5,getCppuType((sal_Int32*)0),0,0},
-        {"ErrorBarRangePositive",6,getCppuType((OUString*)0),0,0}, // read-only for export
-        {"ErrorBarRangeNegative",7,getCppuType((OUString*)0),0,0}, // read-only for export
-        {"Weight",8,getCppuType((const double*)0),0,0},
-        {"LineStyle",9,getCppuType((com::sun::star::drawing::LineStyle*)0),0,0},
-        {"LineDash",10,getCppuType((drawing::LineDash*)0),0,0},
-        {"LineWidth",11,getCppuType((sal_Int32*)0),0,0},
-        {"LineColor",12,getCppuType((com::sun::star::util::Color*)0),0,0},
-        {"LineTransparence",13,getCppuType((sal_Int16*)0),0,0},
-        {"LineJoint",14,getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},
-        {}
+        {MAP_CHAR_LEN("ShowPositiveError"),0,&getBooleanCppuType(), 0, 0},
+        {MAP_CHAR_LEN("ShowNegativeError"),1,&getBooleanCppuType(), 0, 0},
+        {MAP_CHAR_LEN("PositiveError"),2,&getCppuType((const double*)0),0,0},
+        {MAP_CHAR_LEN("NegativeError"),3,&getCppuType((const double*)0), 0, 0},
+        {MAP_CHAR_LEN("PercentageError"),4,&getCppuType((const double*)0), 0, 0},
+        {MAP_CHAR_LEN("ErrorBarStyle"),5,&getCppuType((sal_Int32*)0),0,0},
+        {MAP_CHAR_LEN("ErrorBarRangePositive"),6,&getCppuType((OUString*)0),0,0}, // read-only for export
+        {MAP_CHAR_LEN("ErrorBarRangeNegative"),7,&getCppuType((OUString*)0),0,0}, // read-only for export
+        {MAP_CHAR_LEN("Weight"),8,&getCppuType((const double*)0),0,0},
+        {MAP_CHAR_LEN("LineStyle"),9,&getCppuType((com::sun::star::drawing::LineStyle*)0),0,0},
+        {MAP_CHAR_LEN("LineDash"),10,&getCppuType((drawing::LineDash*)0),0,0},
+        {MAP_CHAR_LEN("LineWidth"),11,&getCppuType((sal_Int32*)0),0,0},
+        {MAP_CHAR_LEN("LineColor"),12,&getCppuType((com::sun::star::util::Color*)0),0,0},
+        {MAP_CHAR_LEN("LineTransparence"),13,&getCppuType((sal_Int16*)0),0,0},
+        {MAP_CHAR_LEN("LineJoint"),14,&getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
     return &aPropSet;
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index e5d52a7546d0..feb803ef1dad 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -157,14 +157,15 @@ void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries,
 
     while( *ppEntries )
     {
-        OInterfaceContainerHelper * pHelper = m_aListener.getContainer((*ppEntries)->maName);
+        const OUString aPropertyName( (*ppEntries)->mpName, (*ppEntries)->mnNameLen, RTL_TEXTENCODING_ASCII_US );
+        OInterfaceContainerHelper * pHelper = m_aListener.getContainer(aPropertyName);
 
-        maAnyMap[ (*ppEntries)->maName ] = *pValues;
+        maAnyMap[ aPropertyName ] = *pValues;
 
         if ( pHelper )
         {
             PropertyChangeEvent aEvt;
-            aEvt.PropertyName = (*ppEntries)->maName;
+            aEvt.PropertyName = aPropertyName;
             aEvt.NewValue = *pValues;
             aGuard.clear();
             pHelper->notifyEach( &XPropertyChangeListener::propertyChange, aEvt );
@@ -183,7 +184,8 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry*
 
     while( *ppEntries )
     {
-        *pValue = maAnyMap[ (*ppEntries)->maName ];
+        const OUString aPropertyName( (*ppEntries)->mpName, (*ppEntries)->mnNameLen, RTL_TEXTENCODING_ASCII_US );
+        *pValue = maAnyMap[ aPropertyName ];
 
         ppEntries++;
         pValue++;
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 21cea0cc30bf..e1422cf21f3f 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -35,13 +35,13 @@ namespace comphelper
 class PropertySetHelperImpl
 {
 public:
-    PropertyMapEntry const * find( const OUString& aName ) const throw();
+    PropertyMapEntry* find( const OUString& aName ) const throw();
 
     PropertySetInfo* mpInfo;
 };
 }
 
-PropertyMapEntry const * PropertySetHelperImpl::find( const OUString& aName ) const throw()
+PropertyMapEntry* PropertySetHelperImpl::find( const OUString& aName ) const throw()
 {
     PropertyMap::const_iterator aIter = mpInfo->getPropertyMap()->find( aName );
 
@@ -84,7 +84,7 @@ Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo(  )
 
 void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
-    PropertyMapEntry const * aEntries[2];
+    PropertyMapEntry* aEntries[2];
     aEntries[0] = mp->find( aPropertyName );
 
     if( NULL == aEntries[0] )
@@ -97,7 +97,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName
 
 Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
-    PropertyMapEntry const * aEntries[2];
+    PropertyMapEntry* aEntries[2];
     aEntries[0] = mp->find( PropertyName );
 
     if( NULL == aEntries[0] )
@@ -141,7 +141,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >&
 
     if( nCount )
     {
-        PropertyMapEntry const ** pEntries = new PropertyMapEntry const *[nCount+1];
+        PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1];
         pEntries[nCount] = NULL;
         const OUString* pNames = aPropertyNames.getConstArray();
 
@@ -170,7 +170,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< O
     Sequence< Any > aValues;
     if( nCount )
     {
-        PropertyMapEntry const ** pEntries = new PropertyMapEntry const *[nCount+1];
+        PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1];
         pEntries[nCount] = NULL;
         const OUString* pNames = aPropertyNames.getConstArray();
 
@@ -215,7 +215,7 @@ void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUSt
 // XPropertyState
 PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
-    PropertyMapEntry const * aEntries[2];
+    PropertyMapEntry* aEntries[2];
 
     aEntries[0] = mp->find( PropertyName );
     if( aEntries[0] == NULL )
@@ -241,7 +241,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S
 
         sal_Bool bUnknown = sal_False;
 
-        PropertyMapEntry const ** pEntries = new PropertyMapEntry const *[nCount+1];
+        PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1];
 
         sal_Int32 n;
         for( n = 0; !bUnknown && (n < nCount); n++, pNames++ )
@@ -266,7 +266,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S
 
 void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
-    PropertyMapEntry const *pEntry  = mp->find( PropertyName );
+    PropertyMapEntry *pEntry  = mp->find( PropertyName );
     if( NULL == pEntry )
         throw UnknownPropertyException( PropertyName, static_cast< XPropertySet* >( this ) );
 
@@ -275,7 +275,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyN
 
 Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
-    PropertyMapEntry const * pEntry = mp->find( aPropertyName );
+    PropertyMapEntry* pEntry = mp->find( aPropertyName );
     if( NULL == pEntry )
         throw UnknownPropertyException( aPropertyName, static_cast< XPropertySet* >( this ) );
 
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index cc4984122054..2567a0630109 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -35,7 +35,7 @@ public:
     PropertyMapImpl() throw();
     virtual ~PropertyMapImpl() throw();
 
-    void add( PropertyMapEntry const * pMap, sal_Int32 nCount = -1 ) throw();
+    void add( PropertyMapEntry* pMap, sal_Int32 nCount = -1 ) throw();
     void remove( const OUString& aName ) throw();
 
     Sequence< Property > getProperties() throw();
@@ -59,23 +59,30 @@ PropertyMapImpl::~PropertyMapImpl() throw()
 {
 }
 
-void PropertyMapImpl::add( PropertyMapEntry const * pMap, sal_Int32 nCount ) throw()
+void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw()
 {
     // nCount < 0   => add all
     // nCount == 0  => add nothing
     // nCount > 0   => add at most nCount entries
 
-    while( !pMap->maName.isEmpty() && ( ( nCount < 0) || ( nCount-- > 0 ) ) )
+    while( pMap->mpName && ( ( nCount < 0) || ( nCount-- > 0 ) ) )
     {
+        OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
+
 #ifdef DBG_UTIL
-        PropertyMap::iterator aIter = maPropertyMap.find( pMap->maName );
+        PropertyMap::iterator aIter = maPropertyMap.find( aName );
         if( aIter != maPropertyMap.end() )
         {
             OSL_FAIL( "Warning: PropertyMapEntry added twice, possible error!");
         }
 #endif
+        if( NULL == pMap->mpType )
+        {
+            OSL_FAIL( "No type in PropertyMapEntry!");
+            pMap->mpType = &::getCppuType((const sal_Int32*)0);
+        }
 
-        maPropertyMap[pMap->maName] = pMap;
+        maPropertyMap[aName] = pMap;
 
         if( maProperties.getLength() )
             maProperties.realloc( 0 );
@@ -106,11 +113,11 @@ Sequence< Property > PropertyMapImpl::getProperties() throw()
         const PropertyMap::iterator aEnd = maPropertyMap.end();
         while( aIter != aEnd )
         {
-            PropertyMapEntry const * pEntry = (*aIter).second;
+            PropertyMapEntry* pEntry = (*aIter).second;
 
-            pProperties->Name = pEntry->maName;
+            pProperties->Name = OUString( pEntry->mpName, pEntry->mnNameLen, RTL_TEXTENCODING_ASCII_US );
             pProperties->Handle = pEntry->mnHandle;
-            pProperties->Type = pEntry->maType;
+            pProperties->Type = *pEntry->mpType;
             pProperties->Attributes = pEntry->mnAttributes;
 
             ++pProperties;
@@ -133,9 +140,9 @@ Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( Unkn
     if( maPropertyMap.end() == aIter )
         throw UnknownPropertyException( aName, NULL );
 
-    PropertyMapEntry const * pEntry = (*aIter).second;
+    PropertyMapEntry* pEntry = (*aIter).second;
 
-    return Property( aName, pEntry->mnHandle, pEntry->maType, pEntry->mnAttributes );
+    return Property( aName, pEntry->mnHandle, *pEntry->mpType, pEntry->mnAttributes );
 }
 
 sal_Bool PropertyMapImpl::hasPropertyByName( const OUString& aName ) throw()
@@ -150,7 +157,7 @@ PropertySetInfo::PropertySetInfo() throw()
     mpMap = new PropertyMapImpl();
 }
 
-PropertySetInfo::PropertySetInfo( PropertyMapEntry const * pMap ) throw()
+PropertySetInfo::PropertySetInfo( PropertyMapEntry* pMap ) throw()
 {
     mpMap = new PropertyMapImpl();
     mpMap->add( pMap );
@@ -161,7 +168,7 @@ PropertySetInfo::~PropertySetInfo() throw()
     delete mpMap;
 }
 
-void PropertySetInfo::add( PropertyMapEntry const * pMap ) throw()
+void PropertySetInfo::add( PropertyMapEntry* pMap ) throw()
 {
     mpMap->add( pMap );
 }
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 650a5ddd9111..38c1ff4ab164 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -89,6 +89,7 @@
 #include <list>
 
 #include <svtools/grfmgr.hxx>
+#define MAP_LEN(x) x, sizeof(x) - 1
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -492,11 +493,11 @@ void ODatabaseDocument::impl_import_nolck_throw( const Reference< XComponentCont
     lcl_extractAndStartStatusIndicator( _rResource, xStatusIndicator, aFilterCreationArgs );
 
     /** property map for import info set */
-    comphelper::PropertyMapEntry const aExportInfoMap[] =
+    comphelper::PropertyMapEntry aExportInfoMap[] =
      {
-        { "BaseURI", 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { MAP_LEN( "BaseURI"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StreamName"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+          { NULL, 0, 0, NULL, 0, 0 }
      };
      uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
     xInfoSet->setPropertyValue("BaseURI", uno::makeAny(_rResource.getOrDefault("URL",OUString())));
@@ -1612,10 +1613,10 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
     /** property map for export info set */
     comphelper::PropertyMapEntry aExportInfoMap[] =
     {
-        { "BaseURI", 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "UsePrettyPrinting", 0, ::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0},
-        {}
+        { MAP_LEN( "BaseURI"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StreamName"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0},
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
 
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index a54877b7115a..b041172510c2 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -94,9 +94,9 @@ namespace accessibility
             SVX_UNOEDIT_CHAR_PROPERTIES,
             SVX_UNOEDIT_PARA_PROPERTIES,
             SVX_UNOEDIT_NUMBERING_PROPERTIE,
-            {"TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-            {"ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-            {}
+            {MAP_CHAR_LEN("TextUserDefinedAttributes"),     EE_CHAR_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+            {MAP_CHAR_LEN("ParaUserDefinedAttributes"),     EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+            {0,0,0,0,0,0}
         };
         static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() );
         return &aPropSet;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index baf1da9dc3d4..6c818e2a8566 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -71,62 +71,62 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
 {
     static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_DATE_TIME, WID_DATE,  ::getCppuType((const util::DateTime*)0), 0, 0 },
-        { UNO_TC_PROP_IS_FIXED,  WID_BOOL1, ::getBooleanCppuType(),                  0, 0 },
-        { UNO_TC_PROP_IS_DATE,   WID_BOOL2, ::getBooleanCppuType(),                  0, 0 },
-        { UNO_TC_PROP_NUMFORMAT, WID_INT32, ::getCppuType((const sal_Int32*)0),      0, 0 },
-        {}
+        { MAP_CHAR_LEN(UNO_TC_PROP_DATE_TIME), WID_DATE,  &::getCppuType((const util::DateTime*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_IS_FIXED),  WID_BOOL1, &::getBooleanCppuType(),                  0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_IS_DATE),   WID_BOOL2, &::getBooleanCppuType(),                  0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_NUMFORMAT), WID_INT32, &::getCppuType((const sal_Int32*)0),      0, 0 },
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_IS_DATE, WID_BOOL2, ::getBooleanCppuType(), 0, 0 },
-        {}
+        { MAP_CHAR_LEN(UNO_TC_PROP_IS_DATE), WID_BOOL2, &::getBooleanCppuType(), 0, 0 },
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] =
     {
 
-        { UNO_TC_PROP_URL_FORMAT,         WID_INT16,   ::getCppuType((const sal_Int16*)0), 0, 0 },
-        { UNO_TC_PROP_URL_REPRESENTATION, WID_STRING1, ::getCppuType((const OUString*)0),  0, 0 },
-        { UNO_TC_PROP_URL_TARGET,         WID_STRING2, ::getCppuType((const OUString*)0),  0, 0 },
-        { UNO_TC_PROP_URL,                WID_STRING3, ::getCppuType((const OUString*)0),  0, 0 },
-        {}
+        { MAP_CHAR_LEN(UNO_TC_PROP_URL_FORMAT),         WID_INT16,   &::getCppuType((const sal_Int16*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_URL_REPRESENTATION), WID_STRING1, &::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_URL_TARGET),         WID_STRING2, &::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_URL),                WID_STRING3, &::getCppuType((const OUString*)0),  0, 0 },
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aEmptyPropertyMap_Impl[] =
     {
-        {}
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aEmptyPropertySet_Impl(aEmptyPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_IS_FIXED,             WID_BOOL1,   ::getBooleanCppuType(),             0, 0 },
-        { UNO_TC_PROP_FILE_FORMAT,          WID_INT16,   ::getCppuType((const sal_Int16*)0), 0, 0 },
-        { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1, ::getCppuType((const OUString*)0),  0, 0 },
-        {}
+        { MAP_CHAR_LEN(UNO_TC_PROP_IS_FIXED),             WID_BOOL1,   &::getBooleanCppuType(),             0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_FILE_FORMAT),          WID_INT16,   &::getCppuType((const sal_Int16*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, &::getCppuType((const OUString*)0),  0, 0 },
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_IS_FIXED,             WID_BOOL1,  ::getBooleanCppuType(),             0, 0 },
-        { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1,::getCppuType((const OUString*)0),  0, 0 },
-        { UNO_TC_PROP_AUTHOR_CONTENT,       WID_STRING2,::getCppuType((const OUString*)0),  0, 0 },
-        { UNO_TC_PROP_AUTHOR_FORMAT,        WID_INT16,  ::getCppuType((const sal_Int16*)0), 0, 0 },
-        { UNO_TC_PROP_AUTHOR_FULLNAME,      WID_BOOL2,  ::getBooleanCppuType(),             0, 0 },
-        {}
+        { MAP_CHAR_LEN(UNO_TC_PROP_IS_FIXED),             WID_BOOL1,  &::getBooleanCppuType(),             0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,&::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_AUTHOR_CONTENT),       WID_STRING2,&::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_AUTHOR_FORMAT),        WID_INT16,  &::getCppuType((const sal_Int16*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_TC_PROP_AUTHOR_FULLNAME),      WID_BOOL2,  &::getBooleanCppuType(),             0, 0 },
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_MEASURE_KIND, WID_INT16,  ::getCppuType((const sal_Int16*)0), 0, 0 },
-        {}
+        { MAP_CHAR_LEN(UNO_TC_PROP_MEASURE_KIND), WID_INT16,  &::getCppuType((const sal_Int16*)0), 0, 0 },
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl);
 
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index fe955ba8d969..ed16db9b4148 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -133,13 +133,13 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
                     SvxUnoConvertToMM( eMapUnit, aVal );
             }
         }
-        else if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM &&
+        else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM &&
               aVal.getValueType() == ::getCppuType((const sal_Int32*)0) )
         {
             // convert typeless SfxEnumItem to enum type
             sal_Int32 nEnum;
             aVal >>= nEnum;
-            aVal.setValue( &nEnum, pMap->aType );
+            aVal.setValue( &nEnum, *pMap->pType );
         }
     }
     else
@@ -245,13 +245,13 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
         }
     }
 
-    if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM &&
+    if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM &&
           aVal.getValueType() == ::getCppuType((const sal_Int32*)0) )
     {
         sal_Int32 nEnum;
         aVal >>= nEnum;
 
-        aVal.setValue( &nEnum, pMap->aType );
+        aVal.setValue( &nEnum, *pMap->pType );
     }
 
     return aVal;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index adfd06f0c84c..8a63ef7e3e5c 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -88,11 +88,11 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {"TextField",                     EE_FEATURE_FIELD,   ::getCppuType((const uno::Reference< text::XTextField >*)0),   beans::PropertyAttribute::READONLY, 0 },
-        {"TextPortionType",               WID_PORTIONTYPE,    ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
-        {"TextUserDefinedAttributes",         EE_CHAR_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        {MAP_CHAR_LEN("TextField"),                     EE_FEATURE_FIELD,   &::getCppuType((const uno::Reference< text::XTextField >*)0),   beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN("TextPortionType"),               WID_PORTIONTYPE,    &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN("TextUserDefinedAttributes"),         EE_CHAR_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
     };
     return aSvxTextPortionPropertyMap;
 }
@@ -117,9 +117,9 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {"TextUserDefinedAttributes",         EE_CHAR_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        {MAP_CHAR_LEN("TextUserDefinedAttributes"),         EE_CHAR_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
     };
 
     return aSvxUnoOutlinerTextCursorPropertyMap;
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 9a8a99c1d78e..6d3523c9ab19 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -382,11 +382,11 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
         SVX_UNOEDIT_CHAR_PROPERTIES,
         SVX_UNOEDIT_FONT_PROPERTIES,
 //      SVX_UNOEDIT_OUTLINER_PROPERTIES,
-        {UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 },
-        {UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,::getBooleanCppuType(), 0, 0 },
-        {UNO_NAME_NUMBERING_LEVEL,        EE_PARA_OUTLLEVEL,  ::getCppuType((const sal_Int16*)0), 0, 0 },
+        {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES),        EE_PARA_NUMBULLET,  &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(UNO_NAME_NUMBERING),              EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 },
+        {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL),        EE_PARA_OUTLLEVEL,  &::getCppuType((const sal_Int16*)0), 0, 0 },
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {}
+        {0,0,0,0,0,0}
     };
     static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
 
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index e48203b2fd69..5220dbfdb624 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -147,7 +147,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
         SVX_UNOEDIT_FONT_PROPERTIES,
 //      SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {}
+        {0,0,0,0,0,0}
     };
     static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
 
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index bc7efa202780..94e5e0ad92cc 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -577,8 +577,8 @@ Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo(void) thro
 {
     static const SfxItemPropertyMapEntry aBibProps_Impl[] =
     {
-        { "BibliographyDataFieldNames", 0, ::getCppuType((Sequence<PropertyValue>*)0), PropertyAttribute::READONLY, 0},
-        {}
+        { MAP_CHAR_LEN("BibliographyDataFieldNames"), 0, &::getCppuType((Sequence<PropertyValue>*)0), PropertyAttribute::READONLY, 0},
+        {0,0,0,0,0,0}
     };
     static Reference< XPropertySetInfo >  xRet =
         SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo();
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 3c53b3302c87..5ad8a22040cb 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -63,6 +63,9 @@ using namespace com::sun::star::xml::sax;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::task;
 
+
+#define MAP_LEN(x) x, sizeof(x) - 1
+
 sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
     throw (RuntimeException)
 {
@@ -95,8 +98,8 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
     // create an XProperty set to configure the exporter for pretty printing
     PropertyMapEntry aImportInfoMap[] =
      {
-        { "BaseURI", 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
-         {}
+        { MAP_LEN( "BaseURI" ), 0, &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
+         { NULL, 0, 0, NULL, 0, 0 }
      };
 
      Reference< XPropertySet > xInfoSet(
@@ -253,10 +256,10 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
         // create an XProperty set to configure the exporter for pretty printing
          PropertyMapEntry aImportInfoMap[] =
          {
-             { "UsePrettyPrinting", 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
-             { "ExportTextNumberElement", 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
-             { "BaseURI", 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
-             {}
+             { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "ExportTextNumberElement" ), 0, &::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "BaseURI" ), 0, &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
+             { NULL, 0, 0, NULL, 0, 0 }
          };
 
          Reference< XPropertySet > xInfoSet(
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 1b0810dd2e52..817bf2f634a7 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -49,9 +49,9 @@ namespace frm
                 SVX_UNOEDIT_CHAR_PROPERTIES,
                 SVX_UNOEDIT_FONT_PROPERTIES,
                 SVX_UNOEDIT_PARA_PROPERTIES,
-                { "TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
-                { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
-                {}
+                { MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
+                { MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
+                { NULL, 0, 0, NULL, 0, 0 }
             };
             static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
             return &aTextEnginePropertySet;
diff --git a/include/comphelper/TypeGeneration.hxx b/include/comphelper/TypeGeneration.hxx
index 0b70e4ab9215..6e03c0b688b2 100644
--- a/include/comphelper/TypeGeneration.hxx
+++ b/include/comphelper/TypeGeneration.hxx
@@ -23,6 +23,8 @@
 #include <sal/types.h>
 #include <comphelper/comphelperdllapi.h>
 
+#define CPPU_E2T(type)      ((com::sun::star::uno::Type*)type)
+
 namespace com { namespace sun { namespace star { namespace uno {
     class Type;
 } } } }
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index 71863b08c7e7..34b12e109b1a 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -39,14 +39,15 @@ namespace comphelper
 
 struct PropertyMapEntry
 {
-    OUString maName;
+    const sal_Char* mpName;
+    sal_uInt16 mnNameLen;
     sal_Int32 mnHandle;
-    com::sun::star::uno::Type maType;
+    const com::sun::star::uno::Type* mpType;
     sal_Int16 mnAttributes;
     sal_uInt8 mnMemberId;
 };
 
-typedef std::map<OUString, PropertyMapEntry const *> PropertyMap;
+typedef std::map<OUString, PropertyMapEntry*> PropertyMap;
 
 class PropertyMapImpl;
 
@@ -59,7 +60,7 @@ private:
     PropertyMapImpl* mpMap;
 public:
     PropertySetInfo() throw();
-    PropertySetInfo( PropertyMapEntry const * pMap ) throw();
+    PropertySetInfo( PropertyMapEntry* pMap ) throw();
     virtual ~PropertySetInfo() throw();
 
     /** returns a stl map with all PropertyMapEntry pointer.<p>
@@ -70,7 +71,7 @@ public:
     /** adds an array of PropertyMapEntry to this instance.<p>
         The end is marked with a PropertyMapEntry where mpName equals NULL</p>
     */
-    void add( PropertyMapEntry const * pMap ) throw();
+    void add( PropertyMapEntry* pMap ) throw();
 
     /** removes an already added PropertyMapEntry which string in mpName equals to aName */
     void remove( const OUString& aName ) throw();
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 61f49a78f7cd..8c9da3f4b22d 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -69,81 +69,81 @@ class SvxItemPropertySet;
 #define WID_PARAISNUMBERINGRESTART  OWN_ATTR_VALUE_START+4
 
 #define SVX_UNOEDIT_NUMBERING_PROPERTIE \
-    {UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \
-    {UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,::getBooleanCppuType(), 0, 0 }
+    {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES),        EE_PARA_NUMBULLET,  &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \
+    {MAP_CHAR_LEN(UNO_NAME_NUMBERING),              EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 }
 
 #define SVX_UNOEDIT_OUTLINER_PROPERTIES \
     SVX_UNOEDIT_NUMBERING_PROPERTIE, \
-    {UNO_NAME_NUMBERING_LEVEL,        WID_NUMLEVEL,       ::getCppuType((const sal_Int16*)0), 0, 0 }, \
-    {"NumberingStartValue",           WID_NUMBERINGSTARTVALUE, ::getCppuType((const sal_Int16*)0), 0, 0 }, \
-    {"ParaIsNumberingRestart",        WID_PARAISNUMBERINGRESTART, ::getBooleanCppuType(), 0, 0 }
+    {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL),        WID_NUMLEVEL,       &::getCppuType((const sal_Int16*)0), 0, 0 }, \
+    {MAP_CHAR_LEN("NumberingStartValue"),           WID_NUMBERINGSTARTVALUE, &::getCppuType((const sal_Int16*)0), 0, 0 }, \
+    {MAP_CHAR_LEN("ParaIsNumberingRestart"),        WID_PARAISNUMBERINGRESTART, &::getBooleanCppuType(), 0, 0 }
 
 #define SVX_UNOEDIT_CHAR_PROPERTIES \
-    { UNO_NAME_EDIT_CHAR_HEIGHT,      EE_CHAR_FONTHEIGHT, ::getCppuType((const float*)0),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
-    { "CharScaleWidth",               EE_CHAR_FONTWIDTH,  ::getCppuType((const sal_Int16*)0),    0, 0 }, \
-    { UNO_NAME_EDIT_CHAR_FONTNAME,    EE_CHAR_FONTINFO,   ::getCppuType((const OUString*)0),  0, MID_FONT_FAMILY_NAME },\
-    { UNO_NAME_EDIT_CHAR_FONTSTYLENAME,EE_CHAR_FONTINFO,  ::getCppuType((const OUString*)0),  0, MID_FONT_STYLE_NAME }, \
-    { UNO_NAME_EDIT_CHAR_FONTFAMILY,  EE_CHAR_FONTINFO,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY }, \
-    { UNO_NAME_EDIT_CHAR_FONTCHARSET, EE_CHAR_FONTINFO,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_CHAR_SET }, \
-    { UNO_NAME_EDIT_CHAR_FONTPITCH,   EE_CHAR_FONTINFO,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_PITCH }, \
-    { UNO_NAME_EDIT_CHAR_POSTURE,     EE_CHAR_ITALIC,     ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
-    { UNO_NAME_EDIT_CHAR_WEIGHT,      EE_CHAR_WEIGHT,     ::getCppuType((const float*)0),            0, MID_WEIGHT }, \
-    { UNO_NAME_EDIT_CHAR_LOCALE,      EE_CHAR_LANGUAGE,   ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
-    { UNO_NAME_EDIT_CHAR_COLOR,       EE_CHAR_COLOR,      ::getCppuType((const sal_Int32*)0),        0, 0 }, \
-    { UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, ::getCppuType((const sal_Int16*)0),        0, MID_ESC }, \
-    { UNO_NAME_EDIT_CHAR_UNDERLINE,   EE_CHAR_UNDERLINE,  ::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE }, \
-    { "CharUnderlineColor",           EE_CHAR_UNDERLINE,  ::getCppuType((const sal_Int32*)0),        0, MID_TL_COLOR }, \
-    { "CharUnderlineHasColor",        EE_CHAR_UNDERLINE,  ::getBooleanCppuType(),                    0, MID_TL_HASCOLOR } , \
-    { UNO_NAME_EDIT_CHAR_OVERLINE,    EE_CHAR_OVERLINE,   ::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE }, \
-    { "CharOverlineColor",            EE_CHAR_OVERLINE,   ::getCppuType((const sal_Int32*)0),        0, MID_TL_COLOR }, \
-    { "CharOverlineHasColor",         EE_CHAR_OVERLINE,   ::getBooleanCppuType(),                    0, MID_TL_HASCOLOR } , \
-    { UNO_NAME_EDIT_CHAR_CROSSEDOUT,  EE_CHAR_STRIKEOUT,  ::getBooleanCppuType(),                    0, MID_CROSSED_OUT }, \
-    { UNO_NAME_EDIT_CHAR_STRIKEOUT,   EE_CHAR_STRIKEOUT,  ::getCppuType((const sal_Int16*)0),        0, MID_CROSS_OUT}, \
-    { UNO_NAME_EDIT_CHAR_SHADOWED,    EE_CHAR_SHADOW,     ::getBooleanCppuType(),                    0, 0 }, \
-    { "CharContoured",                EE_CHAR_OUTLINE,    ::getBooleanCppuType(),                    0, 0 }, \
-    { "CharEscapementHeight",         EE_CHAR_ESCAPEMENT, ::getCppuType((const sal_Int8*)0),         0, MID_ESC_HEIGHT },\
-    { "CharAutoKerning",              EE_CHAR_PAIRKERNING,::getBooleanCppuType(),                    0, 0 } , \
-    { "CharKerning",                  EE_CHAR_KERNING,    ::getCppuType((const sal_Int16*)0)  ,      0, 0 }, \
-    { "CharWordMode",                 EE_CHAR_WLM,        ::getBooleanCppuType(),                    0, 0 }, \
-    { "CharEmphasis",                 EE_CHAR_EMPHASISMARK, ::getCppuType((const sal_Int16*)0),       0, MID_EMPHASIS},\
-    { UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN,        EE_CHAR_FONTHEIGHT_CJK, ::getCppuType((const float*)0),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
-    { UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN,      EE_CHAR_FONTINFO_CJK,   ::getCppuType((const OUString*)0),  0, MID_FONT_FAMILY_NAME },\
-    { UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN, EE_CHAR_FONTINFO_CJK,   ::getCppuType((const OUString*)0),  0, MID_FONT_STYLE_NAME }, \
-    { UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN,    EE_CHAR_FONTINFO_CJK,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY }, \
-    { UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN,   EE_CHAR_FONTINFO_CJK,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_CHAR_SET }, \
-    { UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN,     EE_CHAR_FONTINFO_CJK,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_PITCH }, \
-    { UNO_NAME_EDIT_CHAR_POSTURE_ASIAN,       EE_CHAR_ITALIC_CJK,     ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
-    { UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN,        EE_CHAR_WEIGHT_CJK,     ::getCppuType((const float*)0),            0, MID_WEIGHT }, \
-    { UNO_NAME_EDIT_CHAR_LOCALE_ASIAN,        EE_CHAR_LANGUAGE_CJK,   ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
-    { UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX,      EE_CHAR_FONTHEIGHT_CTL, ::getCppuType((const float*)0),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
-    { UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX,    EE_CHAR_FONTINFO_CTL,   ::getCppuType((const OUString*)0),  0, MID_FONT_FAMILY_NAME },\
-    { UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX,EE_CHAR_FONTINFO_CTL,  ::getCppuType((const OUString*)0),  0, MID_FONT_STYLE_NAME }, \
-    { UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX,  EE_CHAR_FONTINFO_CTL,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY }, \
-    { UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX, EE_CHAR_FONTINFO_CTL,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_CHAR_SET }, \
-    { UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX,   EE_CHAR_FONTINFO_CTL,   ::getCppuType((const sal_Int16*)0),        0, MID_FONT_PITCH }, \
-    { UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX,     EE_CHAR_ITALIC_CTL,     ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
-    { UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX,      EE_CHAR_WEIGHT_CTL,     ::getCppuType((const float*)0),            0, MID_WEIGHT }, \
-    { UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX,      EE_CHAR_LANGUAGE_CTL,   ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
-    { "CharRelief",                           EE_CHAR_RELIEF,         ::getCppuType((const sal_Int16*)0),    0, MID_RELIEF }
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT),      EE_CHAR_FONTHEIGHT, &::getCppuType((const float*)0),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+    { MAP_CHAR_LEN("CharScaleWidth"),               EE_CHAR_FONTWIDTH,      &::getCppuType((const sal_Int16*)0),    0, 0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME),    EE_CHAR_FONTINFO,   &::getCppuType((const OUString*)0),  0, MID_FONT_FAMILY_NAME },\
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO,  &::getCppuType((const OUString*)0),  0, MID_FONT_STYLE_NAME }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY),  EE_CHAR_FONTINFO,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_CHAR_SET }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH),   EE_CHAR_FONTINFO,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_PITCH }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE),     EE_CHAR_ITALIC,     &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT),      EE_CHAR_WEIGHT,     &::getCppuType((const float*)0),            0, MID_WEIGHT }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE),      EE_CHAR_LANGUAGE,   &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_COLOR),       EE_CHAR_COLOR,      &::getCppuType((const sal_Int32*)0),        0, 0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT),  EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int16*)0),        0, MID_ESC }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_UNDERLINE),   EE_CHAR_UNDERLINE,  &::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE }, \
+    { MAP_CHAR_LEN("CharUnderlineColor"),           EE_CHAR_UNDERLINE,  &::getCppuType((const sal_Int32*)0),        0, MID_TL_COLOR }, \
+    { MAP_CHAR_LEN("CharUnderlineHasColor"),        EE_CHAR_UNDERLINE,  &::getBooleanCppuType(),                    0, MID_TL_HASCOLOR } , \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_OVERLINE),    EE_CHAR_OVERLINE,   &::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE }, \
+    { MAP_CHAR_LEN("CharOverlineColor"),            EE_CHAR_OVERLINE,   &::getCppuType((const sal_Int32*)0),        0, MID_TL_COLOR }, \
+    { MAP_CHAR_LEN("CharOverlineHasColor"),         EE_CHAR_OVERLINE,   &::getBooleanCppuType(),                    0, MID_TL_HASCOLOR } , \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_CROSSEDOUT),  EE_CHAR_STRIKEOUT,  &::getBooleanCppuType(),                    0, MID_CROSSED_OUT }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_STRIKEOUT),   EE_CHAR_STRIKEOUT,  &::getCppuType((const sal_Int16*)0),        0, MID_CROSS_OUT}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_SHADOWED),    EE_CHAR_SHADOW,     &::getBooleanCppuType(),                    0, 0 }, \
+    { MAP_CHAR_LEN("CharContoured"),                EE_CHAR_OUTLINE,    &::getBooleanCppuType(),                    0, 0 }, \
+    { MAP_CHAR_LEN("CharEscapementHeight"),         EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int8*)0),         0, MID_ESC_HEIGHT },\
+    { MAP_CHAR_LEN("CharAutoKerning"),              EE_CHAR_PAIRKERNING,&::getBooleanCppuType(),                    0, 0 } , \
+    { MAP_CHAR_LEN("CharKerning"),                  EE_CHAR_KERNING,    &::getCppuType((const sal_Int16*)0)  ,      0, 0 }, \
+    { MAP_CHAR_LEN("CharWordMode"),                 EE_CHAR_WLM,        &::getBooleanCppuType(),                    0, 0 }, \
+    { MAP_CHAR_LEN("CharEmphasis"),                 EE_CHAR_EMPHASISMARK,&::getCppuType((const sal_Int16*)0),       0, MID_EMPHASIS},\
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN),        EE_CHAR_FONTHEIGHT_CJK, &::getCppuType((const float*)0),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN),      EE_CHAR_FONTINFO_CJK,   &::getCppuType((const OUString*)0),  0, MID_FONT_FAMILY_NAME },\
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK,   &::getCppuType((const OUString*)0),  0, MID_FONT_STYLE_NAME }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN),    EE_CHAR_FONTINFO_CJK,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN),   EE_CHAR_FONTINFO_CJK,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_CHAR_SET }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN),     EE_CHAR_FONTINFO_CJK,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_PITCH }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_ASIAN),       EE_CHAR_ITALIC_CJK,     &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN),        EE_CHAR_WEIGHT_CJK,     &::getCppuType((const float*)0),            0, MID_WEIGHT }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN),        EE_CHAR_LANGUAGE_CJK,   &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX),      EE_CHAR_FONTHEIGHT_CTL, &::getCppuType((const float*)0),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX),    EE_CHAR_FONTINFO_CTL,   &::getCppuType((const OUString*)0),  0, MID_FONT_FAMILY_NAME },\
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL,   &::getCppuType((const OUString*)0),  0, MID_FONT_STYLE_NAME }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX),  EE_CHAR_FONTINFO_CTL,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_CHAR_SET }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX),   EE_CHAR_FONTINFO_CTL,   &::getCppuType((const sal_Int16*)0),        0, MID_FONT_PITCH }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX),     EE_CHAR_ITALIC_CTL,     &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX),      EE_CHAR_WEIGHT_CTL,     &::getCppuType((const float*)0),            0, MID_WEIGHT }, \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX),      EE_CHAR_LANGUAGE_CTL,   &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
+    { MAP_CHAR_LEN("CharRelief"            ),               EE_CHAR_RELIEF,         &::getCppuType((const sal_Int16*)0),    0, MID_RELIEF }
 
 #define SVX_UNOEDIT_FONT_PROPERTIES \
-    {UNO_NAME_EDIT_FONT_DESCRIPTOR,   WID_FONTDESC,       ::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0),    0, MID_FONT_FAMILY_NAME }
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_FONT_DESCRIPTOR),   WID_FONTDESC,       &::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0),    0, MID_FONT_FAMILY_NAME }
 
 #define SVX_UNOEDIT_PARA_PROPERTIES \
-    {UNO_NAME_EDIT_PARA_ADJUST,       EE_PARA_JUST,               ::getCppuType((const sal_Int16*)0),            0, MID_PARA_ADJUST }, \
-    {UNO_NAME_EDIT_PARA_BMARGIN,      EE_PARA_ULSPACE,            ::getCppuType((const sal_Int32*)0),            0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \
-    {UNO_NAME_EDIT_PARA_IS_HYPHEN,    EE_PARA_HYPHENATE,          ::getBooleanCppuType(),                0, 0 }, \
-    {UNO_NAME_EDIT_PARA_LASTLINEADJ,  EE_PARA_JUST,               ::getCppuType((const sal_Int16*)0),            0, MID_LAST_LINE_ADJUST }, \
-    {UNO_NAME_EDIT_PARA_LMARGIN,      EE_PARA_LRSPACE,            ::getCppuType((const sal_Int32*)0),            0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \
-    {UNO_NAME_EDIT_PARA_LINESPACING,  EE_PARA_SBL,                ::getCppuType((const ::com::sun::star::style::LineSpacing*)0),     0, 0 }, \
-    {UNO_NAME_EDIT_PARA_RMARGIN,      EE_PARA_LRSPACE,            ::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN|SFX_METRIC_ITEM }, \
-    {UNO_NAME_EDIT_PARA_TAPSTOPS,     EE_PARA_TABS,               ::getCppuType((const ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >*)0), 0, 0 }, \
-    {UNO_NAME_EDIT_PARA_TMARGIN,      EE_PARA_ULSPACE,            ::getCppuType((const sal_Int32*)0),            0, MID_UP_MARGIN|SFX_METRIC_ITEM },\
-    {UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT,     EE_PARA_LRSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \
-    {UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION,EE_PARA_HANGINGPUNCTUATION,    ::getBooleanCppuType(),                0 ,0 }, \
-    {UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE, EE_PARA_ASIANCJKSPACING,   ::getBooleanCppuType(),                0 ,0 }, \
-    {UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES,    EE_PARA_FORBIDDENRULES,        ::getBooleanCppuType(),                0 ,0 },\
-    {"WritingMode",                   EE_PARA_WRITINGDIR,         ::getCppuType((const sal_Int16*)0),            0, 0 }
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_ADJUST),       EE_PARA_JUST,               &::getCppuType((const sal_Int16*)0),            0, MID_PARA_ADJUST }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_BMARGIN),      EE_PARA_ULSPACE,            &::getCppuType((const sal_Int32*)0),            0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HYPHEN),    EE_PARA_HYPHENATE,          &::getBooleanCppuType(),                0, 0 }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LASTLINEADJ),  EE_PARA_JUST,               &::getCppuType((const sal_Int16*)0),            0, MID_LAST_LINE_ADJUST }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LMARGIN),      EE_PARA_LRSPACE,            &::getCppuType((const sal_Int32*)0),            0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LINESPACING),  EE_PARA_SBL,                &::getCppuType((const ::com::sun::star::style::LineSpacing*)0),     0, 0 }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_RMARGIN),      EE_PARA_LRSPACE,            &::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN|SFX_METRIC_ITEM }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TAPSTOPS),     EE_PARA_TABS,               &::getCppuType((const ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >*)0), 0, 0 }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TMARGIN),      EE_PARA_ULSPACE,            &::getCppuType((const sal_Int32*)0),            0, MID_UP_MARGIN|SFX_METRIC_ITEM },\
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT),     EE_PARA_LRSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION,    &::getBooleanCppuType(),                0 ,0 }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING,   &::getBooleanCppuType(),                0 ,0 }, \
+    {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES),    EE_PARA_FORBIDDENRULES,        &::getBooleanCppuType(),                0 ,0 },\
+    {MAP_CHAR_LEN("WritingMode"),                   EE_PARA_WRITINGDIR,         &::getCppuType((const sal_Int16*)0),            0, 0 }
 
 class SvxEditSource;
 class SvxTextForwarder;
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index a4d98b4b64f7..15e15bf76cda 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -33,9 +33,10 @@
 
 struct SfxItemPropertyMapEntry
 {
-    OUString                            aName;
+    const char*                         pName;
+    sal_uInt16                          nNameLen;
     sal_uInt16                          nWID;
-    com::sun::star::uno::Type           aType;
+    const com::sun::star::uno::Type*    pType;
     long                                nFlags;
     sal_uInt8                           nMemberId;
 
@@ -44,21 +45,22 @@ struct SfxItemPropertyMapEntry
 struct SfxItemPropertySimpleEntry
 {
     sal_uInt16                          nWID;
-    com::sun::star::uno::Type           aType;
+    const com::sun::star::uno::Type*    pType;
     long                                nFlags;
     sal_uInt8                           nMemberId;
 
     SfxItemPropertySimpleEntry()
         : nWID( 0 )
+        , pType( 0 )
         , nFlags( 0 )
         , nMemberId( 0 )
         {
         }
 
-    SfxItemPropertySimpleEntry(sal_uInt16 _nWID, com::sun::star::uno::Type const & _rType,
+    SfxItemPropertySimpleEntry(sal_uInt16 _nWID, const com::sun::star::uno::Type* _pType,
                                long _nFlags, sal_uInt8 _nMemberId)
         : nWID(      _nWID )
-        , aType(     _rType )
+        , pType(     _pType )
         , nFlags(    _nFlags )
         , nMemberId( _nMemberId )
         {
@@ -66,7 +68,7 @@ struct SfxItemPropertySimpleEntry
 
     SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry )
         : nWID( pMapEntry->nWID )
-        , aType( pMapEntry->aType )
+        , pType( pMapEntry->pType )
         , nFlags( pMapEntry->nFlags )
         , nMemberId( pMapEntry->nMemberId )
         {
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 9e425c92873c..6959b4cf5512 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -80,7 +80,7 @@ public:
 
 class SVX_DLLPUBLIC SvxUnoPropertyMapProvider
 {
-    SfxItemPropertyMapEntry const * aMapArr[SVXMAP_END];
+    SfxItemPropertyMapEntry* aMapArr[SVXMAP_END];
     SvxItemPropertySet* aSetArr[SVXMAP_END];
 public:
     SvxUnoPropertyMapProvider();
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 32ab29ac64b4..f5f0b997e520 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -183,111 +183,111 @@
 
 // #FontWork#
 #define FONTWORK_PROPERTIES \
-    { "FontWorkStyle",            XATTR_FORMTXTSTYLE,         /*ENUM*/::getCppuType((const sal_Int32*)0),    0,  0}, \
-    { "FontWorkAdjust",           XATTR_FORMTXTADJUST,        /*ENUM*/::getCppuType((const sal_Int32*)0),    0,  0}, \
-    { "FontWorkDistance",         XATTR_FORMTXTDISTANCE,      ::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
-    { "FontWorkStart",            XATTR_FORMTXTSTART,         ::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
-    { "FontWorkMirror",           XATTR_FORMTXTMIRROR,        ::getBooleanCppuType(),                        0,  0}, \
-    { "FontWorkOutline",          XATTR_FORMTXTOUTLINE,       ::getBooleanCppuType(),                        0,  0}, \
-    { "FontWorkShadow",           XATTR_FORMTXTSHADOW,        /*ENUM*/::getCppuType((const sal_Int32*)0),    0,  0}, \
-    { "FontWorkShadowColor",      XATTR_FORMTXTSHDWCOLOR,     ::getCppuType((const sal_Int32*)0),            0,  0}, \
-    { "FontWorkShadowOffsetX",    XATTR_FORMTXTSHDWXVAL,      ::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
-    { "FontWorkShadowOffsetY",    XATTR_FORMTXTSHDWYVAL,      ::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
-    { "FontWorkHideForm",         XATTR_FORMTXTHIDEFORM,      ::getBooleanCppuType(),                        0,  0}, \
-    { "FontWorkShadowTransparence",XATTR_FORMTXTSHDWTRANSP,   ::getCppuType((const sal_Int16*)0),            0,  0},
+    { MAP_CHAR_LEN("FontWorkStyle"),            XATTR_FORMTXTSTYLE,         /*ENUM*/&::getCppuType((const sal_Int32*)0),    0,  0}, \
+    { MAP_CHAR_LEN("FontWorkAdjust"),           XATTR_FORMTXTADJUST,        /*ENUM*/&::getCppuType((const sal_Int32*)0),    0,  0}, \
+    { MAP_CHAR_LEN("FontWorkDistance"),         XATTR_FORMTXTDISTANCE,      &::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN("FontWorkStart"),            XATTR_FORMTXTSTART,         &::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN("FontWorkMirror"),           XATTR_FORMTXTMIRROR,        &::getBooleanCppuType(),                        0,  0}, \
+    { MAP_CHAR_LEN("FontWorkOutline"),          XATTR_FORMTXTOUTLINE,       &::getBooleanCppuType(),                        0,  0}, \
+    { MAP_CHAR_LEN("FontWorkShadow"),           XATTR_FORMTXTSHADOW,        /*ENUM*/&::getCppuType((const sal_Int32*)0),    0,  0}, \
+    { MAP_CHAR_LEN("FontWorkShadowColor"),      XATTR_FORMTXTSHDWCOLOR,     &::getCppuType((const sal_Int32*)0),            0,  0}, \
+    { MAP_CHAR_LEN("FontWorkShadowOffsetX"),    XATTR_FORMTXTSHDWXVAL,      &::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN("FontWorkShadowOffsetY"),    XATTR_FORMTXTSHDWYVAL,      &::getCppuType((const sal_Int32*)0),            0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN("FontWorkHideForm"),         XATTR_FORMTXTHIDEFORM,      &::getBooleanCppuType(),                        0,  0}, \
+    { MAP_CHAR_LEN("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP,   &::getCppuType((const sal_Int16*)0),            0,  0},
 
 #define SHADOW_PROPERTIES \
-    { UNO_NAME_SHADOW,            SDRATTR_SHADOW,             ::getBooleanCppuType(),    0,      0}, \
-    { UNO_NAME_SHADOWCOLOR,       SDRATTR_SHADOWCOLOR,        ::getCppuType((const sal_Int32*)0),    0,      0}, \
-    { UNO_NAME_SHADOWTRANSPARENCE,SDRATTR_SHADOWTRANSPARENCE, ::getCppuType((const sal_Int16*)0),    0,      0}, \
-    { UNO_NAME_SHADOWXDIST,       SDRATTR_SHADOWXDIST,        ::getCppuType((const sal_Int32*)0),    0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_SHADOWYDIST,       SDRATTR_SHADOWYDIST,        ::getCppuType((const sal_Int32*)0),    0,      SFX_METRIC_ITEM},
+    { MAP_CHAR_LEN(UNO_NAME_SHADOW),            SDRATTR_SHADOW,             &::getBooleanCppuType(),    0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_SHADOWCOLOR),       SDRATTR_SHADOWCOLOR,        &::getCppuType((const sal_Int32*)0),    0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_SHADOWTRANSPARENCE),SDRATTR_SHADOWTRANSPARENCE, &::getCppuType((const sal_Int16*)0),    0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_SHADOWXDIST),       SDRATTR_SHADOWXDIST,        &::getCppuType((const sal_Int32*)0),    0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_SHADOWYDIST),       SDRATTR_SHADOWYDIST,        &::getCppuType((const sal_Int32*)0),    0,      SFX_METRIC_ITEM},
 
 #define LINE_PROPERTIES_DEFAULTS\
-    { UNO_NAME_LINECAP,           XATTR_LINECAP,          ::getCppuType((const ::com::sun::star::drawing::LineCap*)0),     0,     0}, \
-    { UNO_NAME_LINECOLOR,         XATTR_LINECOLOR,        ::getCppuType((const sal_Int32*)0) ,           0,     0}, \
-    { UNO_NAME_LINEENDCENTER,     XATTR_LINEENDCENTER,    ::getBooleanCppuType() ,           0,     0}, \
-    { UNO_NAME_LINEENDWIDTH,      XATTR_LINEENDWIDTH,     ::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM}, \
-    { UNO_NAME_LINEJOINT,         XATTR_LINEJOINT,        ::getCppuType((const ::com::sun::star::drawing::LineJoint*)0),     0,     0}, \
-    { UNO_NAME_LINESTARTCENTER,   XATTR_LINESTARTCENTER,  ::getBooleanCppuType() ,           0,     0}, \
-    { UNO_NAME_LINESTARTWIDTH,    XATTR_LINESTARTWIDTH,   ::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM}, \
-    { UNO_NAME_LINESTYLE,         XATTR_LINESTYLE,        ::getCppuType((const ::com::sun::star::drawing::LineStyle*)0) ,        0,     0},  \
-    { UNO_NAME_LINETRANSPARENCE,  XATTR_LINETRANSPARENCE, ::getCppuType((const sal_Int16*)0) ,           0,     0}, \
-    { UNO_NAME_LINEWIDTH,         XATTR_LINEWIDTH,        ::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM},
+    { MAP_CHAR_LEN(UNO_NAME_LINECAP),           XATTR_LINECAP,          &::getCppuType((const ::com::sun::star::drawing::LineCap*)0),     0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINECOLOR),         XATTR_LINECOLOR,        &::getCppuType((const sal_Int32*)0) ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINEENDCENTER),     XATTR_LINEENDCENTER,    &::getBooleanCppuType() ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINEENDWIDTH),      XATTR_LINEENDWIDTH,     &::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINEJOINT),         XATTR_LINEJOINT,        &::getCppuType((const ::com::sun::star::drawing::LineJoint*)0),     0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINESTARTCENTER),   XATTR_LINESTARTCENTER,  &::getBooleanCppuType() ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINESTARTWIDTH),    XATTR_LINESTARTWIDTH,   &::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINESTYLE),         XATTR_LINESTYLE,        &::getCppuType((const ::com::sun::star::drawing::LineStyle*)0) ,        0,     0},  \
+    { MAP_CHAR_LEN(UNO_NAME_LINETRANSPARENCE),  XATTR_LINETRANSPARENCE, &::getCppuType((const sal_Int16*)0) ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINEWIDTH),         XATTR_LINEWIDTH,        &::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM},
 
 #define LINE_PROPERTIES \
-    { UNO_NAME_LINEDASH,          XATTR_LINEDASH,         ::getCppuType((const ::com::sun::star::drawing::LineDash*)0) ,         0,     MID_LINEDASH},   \
-    { "LineDashName",             XATTR_LINEDASH,         ::getCppuType((const OUString*)0) ,         0,     MID_NAME},   \
+    { MAP_CHAR_LEN(UNO_NAME_LINEDASH),          XATTR_LINEDASH,         &::getCppuType((const ::com::sun::star::drawing::LineDash*)0) ,         0,     MID_LINEDASH},   \
+    { MAP_CHAR_LEN("LineDashName"),             XATTR_LINEDASH,         &::getCppuType((const OUString*)0) ,         0,     MID_NAME},   \
     LINE_PROPERTIES_DEFAULTS
 
 #define LINE_PROPERTIES_START_END \
-    { UNO_NAME_LINEEND,           XATTR_LINEEND,          ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0}, \
-    { "LineEndName",              XATTR_LINEEND,          ::getCppuType((const OUString*)0), 0, MID_NAME }, \
-    { UNO_NAME_LINESTART,         XATTR_LINESTART,        ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0},  \
-    { "LineStartName",            XATTR_LINESTART,        ::getCppuType((const OUString*)0), 0, MID_NAME },
+    { MAP_CHAR_LEN(UNO_NAME_LINEEND),           XATTR_LINEEND,          &::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0}, \
+    { MAP_CHAR_LEN("LineEndName"),              XATTR_LINEEND,          &::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { MAP_CHAR_LEN(UNO_NAME_LINESTART),         XATTR_LINESTART,        &::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0},  \
+    { MAP_CHAR_LEN("LineStartName"),            XATTR_LINESTART,            &::getCppuType((const OUString*)0), 0, MID_NAME },
 
 #define FILL_PROPERTIES_BMP \
-    { UNO_NAME_FILLBMP_LOGICAL_SIZE,      XATTR_FILLBMP_SIZELOG,      ::getBooleanCppuType() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_OFFSET_X,          XATTR_FILLBMP_TILEOFFSETX,  ::getCppuType((const sal_Int32*)0) ,           0,     0}, \
-    { UNO_NAME_FILLBMP_OFFSET_Y,          XATTR_FILLBMP_TILEOFFSETY,  ::getCppuType((const sal_Int32*)0) ,           0,     0}, \
-    { UNO_NAME_FILLBMP_POSITION_OFFSET_X, XATTR_FILLBMP_POSOFFSETX,   ::getCppuType((const sal_Int32*)0) ,           0,     0}, \
-    { UNO_NAME_FILLBMP_POSITION_OFFSET_Y, XATTR_FILLBMP_POSOFFSETY,   ::getCppuType((const sal_Int32*)0) ,           0,     0}, \
-    { UNO_NAME_FILLBMP_RECTANGLE_POINT,   XATTR_FILLBMP_POS,          ::getCppuType((const ::com::sun::star::drawing::RectanglePoint*)0) , 0,     0}, \
-    { UNO_NAME_FILLBMP_SIZE_X,            XATTR_FILLBMP_SIZEX,        ::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM}, \
-    { UNO_NAME_FILLBMP_SIZE_Y,            XATTR_FILLBMP_SIZEY,        ::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM},    \
-    { UNO_NAME_FILLBMP_STRETCH,           XATTR_FILLBMP_STRETCH,      ::getBooleanCppuType() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_TILE,              XATTR_FILLBMP_TILE,         ::getBooleanCppuType() ,           0,     0},\
-    { UNO_NAME_FILLBMP_MODE,              OWN_ATTR_FILLBMP_MODE,      ::getCppuType((const ::com::sun::star::drawing::BitmapMode*)0),            0,     0},
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_LOGICAL_SIZE),      XATTR_FILLBMP_SIZELOG,      &::getBooleanCppuType() ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_OFFSET_X),          XATTR_FILLBMP_TILEOFFSETX,  &::getCppuType((const sal_Int32*)0) ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_OFFSET_Y),          XATTR_FILLBMP_TILEOFFSETY,  &::getCppuType((const sal_Int32*)0) ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_POSITION_OFFSET_X), XATTR_FILLBMP_POSOFFSETX,   &::getCppuType((const sal_Int32*)0) ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_POSITION_OFFSET_Y), XATTR_FILLBMP_POSOFFSETY,   &::getCppuType((const sal_Int32*)0) ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_RECTANGLE_POINT),   XATTR_FILLBMP_POS,          &::getCppuType((const ::com::sun::star::drawing::RectanglePoint*)0) , 0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_SIZE_X),            XATTR_FILLBMP_SIZEX,        &::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_SIZE_Y),            XATTR_FILLBMP_SIZEY,        &::getCppuType((const sal_Int32*)0) ,           0,     SFX_METRIC_ITEM},    \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_STRETCH),           XATTR_FILLBMP_STRETCH,      &::getBooleanCppuType() ,           0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_TILE),              XATTR_FILLBMP_TILE,         &::getBooleanCppuType() ,           0,     0},\
+    { MAP_CHAR_LEN(UNO_NAME_FILLBMP_MODE),              OWN_ATTR_FILLBMP_MODE,      &::getCppuType((const ::com::sun::star::drawing::BitmapMode*)0),            0,     0},
 
 #define FILL_PROPERTIES_DEFAULTS \
-    { UNO_NAME_FILLCOLOR,         XATTR_FILLCOLOR, ::getCppuType((const sal_Int32*)0),          0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLCOLOR),         XATTR_FILLCOLOR         , &::getCppuType((const sal_Int32*)0),          0,     0}, \
 
 #define FILL_PROPERTIES \
     FILL_PROPERTIES_BMP \
     FILL_PROPERTIES_DEFAULTS \
-    { UNO_NAME_FILLBACKGROUND,    XATTR_FILLBACKGROUND    , ::getBooleanCppuType(),              0,   0}, \
-    { UNO_NAME_FILLBITMAP,        XATTR_FILLBITMAP        , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0)  ,       0,     MID_BITMAP}, \
-    { "FillBitmapName",           XATTR_FILLBITMAP        , ::getCppuType((const OUString*)0), 0, MID_NAME }, \
-    { "FillBitmapURL",            XATTR_FILLBITMAP        , ::getCppuType((const OUString*)0), 0, MID_GRAFURL }, \
-    { "FillGradientStepCount",    XATTR_GRADIENTSTEPCOUNT , ::getCppuType((const sal_Int16*)0), 0, 0}, \
-    { UNO_NAME_FILLGRADIENT,      XATTR_FILLGRADIENT      , ::getCppuType((const ::com::sun::star::awt::Gradient*)0),        0,     MID_FILLGRADIENT}, \
-    { "FillGradientName",         XATTR_FILLGRADIENT      , ::getCppuType((const OUString*)0), 0, MID_NAME }, \
-    { UNO_NAME_FILLHATCH,         XATTR_FILLHATCH         , ::getCppuType((const ::com::sun::star::drawing::Hatch*)0),           0,     MID_FILLHATCH}, \
-    { "FillHatchName",            XATTR_FILLHATCH         , ::getCppuType((const OUString*)0), 0, MID_NAME }, \
-    { UNO_NAME_FILLSTYLE,         XATTR_FILLSTYLE         , ::getCppuType((const ::com::sun::star::drawing::FillStyle*)0) ,      0,     0}, \
-    { UNO_NAME_FILL_TRANSPARENCE, XATTR_FILLTRANSPARENCE, ::getCppuType((const sal_Int16*)0) ,           0,     0}, \
-    { "FillTransparenceGradient", XATTR_FILLFLOATTRANSPARENCE, ::getCppuType((const ::com::sun::star::awt::Gradient*)0),         0,     MID_FILLGRADIENT}, \
-    { "FillTransparenceGradientName", XATTR_FILLFLOATTRANSPARENCE, ::getCppuType((const OUString*)0), 0, MID_NAME }, \
-    { UNO_NAME_FILLCOLOR_2,       XATTR_SECONDARYFILLCOLOR, ::getCppuType((const sal_Int32*)0),          0,     0},
+    { MAP_CHAR_LEN(UNO_NAME_FILLBACKGROUND),    XATTR_FILLBACKGROUND    , &::getBooleanCppuType(),              0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLBITMAP),        XATTR_FILLBITMAP        , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0)  ,       0,     MID_BITMAP}, \
+    { MAP_CHAR_LEN("FillBitmapName"),           XATTR_FILLBITMAP        , &::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { MAP_CHAR_LEN("FillBitmapURL"),            XATTR_FILLBITMAP        , &::getCppuType((const OUString*)0), 0, MID_GRAFURL }, \
+    { MAP_CHAR_LEN("FillGradientStepCount"),    XATTR_GRADIENTSTEPCOUNT , &::getCppuType((const sal_Int16*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLGRADIENT),      XATTR_FILLGRADIENT      , &::getCppuType((const ::com::sun::star::awt::Gradient*)0),        0,     MID_FILLGRADIENT}, \
+    { MAP_CHAR_LEN("FillGradientName"),         XATTR_FILLGRADIENT      , &::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLHATCH),         XATTR_FILLHATCH         , &::getCppuType((const ::com::sun::star::drawing::Hatch*)0),           0,     MID_FILLHATCH}, \
+    { MAP_CHAR_LEN("FillHatchName"),            XATTR_FILLHATCH         , &::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLSTYLE),         XATTR_FILLSTYLE         , &::getCppuType((const ::com::sun::star::drawing::FillStyle*)0) ,      0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, &::getCppuType((const sal_Int16*)0) ,           0,     0}, \
+    { MAP_CHAR_LEN("FillTransparenceGradient"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::com::sun::star::awt::Gradient*)0),         0,     MID_FILLGRADIENT}, \
+    { MAP_CHAR_LEN("FillTransparenceGradientName"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { MAP_CHAR_LEN(UNO_NAME_FILLCOLOR_2),       XATTR_SECONDARYFILLCOLOR, &::getCppuType((const sal_Int32*)0),          0,     0},
 
 #define EDGERADIUS_PROPERTIES \
-    { UNO_NAME_EDGERADIUS,        SDRATTR_ECKENRADIUS     , ::getCppuType((const sal_Int32*)0)  ,            0,     SFX_METRIC_ITEM},
+    { MAP_CHAR_LEN(UNO_NAME_EDGERADIUS),        SDRATTR_ECKENRADIUS     , &::getCppuType((const sal_Int32*)0)  ,            0,     SFX_METRIC_ITEM},
 
 #define TEXT_PROPERTIES_DEFAULTS\
-    { UNO_NAME_TEXT_WRITINGMODE,      SDRATTR_TEXTDIRECTION,          ::getCppuType((const ::com::sun::star::text::WritingMode*)0),      0,      0},\
-    { UNO_NAME_TEXT_ANIAMOUNT,        SDRATTR_TEXT_ANIAMOUNT,         ::getCppuType((const sal_Int16*)0),        0,      0}, \
-    { UNO_NAME_TEXT_ANICOUNT,         SDRATTR_TEXT_ANICOUNT,          ::getCppuType((const sal_Int16*)0),        0,      0}, \
-    { UNO_NAME_TEXT_ANIDELAY,         SDRATTR_TEXT_ANIDELAY,          ::getCppuType((const sal_Int16*)0),        0,      0}, \
-    { UNO_NAME_TEXT_ANIDIRECTION,     SDRATTR_TEXT_ANIDIRECTION,      ::getCppuType((const ::com::sun::star::drawing::TextAnimationDirection*)0),    0,      0}, \
-    { UNO_NAME_TEXT_ANIKIND,          SDRATTR_TEXT_ANIKIND,           ::getCppuType((const ::com::sun::star::drawing::TextAnimationKind*)0), 0,      0}, \
-    { UNO_NAME_TEXT_ANISTARTINSIDE,   SDRATTR_TEXT_ANISTARTINSIDE,    ::getBooleanCppuType(),        0,      0}, \
-    { UNO_NAME_TEXT_ANISTOPINSIDE,    SDRATTR_TEXT_ANISTOPINSIDE,     ::getBooleanCppuType(),        0,      0}, \
-    { UNO_NAME_TEXT_AUTOGROWHEIGHT,   SDRATTR_TEXT_AUTOGROWHEIGHT,    ::getBooleanCppuType(),        0,      0}, \
-    { UNO_NAME_TEXT_AUTOGROWWIDTH,    SDRATTR_TEXT_AUTOGROWWIDTH,     ::getBooleanCppuType(),        0,      0}, \
-    { UNO_NAME_TEXT_CONTOURFRAME,     SDRATTR_TEXT_CONTOURFRAME,      ::getBooleanCppuType(),        0,      0}, \
-    { UNO_NAME_TEXT_FITTOSIZE,        SDRATTR_TEXT_FITTOSIZE,         ::getCppuType((const ::com::sun::star::drawing::TextFitToSizeType*)0), 0,      0}, \
-    { UNO_NAME_TEXT_HORZADJUST,       SDRATTR_TEXT_HORZADJUST,        ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0),  0,      0}, \
-    { UNO_NAME_TEXT_LEFTDIST,         SDRATTR_TEXT_LEFTDIST,          ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_LOWERDIST,        SDRATTR_TEXT_LOWERDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MAXFRAMEHEIGHT,   SDRATTR_TEXT_MAXFRAMEHEIGHT,    ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MAXFRAMEWIDTH,    SDRATTR_TEXT_MAXFRAMEWIDTH,     ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MINFRAMEHEIGHT,   SDRATTR_TEXT_MINFRAMEHEIGHT,    ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MINFRAMEWIDTH,    SDRATTR_TEXT_MINFRAMEWIDTH,     ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_RIGHTDIST,        SDRATTR_TEXT_RIGHTDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_UPPERDIST,        SDRATTR_TEXT_UPPERDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-    { UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING,SDRATTR_TEXT_USEFIXEDCELLHEIGHT,::getBooleanCppuType(),                   0,      0},               \
-    { UNO_NAME_TEXT_VERTADJUST,       SDRATTR_TEXT_VERTADJUST,        ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0),    0,      0},\
-    { UNO_NAME_TEXT_WORDWRAP,         SDRATTR_TEXT_WORDWRAP,          ::getBooleanCppuType(),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_WRITINGMODE),      SDRATTR_TEXTDIRECTION,          &::getCppuType((const ::com::sun::star::text::WritingMode*)0),      0,      0},\
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_ANIAMOUNT),        SDRATTR_TEXT_ANIAMOUNT,         &::getCppuType((const sal_Int16*)0),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_ANICOUNT),         SDRATTR_TEXT_ANICOUNT,          &::getCppuType((const sal_Int16*)0),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_ANIDELAY),         SDRATTR_TEXT_ANIDELAY,          &::getCppuType((const sal_Int16*)0),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_ANIDIRECTION),     SDRATTR_TEXT_ANIDIRECTION,      &::getCppuType((const ::com::sun::star::drawing::TextAnimationDirection*)0),    0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_ANIKIND),          SDRATTR_TEXT_ANIKIND,           &::getCppuType((const ::com::sun::star::drawing::TextAnimationKind*)0), 0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_ANISTARTINSIDE),   SDRATTR_TEXT_ANISTARTINSIDE,    &::getBooleanCppuType(),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_ANISTOPINSIDE),    SDRATTR_TEXT_ANISTOPINSIDE,     &::getBooleanCppuType(),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_AUTOGROWHEIGHT),   SDRATTR_TEXT_AUTOGROWHEIGHT,    &::getBooleanCppuType(),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_AUTOGROWWIDTH),    SDRATTR_TEXT_AUTOGROWWIDTH,     &::getBooleanCppuType(),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_CONTOURFRAME),     SDRATTR_TEXT_CONTOURFRAME,      &::getBooleanCppuType(),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_FITTOSIZE),        SDRATTR_TEXT_FITTOSIZE,         &::getCppuType((const ::com::sun::star::drawing::TextFitToSizeType*)0), 0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_HORZADJUST),       SDRATTR_TEXT_HORZADJUST,        &::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0),  0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_LEFTDIST),         SDRATTR_TEXT_LEFTDIST,          &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_LOWERDIST),        SDRATTR_TEXT_LOWERDIST,         &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_MAXFRAMEHEIGHT),   SDRATTR_TEXT_MAXFRAMEHEIGHT,    &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_MAXFRAMEWIDTH),    SDRATTR_TEXT_MAXFRAMEWIDTH,     &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_MINFRAMEHEIGHT),   SDRATTR_TEXT_MINFRAMEHEIGHT,    &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_MINFRAMEWIDTH),    SDRATTR_TEXT_MINFRAMEWIDTH,     &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_RIGHTDIST),        SDRATTR_TEXT_RIGHTDIST,         &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_UPPERDIST),        SDRATTR_TEXT_UPPERDIST,         &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING),SDRATTR_TEXT_USEFIXEDCELLHEIGHT,&::getBooleanCppuType(),                   0,      0},               \
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_VERTADJUST),       SDRATTR_TEXT_VERTADJUST,        &::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0),    0,      0},\
+    { MAP_CHAR_LEN(UNO_NAME_TEXT_WORDWRAP),         SDRATTR_TEXT_WORDWRAP,          &::getBooleanCppuType(),        0,      0}, \
     SVX_UNOEDIT_CHAR_PROPERTIES, \
     SVX_UNOEDIT_PARA_PROPERTIES,
 
@@ -295,235 +295,235 @@
     SVX_UNOEDIT_NUMBERING_PROPERTIE, \
     TEXT_PROPERTIES_DEFAULTS
 
-//  { "HasLevels",                    OWN_ATTR_HASLEVELS,             ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,      0},
+//  { MAP_CHAR_LEN("HasLevels"),                    OWN_ATTR_HASLEVELS,             &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,      0},
 
 #define MISC_OBJ_PROPERTIES_NO_SHEAR \
-    { "Transformation",                   OWN_ATTR_TRANSFORMATION,    ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
-    { UNO_NAME_MISC_OBJ_ZORDER,           OWN_ATTR_ZORDER,            ::getCppuType((const sal_Int32*)0),        0,      0}, \
-    { UNO_NAME_MISC_OBJ_FRAMERECT,        OWN_ATTR_FRAMERECT,         ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0,  0 }, \
-    { UNO_NAME_MISC_OBJ_ROTATEANGLE,      SDRATTR_ROTATEANGLE,        ::getCppuType((const sal_Int32*)0),        0,  0}, \
-    { UNO_NAME_BITMAP,                    OWN_ATTR_BITMAP,            ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
-    { UNO_NAME_OLE2_METAFILE,             OWN_ATTR_METAFILE,          ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
-    { "IsFontwork",                       OWN_ATTR_ISFONTWORK,        ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
-    { UNO_NAME_MISC_OBJ_BOUNDRECT,        OWN_ATTR_BOUNDRECT,         ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+    { MAP_CHAR_LEN("Transformation"),                   OWN_ATTR_TRANSFORMATION,    &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),           OWN_ATTR_ZORDER,            &::getCppuType((const sal_Int32*)0),        0,      0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_FRAMERECT),        OWN_ATTR_FRAMERECT,         &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0,  0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ROTATEANGLE),      SDRATTR_ROTATEANGLE,        &::getCppuType((const sal_Int32*)0),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_BITMAP),                    OWN_ATTR_BITMAP,            &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE),             OWN_ATTR_METAFILE,          &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
+    { MAP_CHAR_LEN("IsFontwork"),                       OWN_ATTR_ISFONTWORK,        &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT),        OWN_ATTR_BOUNDRECT,         &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
 
 #define MISC_OBJ_PROPERTIES \
-    { UNO_NAME_MISC_OBJ_INTEROPGRABBAG,   OWN_ATTR_INTEROPGRABBAG,    ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_INTEROPGRABBAG),   OWN_ATTR_INTEROPGRABBAG,    &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0),  0,  0}, \
     MISC_OBJ_PROPERTIES_NO_SHEAR \
-    { UNO_NAME_MISC_OBJ_SHEARANGLE,       SDRATTR_SHEARANGLE,         ::getCppuType((const sal_Int32*)0),        0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SHEARANGLE),       SDRATTR_SHEARANGLE,         &::getCppuType((const sal_Int32*)0),        0,  0},
 
 
 #define SHAPE_DESCRIPTOR_PROPERTIES \
-    { UNO_NAME_MISC_OBJ_LAYERID,      SDRATTR_LAYERID                 , ::getCppuType((const sal_Int16*)0),          0,  0}, \
-    { UNO_NAME_MISC_OBJ_LAYERNAME,    SDRATTR_LAYERNAME               , ::getCppuType((const OUString*)0),    0,  0}, \
-    { UNO_NAME_MISC_OBJ_MOVEPROTECT,  SDRATTR_OBJMOVEPROTECT          , ::getBooleanCppuType(),                      0,  0}, \
-    { UNO_NAME_MISC_OBJ_NAME,         SDRATTR_OBJECTNAME              , ::getCppuType((const OUString*)0),    0,  0}, \
-    { UNO_NAME_MISC_OBJ_PRINTABLE,    SDRATTR_OBJPRINTABLE            , ::getBooleanCppuType(),                      0,  0}, \
-    { "Visible",                      SDRATTR_OBJVISIBLE              , ::getBooleanCppuType(),                      0,  0}, \
-    { UNO_NAME_MISC_OBJ_SIZEPROTECT,  SDRATTR_OBJSIZEPROTECT          , ::getBooleanCppuType(),                      0,  0},\
-    { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::getCppuType((const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY,   0}, \
-    { "UINamePlural",                 OWN_ATTR_UINAME_PLURAL          , ::getCppuType((const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID),      SDRATTR_LAYERID                 , &::getCppuType((const sal_Int16*)0),          0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),    SDRATTR_LAYERNAME               , &::getCppuType((const OUString*)0),    0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),  SDRATTR_OBJMOVEPROTECT          , &::getBooleanCppuType(),                      0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME),         SDRATTR_OBJECTNAME              , &::getCppuType((const OUString*)0),    0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE),    SDRATTR_OBJPRINTABLE            , &::getBooleanCppuType(),                      0,  0}, \
+    { MAP_CHAR_LEN("Visible"),                      SDRATTR_OBJVISIBLE              , &::getBooleanCppuType(),                      0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),  SDRATTR_OBJSIZEPROTECT          , &::getBooleanCppuType(),                      0,  0},\
+    { MAP_CHAR_LEN("UINameSingular"),               OWN_ATTR_UINAME_SINGULAR        , &::getCppuType((const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY,   0}, \
+    { MAP_CHAR_LEN("UINamePlural"),                 OWN_ATTR_UINAME_PLURAL          , &::getCppuType((const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY,   0}, \
     /* #i68101# */ \
-    { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0}, \
-    { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
 
 #define LINKTARGET_PROPERTIES \
-    { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::getCppuType((const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
-    { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP               , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+    { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , &::getCppuType((const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP               , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
 
 
 #define CONNECTOR_PROPERTIES \
-    { UNO_NAME_EDGEKIND,          SDRATTR_EDGEKIND,           ::getCppuType((const ::com::sun::star::drawing::ConnectorType*)0),     0,     0}, \
-    { UNO_NAME_EDGENODE1HORZDIST, SDRATTR_EDGENODE1HORZDIST,  ::getCppuType((const sal_Int32*)0),       0,     0}, \
-    { UNO_NAME_EDGENODE1VERTDIST, SDRATTR_EDGENODE1VERTDIST,  ::getCppuType((const sal_Int32*)0),       0,     0}, \
-    { UNO_NAME_EDGENODE2HORZDIST, SDRATTR_EDGENODE2HORZDIST,  ::getCppuType((const sal_Int32*)0),       0,     0}, \
-    { UNO_NAME_EDGENODE2VERTDIST, SDRATTR_EDGENODE2VERTDIST,  ::getCppuType((const sal_Int32*)0),       0,     0},
+    { MAP_CHAR_LEN(UNO_NAME_EDGEKIND),          SDRATTR_EDGEKIND,           &::getCppuType((const ::com::sun::star::drawing::ConnectorType*)0),     0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDGENODE1HORZDIST), SDRATTR_EDGENODE1HORZDIST,  &::getCppuType((const sal_Int32*)0),       0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDGENODE1VERTDIST), SDRATTR_EDGENODE1VERTDIST,  &::getCppuType((const sal_Int32*)0),       0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDGENODE2HORZDIST), SDRATTR_EDGENODE2HORZDIST,  &::getCppuType((const sal_Int32*)0),       0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDGENODE2VERTDIST), SDRATTR_EDGENODE2VERTDIST,  &::getCppuType((const sal_Int32*)0),       0,     0},
 
 #define SPECIAL_CONNECTOR_PROPERTIES \
     CONNECTOR_PROPERTIES \
-    { UNO_NAME_EDGELINE1DELTA,    SDRATTR_EDGELINE1DELTA,     ::getCppuType((const sal_Int32*)0),       0,     SFX_METRIC_ITEM}, \
-    { UNO_NAME_EDGELINE2DELTA,    SDRATTR_EDGELINE2DELTA,     ::getCppuType((const sal_Int32*)0),       0,     SFX_METRIC_ITEM}, \
-    { UNO_NAME_EDGELINE3DELTA,    SDRATTR_EDGELINE3DELTA,     ::getCppuType((const sal_Int32*)0),       0,     SFX_METRIC_ITEM}, \
-    { "StartShape",               OWN_ATTR_EDGE_START_OBJ,    ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0),        ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "StartGluePointIndex",      OWN_ATTR_GLUEID_HEAD,       ::getCppuType((const sal_Int32*)0),       0,     0}, \
-    { "StartPosition",            OWN_ATTR_EDGE_START_POS,    ::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0}, \
-    { "EndShape",                 OWN_ATTR_EDGE_END_OBJ,      ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0),     ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "EndPosition",              OWN_ATTR_EDGE_END_POS,      ::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0},\
-    { "EndGluePointIndex",        OWN_ATTR_GLUEID_TAIL,       ::getCppuType((const sal_Int32*)0),       0,     0}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDGELINE1DELTA),    SDRATTR_EDGELINE1DELTA,     &::getCppuType((const sal_Int32*)0),       0,     SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDGELINE2DELTA),    SDRATTR_EDGELINE2DELTA,     &::getCppuType((const sal_Int32*)0),       0,     SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_EDGELINE3DELTA),    SDRATTR_EDGELINE3DELTA,     &::getCppuType((const sal_Int32*)0),       0,     SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN("StartShape"),               OWN_ATTR_EDGE_START_OBJ,    &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0),        ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { MAP_CHAR_LEN("StartGluePointIndex"),      OWN_ATTR_GLUEID_HEAD,       &::getCppuType((const sal_Int32*)0),       0,     0}, \
+    { MAP_CHAR_LEN("StartPosition"),            OWN_ATTR_EDGE_START_POS,    &::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0}, \
+    { MAP_CHAR_LEN("EndShape"),                 OWN_ATTR_EDGE_END_OBJ,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0),     ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { MAP_CHAR_LEN("EndPosition"),              OWN_ATTR_EDGE_END_POS,      &::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0},\
+    { MAP_CHAR_LEN("EndGluePointIndex"),        OWN_ATTR_GLUEID_TAIL,       &::getCppuType((const sal_Int32*)0),       0,     0}, \
 \
-    { "EdgeStartConnection",      OWN_ATTR_EDGE_START_OBJ,    ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0),        ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "EdgeStartPoint",           OWN_ATTR_EDGE_START_POS,    ::getCppuType((const ::com::sun::star::awt::Point*)0),     ::com::sun::star::beans::PropertyAttribute::READONLY,    0}, \
-    { "EdgeEndConnection",        OWN_ATTR_EDGE_END_OBJ,      ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0),     ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "EdgeEndPoint",             OWN_ATTR_EDGE_END_POS,      ::getCppuType((const ::com::sun::star::awt::Point*)0),     ::com::sun::star::beans::PropertyAttribute::READONLY,    0}, \
+    { MAP_CHAR_LEN("EdgeStartConnection"),      OWN_ATTR_EDGE_START_OBJ,    &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0),        ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { MAP_CHAR_LEN("EdgeStartPoint"),           OWN_ATTR_EDGE_START_POS,    &::getCppuType((const ::com::sun::star::awt::Point*)0),     ::com::sun::star::beans::PropertyAttribute::READONLY,    0}, \
+    { MAP_CHAR_LEN("EdgeEndConnection"),        OWN_ATTR_EDGE_END_OBJ,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0),     ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { MAP_CHAR_LEN("EdgeEndPoint"),             OWN_ATTR_EDGE_END_POS,      &::getCppuType((const ::com::sun::star::awt::Point*)0),     ::com::sun::star::beans::PropertyAttribute::READONLY,    0}, \
 \
-    { UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_EDGE_POLYPOLYGONBEZIER,    ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),       0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_EDGE_POLYPOLYGONBEZIER,    &::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),       0,  0},
 
 #define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \
-    { UNO_NAME_MEASUREBELOWREFEDGE,       SDRATTR_MEASUREBELOWREFEDGE,        ::getBooleanCppuType(),        0,  0}, \
-    { UNO_NAME_MEASUREFORMATSTRING,       SDRATTR_MEASUREFORMATSTRING,        ::getCppuType((const OUString*)0),      0,  0}, \
-    { UNO_NAME_MEASUREHELPLINE1LEN,       SDRATTR_MEASUREHELPLINE1LEN,        ::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_MEASUREHELPLINE2LEN,       SDRATTR_MEASUREHELPLINE2LEN,        ::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_MEASUREHELPLINEDIST,       SDRATTR_MEASUREHELPLINEDIST,        ::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_MEASUREHELPLINEOVERHANG,   SDRATTR_MEASUREHELPLINEOVERHANG,    ::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_MEASUREKIND,               SDRATTR_MEASUREKIND,                ::getCppuType((const ::com::sun::star::drawing::MeasureKind*)0),   0,  0}, \
-    { UNO_NAME_MEASURELINEDIST,           SDRATTR_MEASURELINEDIST,            ::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_MEASUREOVERHANG,           SDRATTR_MEASUREOVERHANG,            ::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_MEASUREUNIT,               SDRATTR_MEASUREUNIT,                ::getCppuType((const sal_Int32*)0),    0,  0},\
-    { UNO_NAME_MEASURESHOWUNIT,           SDRATTR_MEASURESHOWUNIT,            ::getBooleanCppuType(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTAUTOANGLE,      SDRATTR_MEASURETEXTAUTOANGLE,       ::getBooleanCppuType(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTAUTOANGLEVIEW,  SDRATTR_MEASURETEXTAUTOANGLEVIEW,   ::getCppuType((const sal_Int32*)0),        0,  0}, \
-    { UNO_NAME_MEASURETEXTFIXEDANGLE,     SDRATTR_MEASURETEXTFIXEDANGLE,      ::getCppuType((const sal_Int32*)0),        0,  0}, \
-    { UNO_NAME_MEASURETEXTHPOS,           SDRATTR_MEASURETEXTHPOS,            ::getCppuType((const ::com::sun::star::drawing::MeasureTextHorzPos*)0),    0,  0}, \
-    { UNO_NAME_MEASURETEXTISFIXEDANGLE,   SDRATTR_MEASURETEXTISFIXEDANGLE,    ::getBooleanCppuType(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTROTA90,         SDRATTR_MEASURETEXTROTA90,          ::getBooleanCppuType(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTUPSIDEDOWN,     SDRATTR_MEASURETEXTUPSIDEDOWN,      ::getBooleanCppuType(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTVPOS,           SDRATTR_MEASURETEXTVPOS,            ::getCppuType((const ::com::sun::star::drawing::MeasureTextVertPos*)0),    0,  0}, \
-    { "MeasureDecimalPlaces",             SDRATTR_MEASUREDECIMALPLACES,       ::getCppuType((const sal_Int16*)0),        0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREBELOWREFEDGE),       SDRATTR_MEASUREBELOWREFEDGE,        &::getBooleanCppuType(),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREFORMATSTRING),       SDRATTR_MEASUREFORMATSTRING,        &::getCppuType((const OUString*)0),      0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINE1LEN),       SDRATTR_MEASUREHELPLINE1LEN,        &::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINE2LEN),       SDRATTR_MEASUREHELPLINE2LEN,        &::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINEDIST),       SDRATTR_MEASUREHELPLINEDIST,        &::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINEOVERHANG),   SDRATTR_MEASUREHELPLINEOVERHANG,    &::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREKIND),               SDRATTR_MEASUREKIND,                &::getCppuType((const ::com::sun::star::drawing::MeasureKind*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURELINEDIST),           SDRATTR_MEASURELINEDIST,            &::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREOVERHANG),           SDRATTR_MEASUREOVERHANG,            &::getCppuType((const sal_Int32*)0),        0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASUREUNIT),               SDRATTR_MEASUREUNIT,                &::getCppuType((const sal_Int32*)0),    0,  0},\
+    { MAP_CHAR_LEN(UNO_NAME_MEASURESHOWUNIT),           SDRATTR_MEASURESHOWUNIT,            &::getBooleanCppuType(),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTAUTOANGLE),      SDRATTR_MEASURETEXTAUTOANGLE,       &::getBooleanCppuType(),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTAUTOANGLEVIEW),  SDRATTR_MEASURETEXTAUTOANGLEVIEW,   &::getCppuType((const sal_Int32*)0),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTFIXEDANGLE),     SDRATTR_MEASURETEXTFIXEDANGLE,      &::getCppuType((const sal_Int32*)0),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTHPOS),           SDRATTR_MEASURETEXTHPOS,            &::getCppuType((const ::com::sun::star::drawing::MeasureTextHorzPos*)0),    0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTISFIXEDANGLE),   SDRATTR_MEASURETEXTISFIXEDANGLE,    &::getBooleanCppuType(),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTROTA90),         SDRATTR_MEASURETEXTROTA90,          &::getBooleanCppuType(),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTUPSIDEDOWN),     SDRATTR_MEASURETEXTUPSIDEDOWN,      &::getBooleanCppuType(),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_MEASURETEXTVPOS),           SDRATTR_MEASURETEXTVPOS,            &::getCppuType((const ::com::sun::star::drawing::MeasureTextVertPos*)0),    0,  0}, \
+    { MAP_CHAR_LEN("MeasureDecimalPlaces"),             SDRATTR_MEASUREDECIMALPLACES,       &::getCppuType((const sal_Int16*)0),        0,  0},
 
 
 #define SPECIAL_DIMENSIONING_PROPERTIES \
     SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \
-    { "StartPosition",                    OWN_ATTR_MEASURE_START_POS,         ::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0},\
-    { "EndPosition",                      OWN_ATTR_MEASURE_END_POS,           ::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0},
+    { MAP_CHAR_LEN("StartPosition"),                    OWN_ATTR_MEASURE_START_POS,         &::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0},\
+    { MAP_CHAR_LEN("EndPosition"),                      OWN_ATTR_MEASURE_END_POS,           &::getCppuType((const ::com::sun::star::awt::Point*)0),     0,   0},
 
 #define SPECIAL_CIRCLE_PROPERTIES \
-    { UNO_NAME_CIRCENDANGLE,  SDRATTR_CIRCENDANGLE,   ::getCppuType((const sal_Int32*)0),        0,  0}, \
-    { UNO_NAME_CIRCKIND,      SDRATTR_CIRCKIND,       ::getCppuType((const ::com::sun::star::drawing::CircleKind*)0),    0,  0}, \
-    { UNO_NAME_CIRCSTARTANGLE,SDRATTR_CIRCSTARTANGLE, ::getCppuType((const sal_Int32*)0),        0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_CIRCENDANGLE),  SDRATTR_CIRCENDANGLE,   &::getCppuType((const sal_Int32*)0),        0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_CIRCKIND),      SDRATTR_CIRCKIND,       &::getCppuType((const ::com::sun::star::drawing::CircleKind*)0),    0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_CIRCSTARTANGLE),SDRATTR_CIRCSTARTANGLE, &::getCppuType((const sal_Int32*)0),        0,  0},
 
 #define SPECIAL_POLYGON_PROPERTIES \
-    { UNO_NAME_POLYGONKIND,   OWN_ATTR_VALUE_POLYGONKIND, ::getCppuType((const ::com::sun::star::drawing::PolygonKind*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+    { MAP_CHAR_LEN(UNO_NAME_POLYGONKIND),   OWN_ATTR_VALUE_POLYGONKIND, &::getCppuType((const ::com::sun::star::drawing::PolygonKind*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
 
 #define SPECIAL_POLYPOLYGON_PROPERTIES \
-    { UNO_NAME_POLYPOLYGON,   OWN_ATTR_VALUE_POLYPOLYGON, ::getCppuType((const ::com::sun::star::drawing::PointSequenceSequence*)0), 0,  0}, \
-    { UNO_NAME_POLYGON,       OWN_ATTR_VALUE_POLYGON,     ::getCppuType((const ::com::sun::star::drawing::PointSequence*)0),         0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_POLYPOLYGON),   OWN_ATTR_VALUE_POLYPOLYGON, &::getCppuType((const ::com::sun::star::drawing::PointSequenceSequence*)0), 0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_POLYGON),       OWN_ATTR_VALUE_POLYGON,     &::getCppuType((const ::com::sun::star::drawing::PointSequence*)0),         0,  0},
 
 #define SPECIAL_POLYPOLYGONBEZIER_PROPERTIES \
-    { UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_VALUE_POLYPOLYGONBEZIER,   ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),       0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_VALUE_POLYPOLYGONBEZIER,   &::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),       0,  0},
 
 #define SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
-    { UNO_NAME_GRAPHIC_LUMINANCE,     SDRATTR_GRAFLUMINANCE       , ::getCppuType((const sal_Int16*)0),          0,   0}, \
-    { UNO_NAME_GRAPHIC_CONTRAST,      SDRATTR_GRAFCONTRAST        , ::getCppuType((const sal_Int16*)0),          0,   0}, \
-    { UNO_NAME_GRAPHIC_RED,           SDRATTR_GRAFRED             , ::getCppuType((const sal_Int16*)0),          0,   0}, \
-    { UNO_NAME_GRAPHIC_GREEN,         SDRATTR_GRAFGREEN           , ::getCppuType((const sal_Int16*)0),          0,   0}, \
-    { UNO_NAME_GRAPHIC_BLUE,          SDRATTR_GRAFBLUE            , ::getCppuType((const sal_Int16*)0),          0,   0}, \
-    { UNO_NAME_GRAPHIC_GAMMA,         SDRATTR_GRAFGAMMA           , ::getCppuType((const double*)0),     0,   0}, \
-    { UNO_NAME_GRAPHIC_TRANSPARENCY,  SDRATTR_GRAFTRANSPARENCE    , ::getCppuType((const sal_Int16*)0),          0,   0}, \
-    { UNO_NAME_GRAPHIC_COLOR_MODE,    SDRATTR_GRAFMODE            , ::getCppuType((const ::com::sun::star::drawing::ColorMode*)0),       0,   0},
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_LUMINANCE),     SDRATTR_GRAFLUMINANCE       , &::getCppuType((const sal_Int16*)0),          0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_CONTRAST),      SDRATTR_GRAFCONTRAST        , &::getCppuType((const sal_Int16*)0),          0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_RED),           SDRATTR_GRAFRED             , &::getCppuType((const sal_Int16*)0),          0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_GREEN),         SDRATTR_GRAFGREEN           , &::getCppuType((const sal_Int16*)0),          0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_BLUE),          SDRATTR_GRAFBLUE            , &::getCppuType((const sal_Int16*)0),          0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_GAMMA),         SDRATTR_GRAFGAMMA           , &::getCppuType((const double*)0),     0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_TRANSPARENCY),  SDRATTR_GRAFTRANSPARENCE    , &::getCppuType((const sal_Int16*)0),          0,   0}, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_COLOR_MODE),    SDRATTR_GRAFMODE            , &::getCppuType((const ::com::sun::star::drawing::ColorMode*)0),       0,   0},
 
 #define SPECIAL_GRAPHOBJ_PROPERTIES \
     SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
-    { UNO_NAME_GRAPHIC_GRAPHICCROP,           SDRATTR_GRAFCROP            , ::getCppuType((const ::com::sun::star::text::GraphicCrop*)0),        0,  0 }, \
-    { UNO_NAME_GRAPHOBJ_GRAFURL,              OWN_ATTR_GRAFURL            , ::getCppuType((const OUString*)0), 0, 0 }, \
-    { UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL,   OWN_ATTR_REPLACEMENTGRAFURL , ::getCppuType((const OUString*)0), 0, 0 }, \
-    { UNO_NAME_GRAPHOBJ_GRAFSTREAMURL,        OWN_ATTR_GRAFSTREAMURL      , ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \
-    { UNO_NAME_GRAPHOBJ_FILLBITMAP,           OWN_ATTR_VALUE_FILLBITMAP   , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>*)0)  ,    0,     0},    \
-    { UNO_NAME_GRAPHOBJ_GRAPHIC,              OWN_ATTR_VALUE_GRAPHIC      , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0)  ,   0,     0},
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_GRAPHICCROP),           SDRATTR_GRAFCROP            , &::getCppuType((const ::com::sun::star::text::GraphicCrop*)0),        0,  0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFURL),              OWN_ATTR_GRAFURL            , &::getCppuType((const OUString*)0), 0, 0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL),   OWN_ATTR_REPLACEMENTGRAFURL , &::getCppuType((const OUString*)0), 0, 0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),        OWN_ATTR_GRAFSTREAMURL      , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_FILLBITMAP),           OWN_ATTR_VALUE_FILLBITMAP   , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>*)0)  ,    0,     0},    \
+    { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAPHIC),              OWN_ATTR_VALUE_GRAPHIC      , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0)  ,   0,     0},
 
 
 #define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
-    { UNO_NAME_3D_SCENE_AMBIENTCOLOR,     SDRATTR_3DSCENE_AMBIENTCOLOR   , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_DISTANCE,         SDRATTR_3DSCENE_DISTANCE       , ::getCppuType((const sal_Int32*)0),   0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_3D_SCENE_FOCAL_LENGTH,     SDRATTR_3DSCENE_FOCAL_LENGTH   , ::getCppuType((const sal_Int32*)0),   0,  SFX_METRIC_ITEM}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_1,     SDRATTR_3DSCENE_LIGHTCOLOR_1       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_2,     SDRATTR_3DSCENE_LIGHTCOLOR_2       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_3,     SDRATTR_3DSCENE_LIGHTCOLOR_3       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_4,     SDRATTR_3DSCENE_LIGHTCOLOR_4       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_5,     SDRATTR_3DSCENE_LIGHTCOLOR_5       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_6,     SDRATTR_3DSCENE_LIGHTCOLOR_6       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_7,     SDRATTR_3DSCENE_LIGHTCOLOR_7       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_8,     SDRATTR_3DSCENE_LIGHTCOLOR_8       , ::getCppuType((const sal_Int32*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_1, SDRATTR_3DSCENE_LIGHTDIRECTION_1   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, SDRATTR_3DSCENE_LIGHTDIRECTION_2   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_3, SDRATTR_3DSCENE_LIGHTDIRECTION_3   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_4, SDRATTR_3DSCENE_LIGHTDIRECTION_4   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_5, SDRATTR_3DSCENE_LIGHTDIRECTION_5   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_6, SDRATTR_3DSCENE_LIGHTDIRECTION_6   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_7, SDRATTR_3DSCENE_LIGHTDIRECTION_7   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_8, SDRATTR_3DSCENE_LIGHTDIRECTION_8   , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_1,        SDRATTR_3DSCENE_LIGHTON_1          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_2,        SDRATTR_3DSCENE_LIGHTON_2          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_3,        SDRATTR_3DSCENE_LIGHTON_3          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_4,        SDRATTR_3DSCENE_LIGHTON_4          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_5,        SDRATTR_3DSCENE_LIGHTON_5          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_6,        SDRATTR_3DSCENE_LIGHTON_6          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_7,        SDRATTR_3DSCENE_LIGHTON_7          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_8,        SDRATTR_3DSCENE_LIGHTON_8          , ::getBooleanCppuType(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_PERSPECTIVE,      SDRATTR_3DSCENE_PERSPECTIVE    , ::getCppuType((const ::com::sun::star::drawing::ProjectionMode*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_SHADOW_SLANT,     SDRATTR_3DSCENE_SHADOW_SLANT   , ::getCppuType((const sal_Int16*)0),   0,  0}, \
-    { UNO_NAME_3D_SCENE_SHADE_MODE,       SDRATTR_3DSCENE_SHADE_MODE     , ::getCppuType((const ::com::sun::star::drawing::ShadeMode*)0),    0,  0}, \
-    { UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING,SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, ::getBooleanCppuType(),   0,  0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_AMBIENTCOLOR),     SDRATTR_3DSCENE_AMBIENTCOLOR   , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_DISTANCE),         SDRATTR_3DSCENE_DISTANCE       , &::getCppuType((const sal_Int32*)0),   0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_FOCAL_LENGTH),     SDRATTR_3DSCENE_FOCAL_LENGTH   , &::getCppuType((const sal_Int32*)0),   0,  SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_1),     SDRATTR_3DSCENE_LIGHTCOLOR_1       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_2),     SDRATTR_3DSCENE_LIGHTCOLOR_2       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_3),     SDRATTR_3DSCENE_LIGHTCOLOR_3       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_4),     SDRATTR_3DSCENE_LIGHTCOLOR_4       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_5),     SDRATTR_3DSCENE_LIGHTCOLOR_5       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_6),     SDRATTR_3DSCENE_LIGHTCOLOR_6       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_7),     SDRATTR_3DSCENE_LIGHTCOLOR_7       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTCOLOR_8),     SDRATTR_3DSCENE_LIGHTCOLOR_8       , &::getCppuType((const sal_Int32*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_1), SDRATTR_3DSCENE_LIGHTDIRECTION_1   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_2), SDRATTR_3DSCENE_LIGHTDIRECTION_2   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_3), SDRATTR_3DSCENE_LIGHTDIRECTION_3   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_4), SDRATTR_3DSCENE_LIGHTDIRECTION_4   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_5), SDRATTR_3DSCENE_LIGHTDIRECTION_5   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_6), SDRATTR_3DSCENE_LIGHTDIRECTION_6   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_7), SDRATTR_3DSCENE_LIGHTDIRECTION_7   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTDIRECTION_8), SDRATTR_3DSCENE_LIGHTDIRECTION_8   , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0),  0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_1),        SDRATTR_3DSCENE_LIGHTON_1          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_2),        SDRATTR_3DSCENE_LIGHTON_2          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_3),        SDRATTR_3DSCENE_LIGHTON_3          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_4),        SDRATTR_3DSCENE_LIGHTON_4          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_5),        SDRATTR_3DSCENE_LIGHTON_5          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_6),        SDRATTR_3DSCENE_LIGHTON_6          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_7),        SDRATTR_3DSCENE_LIGHTON_7          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_LIGHTON_8),        SDRATTR_3DSCENE_LIGHTON_8          , &::getBooleanCppuType(),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_PERSPECTIVE),      SDRATTR_3DSCENE_PERSPECTIVE    , &::getCppuType((const ::com::sun::star::drawing::ProjectionMode*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_SHADOW_SLANT),     SDRATTR_3DSCENE_SHADOW_SLANT   , &::getCppuType((const sal_Int16*)0),   0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_SHADE_MODE),       SDRATTR_3DSCENE_SHADE_MODE     , &::getCppuType((const ::com::sun::star::drawing::ShadeMode*)0),    0,  0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING),SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, &::getBooleanCppuType(),   0,  0},
 
 #define SPECIAL_3DSCENEOBJECT_PROPERTIES \
     SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
-    { UNO_NAME_3D_TRANSFORM_MATRIX,       OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX  , ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
-    { UNO_NAME_3D_CAMERA_GEOMETRY,        OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY   , ::getCppuType((const ::com::sun::star::drawing::CameraGeometry*)0), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_TRANSFORM_MATRIX),       OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX  , &::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_CAMERA_GEOMETRY),        OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY   , &::getCppuType((const ::com::sun::star::drawing::CameraGeometry*)0), 0, 0},
 
 // #i28528#
 // Added extra Item (Bool) for chart2 to be able to show reduced line geometry (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)
 #define MISC_3D_OBJ_PROPERTIES \
-    { UNO_NAME_3D_DOUBLE_SIDED             ,SDRATTR_3DOBJ_DOUBLE_SIDED            , ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_MAT_COLOR                ,SDRATTR_3DOBJ_MAT_COLOR               , ::getCppuType((const sal_Int32*)0), 0, 0}, \
-    { UNO_NAME_3D_MAT_EMISSION             ,SDRATTR_3DOBJ_MAT_EMISSION            , ::getCppuType((const sal_Int32*)0), 0, 0}, \
-    { UNO_NAME_3D_MAT_SPECULAR             ,SDRATTR_3DOBJ_MAT_SPECULAR            , ::getCppuType((const sal_Int32*)0), 0, 0}, \
-    { UNO_NAME_3D_MAT_SPECULAR_INTENSITY   ,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY  , ::getCppuType((const sal_Int16*)0), 0, 0}, \
-    { UNO_NAME_3D_NORMALS_INVERT           ,SDRATTR_3DOBJ_NORMALS_INVERT          , ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_NORMALS_KIND             ,SDRATTR_3DOBJ_NORMALS_KIND            , ::getCppuType((const ::com::sun::star::drawing::NormalsKind*)0), 0, 0}, \
-    { UNO_NAME_3D_SHADOW_3D                ,SDRATTR_3DOBJ_SHADOW_3D               , ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_FILTER           ,SDRATTR_3DOBJ_TEXTURE_FILTER          , ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_KIND             ,SDRATTR_3DOBJ_TEXTURE_KIND            , ::getCppuType((const ::com::sun::star::drawing::TextureKind*)0), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_MODE             ,SDRATTR_3DOBJ_TEXTURE_MODE            , ::getCppuType((const ::com::sun::star::drawing::TextureMode*)0), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_PROJ_X           ,SDRATTR_3DOBJ_TEXTURE_PROJ_X          , ::getCppuType((const ::com::sun::star::drawing::TextureProjectionMode*)0), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_PROJ_Y           ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y          , ::getCppuType((const ::com::sun::star::drawing::TextureProjectionMode*)0), 0, 0}, \
-    { UNO_NAME_3D_REDUCED_LINE_GEOMETRY    ,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY   , ::getBooleanCppuType(), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_DOUBLE_SIDED             ),SDRATTR_3DOBJ_DOUBLE_SIDED            , &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_MAT_COLOR                ),SDRATTR_3DOBJ_MAT_COLOR               , &::getCppuType((const sal_Int32*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_MAT_EMISSION             ),SDRATTR_3DOBJ_MAT_EMISSION            , &::getCppuType((const sal_Int32*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_MAT_SPECULAR             ),SDRATTR_3DOBJ_MAT_SPECULAR            , &::getCppuType((const sal_Int32*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_MAT_SPECULAR_INTENSITY   ),SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY  , &::getCppuType((const sal_Int16*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_NORMALS_INVERT           ),SDRATTR_3DOBJ_NORMALS_INVERT          , &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_NORMALS_KIND             ),SDRATTR_3DOBJ_NORMALS_KIND            , &::getCppuType((const ::com::sun::star::drawing::NormalsKind*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SHADOW_3D                ),SDRATTR_3DOBJ_SHADOW_3D               , &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_TEXTURE_FILTER           ),SDRATTR_3DOBJ_TEXTURE_FILTER          , &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_TEXTURE_KIND             ),SDRATTR_3DOBJ_TEXTURE_KIND            , &::getCppuType((const ::com::sun::star::drawing::TextureKind*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_TEXTURE_MODE             ),SDRATTR_3DOBJ_TEXTURE_MODE            , &::getCppuType((const ::com::sun::star::drawing::TextureMode*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_TEXTURE_PROJ_X           ),SDRATTR_3DOBJ_TEXTURE_PROJ_X          , &::getCppuType((const ::com::sun::star::drawing::TextureProjectionMode*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_TEXTURE_PROJ_Y           ),SDRATTR_3DOBJ_TEXTURE_PROJ_Y          , &::getCppuType((const ::com::sun::star::drawing::TextureProjectionMode*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_REDUCED_LINE_GEOMETRY    ),SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY   , &::getBooleanCppuType(), 0, 0},
 
 #define SPECIAL_3DCUBEOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
-    { UNO_NAME_3D_POS              ,OWN_ATTR_3D_VALUE_POSITION            , ::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \
-    { UNO_NAME_3D_SIZE             ,OWN_ATTR_3D_VALUE_SIZE                , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \
-    { UNO_NAME_3D_POS_IS_CENTER    ,OWN_ATTR_3D_VALUE_POS_IS_CENTER       , ::getBooleanCppuType(), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_TRANSFORM_MATRIX ),OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , &::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_POS              ),OWN_ATTR_3D_VALUE_POSITION            , &::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SIZE             ),OWN_ATTR_3D_VALUE_SIZE                , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_POS_IS_CENTER    ),OWN_ATTR_3D_VALUE_POS_IS_CENTER   , &::getBooleanCppuType(), 0, 0},
 
 #define SPECIAL_3DSPHEREOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
-    { UNO_NAME_3D_POS              ,OWN_ATTR_3D_VALUE_POSITION            , ::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \
-    { UNO_NAME_3D_SIZE             ,OWN_ATTR_3D_VALUE_SIZE                , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \
-    { UNO_NAME_3D_HORZ_SEGS        ,SDRATTR_3DOBJ_HORZ_SEGS, ::getCppuType((const sal_Int32*)0), 0, 0}, \
-    { UNO_NAME_3D_VERT_SEGS        ,SDRATTR_3DOBJ_VERT_SEGS, ::getCppuType((const sal_Int32*)0), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_TRANSFORM_MATRIX ),OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , &::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_POS              ),OWN_ATTR_3D_VALUE_POSITION            , &::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SIZE             ),OWN_ATTR_3D_VALUE_SIZE                , &::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_HORZ_SEGS        ),SDRATTR_3DOBJ_HORZ_SEGS, &::getCppuType((const sal_Int32*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_VERT_SEGS        ),SDRATTR_3DOBJ_VERT_SEGS, &::getCppuType((const sal_Int32*)0), 0, 0},
 
 // #107245# New 3D properties which are possible for lathe and extrude 3d objects
 #define SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES \
-    { UNO_NAME_3D_SMOOTH_NORMALS   , SDRATTR_3DOBJ_SMOOTH_NORMALS,    ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_SMOOTH_LIDS      , SDRATTR_3DOBJ_SMOOTH_LIDS,       ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_CHARACTER_MODE   , SDRATTR_3DOBJ_CHARACTER_MODE,    ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_CLOSE_FRONT      , SDRATTR_3DOBJ_CLOSE_FRONT,       ::getBooleanCppuType(), 0, 0}, \
-    { UNO_NAME_3D_CLOSE_BACK       , SDRATTR_3DOBJ_CLOSE_BACK,        ::getBooleanCppuType(), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_SMOOTH_NORMALS   ), SDRATTR_3DOBJ_SMOOTH_NORMALS,    &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_SMOOTH_LIDS      ), SDRATTR_3DOBJ_SMOOTH_LIDS,       &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_CHARACTER_MODE   ), SDRATTR_3DOBJ_CHARACTER_MODE,    &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_CLOSE_FRONT      ), SDRATTR_3DOBJ_CLOSE_FRONT,       &::getBooleanCppuType(), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_CLOSE_BACK       ), SDRATTR_3DOBJ_CLOSE_BACK,        &::getBooleanCppuType(), 0, 0},
 
 #define SPECIAL_3DLATHEOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
-    { UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
-    { UNO_NAME_3D_LATHE_END_ANGLE  ,SDRATTR_3DOBJ_END_ANGLE           ,::getCppuType((const sal_Int16*)0), 0, 0}, \
-    { UNO_NAME_3D_HORZ_SEGS        ,SDRATTR_3DOBJ_HORZ_SEGS           ,::getCppuType((const sal_Int32*)0), 0, 0}, \
-    { UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,::getCppuType((const sal_Int16*)0), 0, 0}, \
-    { UNO_NAME_3D_VERT_SEGS        ,SDRATTR_3DOBJ_VERT_SEGS           ,::getCppuType((const sal_Int32*)0), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_TRANSFORM_MATRIX ),OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    ,&::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_POLYPOLYGON3D    ),OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,&::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_LATHE_END_ANGLE  ),SDRATTR_3DOBJ_END_ANGLE           ,&::getCppuType((const sal_Int16*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_HORZ_SEGS        ),SDRATTR_3DOBJ_HORZ_SEGS           ,&::getCppuType((const sal_Int32*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_PERCENT_DIAGONAL ),SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,&::getCppuType((const sal_Int16*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_VERT_SEGS        ),SDRATTR_3DOBJ_VERT_SEGS           ,&::getCppuType((const sal_Int32*)0), 0, 0},
 
 #define SPECIAL_3DEXTRUDEOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
-    { UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
-    { UNO_NAME_3D_EXTRUDE_DEPTH    ,SDRATTR_3DOBJ_DEPTH               ,::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
-    { UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,::getCppuType((const sal_Int16*)0), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_TRANSFORM_MATRIX ),OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    ,&::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_POLYPOLYGON3D    ),OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,&::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_EXTRUDE_DEPTH    ),SDRATTR_3DOBJ_DEPTH               ,&::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_PERCENT_DIAGONAL ),SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,&::getCppuType((const sal_Int16*)0), 0, 0},
 
 #define SPECIAL_3DPOLYGONOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX, ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
-    { UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   , ::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
-    { UNO_NAME_3D_NORMALSPOLYGON3D ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
-    { UNO_NAME_3D_TEXTUREPOLYGON3D ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
-    { UNO_NAME_3D_LINEONLY         ,OWN_ATTR_3D_VALUE_LINEONLY        , ::getBooleanCppuType(), 0, 0},
+    { MAP_CHAR_LEN(UNO_NAME_3D_TRANSFORM_MATRIX ),OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , &::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_POLYPOLYGON3D    ),OWN_ATTR_3D_VALUE_POLYPOLYGON3D   , &::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_NORMALSPOLYGON3D ),OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, &::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_TEXTUREPOLYGON3D ),OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, &::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_LINEONLY         ),OWN_ATTR_3D_VALUE_LINEONLY        , &::getBooleanCppuType(), 0, 0},
 
 #define SPECIAL_3DBACKSCALE_PROPERTIES \
-    { UNO_NAME_3D_BACKSCALE        ,SDRATTR_3DOBJ_BACKSCALE           , ::getCppuType((const sal_Int16*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_3D_BACKSCALE        ),SDRATTR_3DOBJ_BACKSCALE           ,&::getCppuType((const sal_Int16*)0), 0, 0}, \
 
 #define CUSTOMSHAPE_PROPERTIES \
-    { UNO_NAME_CUSTOMSHAPE_ADJUSTMENT,SDRATTR_CUSTOMSHAPE_ADJUSTMENT,         ::getCppuType((::com::sun::star::uno::Sequence<sal_Int32>*)0), 0, 0}, \
+    { MAP_CHAR_LEN(UNO_NAME_CUSTOMSHAPE_ADJUSTMENT),SDRATTR_CUSTOMSHAPE_ADJUSTMENT,         &::getCppuType((::com::sun::star::uno::Sequence<sal_Int32>*)0), 0, 0}, \
 
 #endif
 
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 02029c740b16..800ed673994e 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -146,47 +146,47 @@ static const SfxItemPropertyMapEntry* lcl_GetLinguProps()
 {
     static const SfxItemPropertyMapEntry aLinguProps[] =
     {
-        { UPN_DEFAULT_LANGUAGE,           WID_DEFAULT_LANGUAGE,
-                ::getCppuType( (sal_Int16*)0 ),    0, 0 },
-        { UPN_DEFAULT_LOCALE,             WID_DEFAULT_LOCALE,
-                ::getCppuType( (Locale* )0),       0, 0 },
-        { UPN_DEFAULT_LOCALE_CJK,         WID_DEFAULT_LOCALE_CJK,
-                ::getCppuType( (Locale* )0),       0, 0 },
-        { UPN_DEFAULT_LOCALE_CTL,         WID_DEFAULT_LOCALE_CTL,
-                ::getCppuType( (Locale* )0),       0, 0 },
-        { UPN_HYPH_MIN_LEADING,           WID_HYPH_MIN_LEADING,
-                ::getCppuType( (sal_Int16*)0 ),    0, 0 },
-        { UPN_HYPH_MIN_TRAILING,          WID_HYPH_MIN_TRAILING,
-                ::getCppuType( (sal_Int16*)0 ),    0, 0 },
-        { UPN_HYPH_MIN_WORD_LENGTH,       WID_HYPH_MIN_WORD_LENGTH,
-                ::getCppuType( (sal_Int16*)0 ),    0, 0 },
-        { UPN_IS_GERMAN_PRE_REFORM,       WID_IS_GERMAN_PRE_REFORM,       /*! deprecated !*/
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_HYPH_AUTO,               WID_IS_HYPH_AUTO,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_HYPH_SPECIAL,            WID_IS_HYPH_SPECIAL,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_IGNORE_CONTROL_CHARACTERS,   WID_IS_IGNORE_CONTROL_CHARACTERS,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_SPELL_AUTO,              WID_IS_SPELL_AUTO,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_SPELL_CAPITALIZATION,    WID_IS_SPELL_CAPITALIZATION,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_SPELL_HIDE,              WID_IS_SPELL_HIDE,              /*! deprecated !*/
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_SPELL_IN_ALL_LANGUAGES,  WID_IS_SPELL_IN_ALL_LANGUAGES,  /*! deprecated !*/
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_SPELL_SPECIAL,           WID_IS_SPELL_SPECIAL,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_SPELL_UPPER_CASE,        WID_IS_SPELL_UPPER_CASE,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_SPELL_WITH_DIGITS,       WID_IS_SPELL_WITH_DIGITS,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_USE_DICTIONARY_LIST,     WID_IS_USE_DICTIONARY_LIST,
-                ::getBooleanCppuType(),            0, 0 },
-        { UPN_IS_WRAP_REVERSE,            WID_IS_WRAP_REVERSE,
-                ::getBooleanCppuType(),            0, 0 },
-        {}
+        { MAP_CHAR_LEN(UPN_DEFAULT_LANGUAGE),           WID_DEFAULT_LANGUAGE,
+                &::getCppuType( (sal_Int16*)0 ),    0, 0 },
+        { MAP_CHAR_LEN(UPN_DEFAULT_LOCALE),             WID_DEFAULT_LOCALE,
+                &::getCppuType( (Locale* )0),       0, 0 },
+        { MAP_CHAR_LEN(UPN_DEFAULT_LOCALE_CJK),         WID_DEFAULT_LOCALE_CJK,
+                &::getCppuType( (Locale* )0),       0, 0 },
+        { MAP_CHAR_LEN(UPN_DEFAULT_LOCALE_CTL),         WID_DEFAULT_LOCALE_CTL,
+                &::getCppuType( (Locale* )0),       0, 0 },
+        { MAP_CHAR_LEN(UPN_HYPH_MIN_LEADING),           WID_HYPH_MIN_LEADING,
+                &::getCppuType( (sal_Int16*)0 ),    0, 0 },
+        { MAP_CHAR_LEN(UPN_HYPH_MIN_TRAILING),          WID_HYPH_MIN_TRAILING,
+                &::getCppuType( (sal_Int16*)0 ),    0, 0 },
+        { MAP_CHAR_LEN(UPN_HYPH_MIN_WORD_LENGTH),       WID_HYPH_MIN_WORD_LENGTH,
+                &::getCppuType( (sal_Int16*)0 ),    0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_GERMAN_PRE_REFORM),       WID_IS_GERMAN_PRE_REFORM,       /*! deprecated !*/
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_HYPH_AUTO),               WID_IS_HYPH_AUTO,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_HYPH_SPECIAL),            WID_IS_HYPH_SPECIAL,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_IGNORE_CONTROL_CHARACTERS),   WID_IS_IGNORE_CONTROL_CHARACTERS,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_SPELL_AUTO),              WID_IS_SPELL_AUTO,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_SPELL_CAPITALIZATION),    WID_IS_SPELL_CAPITALIZATION,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_SPELL_HIDE),              WID_IS_SPELL_HIDE,              /*! deprecated !*/
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_SPELL_IN_ALL_LANGUAGES),  WID_IS_SPELL_IN_ALL_LANGUAGES,  /*! deprecated !*/
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_SPELL_SPECIAL),           WID_IS_SPELL_SPECIAL,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_SPELL_UPPER_CASE),        WID_IS_SPELL_UPPER_CASE,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_SPELL_WITH_DIGITS),       WID_IS_SPELL_WITH_DIGITS,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_USE_DICTIONARY_LIST),     WID_IS_USE_DICTIONARY_LIST,
+                &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UPN_IS_WRAP_REVERSE),            WID_IS_WRAP_REVERSE,
+                &::getBooleanCppuType(),            0, 0 },
+        { 0,0,0,0,0,0 }
     };
     return aLinguProps;
 }
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 595119468041..1afdeb6b805d 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -122,6 +122,7 @@
 #include <boost/mem_fn.hpp>
 #include <boost/utility.hpp>
 
+#define MAP_LEN(x) x, sizeof(x) - 1
 //  page styles
 #define SC_UNO_PAGE_LEFTBORDER      "LeftBorder"
 #define SC_UNO_PAGE_RIGHTBORDER     "RightBorder"
@@ -1463,13 +1464,13 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
     }
 
     /** property map for export info set */
-    comphelper::PropertyMapEntry const aExportInfoMap[] =
+    comphelper::PropertyMapEntry aExportInfoMap[] =
     {
-        { "UsePrettyPrinting" , 0, ::getCppuType((sal_Bool*)0),          beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName"        , 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath"     , 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "BaseURI"           , 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0),          beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StreamName")        , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StreamRelPath")     , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "BaseURI")           , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
 
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index 37547bb5588a..c2ca586864e1 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -131,11 +131,11 @@ void OXMLRowColumn::fillStyle(const OUString& _sStyleName)
         if ( pAutoStyles )
         {
             PropertySetInfo* pInfo = new PropertySetInfo();
-            static PropertyMapEntry const pMap[] =
+            static PropertyMapEntry pMap[] =
             {
-                {PROPERTY_WIDTH,  PROPERTY_ID_WIDTH,          ::getCppuType(static_cast< sal_Int32* >( NULL ))       ,PropertyAttribute::BOUND,0},
-                {PROPERTY_HEIGHT, PROPERTY_ID_HEIGHT,         ::getCppuType(static_cast< sal_Int32* >( NULL ))       ,PropertyAttribute::BOUND,0},
-                {}
+                {PROPERTY_WIDTH,  static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_WIDTH)-1),     PROPERTY_ID_WIDTH,          &::getCppuType(static_cast< sal_Int32* >( NULL ))       ,PropertyAttribute::BOUND,0},
+                {PROPERTY_HEIGHT, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_HEIGHT)-1),    PROPERTY_ID_HEIGHT,         &::getCppuType(static_cast< sal_Int32* >( NULL ))       ,PropertyAttribute::BOUND,0},
+                { NULL, 0, 0, NULL, 0, 0 }
             };
             pInfo->add(pMap);
             Reference<XPropertySet> xProp = GenericPropertySet_CreateInstance(pInfo);
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index df6da6794958..b11bd0f85fc6 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -257,25 +257,25 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,
     if ( pAutoStyle )
     {
         ::com::sun::star::awt::FontDescriptor aFont;
-        static comphelper::PropertyMapEntry const pMap[] =
+        static comphelper::PropertyMapEntry pMap[] =
         {
-            {PROPERTY_FONTNAME,         PROPERTY_ID_FONTNAME,           ::getCppuType(&aFont.Name)         ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARFONTHEIGHT,   PROPERTY_ID_FONTHEIGHT,         ::getCppuType(&aFont.Height)       ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTWIDTH,        PROPERTY_ID_FONTWIDTH,          ::getCppuType(&aFont.Width)        ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTSTYLENAME,    PROPERTY_ID_FONTSTYLENAME,      ::getCppuType(&aFont.StyleName)    ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTFAMILY,       PROPERTY_ID_FONTFAMILY,         ::getCppuType(&aFont.Family)       ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTCHARSET,      PROPERTY_ID_FONTCHARSET,        ::getCppuType(&aFont.CharSet)      ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTPITCH,        PROPERTY_ID_FONTPITCH,          ::getCppuType(&aFont.Pitch)        ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTCHARWIDTH,    PROPERTY_ID_FONTCHARWIDTH,      ::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTWEIGHT,       PROPERTY_ID_FONTWEIGHT,         ::getCppuType(&aFont.Weight)       ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARPOSTURE,      PROPERTY_ID_FONTSLANT,          ::getCppuType(&aFont.Slant)        ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTUNDERLINE,    PROPERTY_ID_FONTUNDERLINE,      ::getCppuType(&aFont.Underline)    ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARSTRIKEOUT,    PROPERTY_ID_FONTSTRIKEOUT,      ::getCppuType(&aFont.Strikeout)    ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTORIENTATION,  PROPERTY_ID_FONTORIENTATION,    ::getCppuType(&aFont.Orientation)  ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTKERNING,      PROPERTY_ID_FONTKERNING,        ::getCppuType(&aFont.Kerning)      ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARWORDMODE,     PROPERTY_ID_FONTWORDLINEMODE,   ::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTTYPE,         PROPERTY_ID_FONTTYPE,           ::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},
-            {}
+            {PROPERTY_FONTNAME,         static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTNAME)-1),          PROPERTY_ID_FONTNAME,           &::getCppuType(&aFont.Name)         ,PropertyAttribute::BOUND,0},
+            {PROPERTY_CHARFONTHEIGHT,   static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_CHARFONTHEIGHT)-1),    PROPERTY_ID_FONTHEIGHT,         &::getCppuType(&aFont.Height)       ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTWIDTH,        static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTWIDTH)-1),         PROPERTY_ID_FONTWIDTH,          &::getCppuType(&aFont.Width)        ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTSTYLENAME,    static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTSTYLENAME)-1),     PROPERTY_ID_FONTSTYLENAME,      &::getCppuType(&aFont.StyleName)    ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTFAMILY,       static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTFAMILY)-1),        PROPERTY_ID_FONTFAMILY,         &::getCppuType(&aFont.Family)       ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTCHARSET,      static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTCHARSET)-1),       PROPERTY_ID_FONTCHARSET,        &::getCppuType(&aFont.CharSet)      ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTPITCH,        static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTPITCH)-1),         PROPERTY_ID_FONTPITCH,          &::getCppuType(&aFont.Pitch)        ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTCHARWIDTH,    static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTCHARWIDTH)-1),     PROPERTY_ID_FONTCHARWIDTH,      &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTWEIGHT,       static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTWEIGHT)-1),        PROPERTY_ID_FONTWEIGHT,         &::getCppuType(&aFont.Weight)       ,PropertyAttribute::BOUND,0},
+            {PROPERTY_CHARPOSTURE,      static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_CHARPOSTURE)-1),       PROPERTY_ID_FONTSLANT,          &::getCppuType(&aFont.Slant)        ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTUNDERLINE,    static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTUNDERLINE)-1),     PROPERTY_ID_FONTUNDERLINE,      &::getCppuType(&aFont.Underline)    ,PropertyAttribute::BOUND,0},
+            {PROPERTY_CHARSTRIKEOUT,    static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_CHARSTRIKEOUT)-1),     PROPERTY_ID_FONTSTRIKEOUT,      &::getCppuType(&aFont.Strikeout)    ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTORIENTATION,  static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTORIENTATION)-1),   PROPERTY_ID_FONTORIENTATION,    &::getCppuType(&aFont.Orientation)  ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTKERNING,      static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTKERNING)-1),       PROPERTY_ID_FONTKERNING,        &::getCppuType(&aFont.Kerning)      ,PropertyAttribute::BOUND,0},
+            {PROPERTY_CHARWORDMODE,     static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_CHARWORDMODE)-1),      PROPERTY_ID_FONTWORDLINEMODE,   &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0},
+            {PROPERTY_FONTTYPE,         static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_FONTTYPE)-1),          PROPERTY_ID_FONTTYPE,           &::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},
+            { NULL, 0, 0, NULL, 0, 0 }
         };
         try
         {
@@ -320,13 +320,13 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,
 // -----------------------------------------------------------------------------
 uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet()
 {
-    static comphelper::PropertyMapEntry const pMap[] =
+    static comphelper::PropertyMapEntry pMap[] =
     {
-        {PROPERTY_BORDERLEFT,   0,          ::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
-        {PROPERTY_BORDERRIGHT,  1,          ::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
-        {PROPERTY_BORDERTOP,    2,          ::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
-        {PROPERTY_BORDERBOTTOM, 3,          ::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
-        {}
+        {PROPERTY_BORDERLEFT,   static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERLEFT)-1),        0,          &::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
+        {PROPERTY_BORDERRIGHT,  static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERRIGHT)-1),       1,          &::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
+        {PROPERTY_BORDERTOP,    static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERTOP)-1),         2,          &::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
+        {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERBOTTOM)-1),      3,          &::getCppuType((const table::BorderLine2*)0)         ,PropertyAttribute::BOUND,0},
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
 }
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index f3768c427297..a35b4d764871 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -59,6 +59,9 @@
 #include <xmloff/txtprmap.hxx>
 #include "ReportDefinition.hxx"
 
+
+#define MAP_LEN(x) x, sizeof(x) - 1
+//--------------------------------------------------------------------------
 namespace rptxml
 {
 using namespace ::com::sun::star::uno;
@@ -525,14 +528,14 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
         xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY);
 
         static const OUString s_sOld("OldFormat");
-        static comphelper::PropertyMapEntry const pMap[] =
+        static comphelper::PropertyMapEntry pMap[] =
         {
-            { "OldFormat" , 1,    ::getCppuType((const sal_Bool*)0),                 beans::PropertyAttribute::BOUND,     0 },
-            { "StreamName", 0,    ::getCppuType( (OUString *)0 ),             beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "PrivateData",0,    ::getCppuType( (uno::Reference<XInterface> *)0 ),  beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "BaseURI",    0,    ::getCppuType( (OUString *)0 ),             beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamRelPath", 0, ::getCppuType( (OUString *)0 ),             beans::PropertyAttribute::MAYBEVOID, 0 },
-            {}
+            { MAP_LEN( "OldFormat" ), 1,    &::getCppuType((const sal_Bool*)0),                 beans::PropertyAttribute::BOUND,     0 },
+            { MAP_LEN( "StreamName"), 0,    &::getCppuType( (OUString *)0 ),             beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN("PrivateData"), 0,    &::getCppuType( (uno::Reference<XInterface> *)0 ),  beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "BaseURI"),    0,    &::getCppuType( (OUString *)0 ),             beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "StreamRelPath"), 0, &::getCppuType( (OUString *)0 ),             beans::PropertyAttribute::MAYBEVOID, 0 },
+            { NULL, 0, 0, NULL, 0, 0 }
         };
         utl::MediaDescriptor aDescriptor(rDescriptor);
         uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index de865cd91100..b8bcfaa9fc28 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1121,16 +1121,16 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
 
     static const SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
     {
-        { SC_UNO_DP_COLGRAND, 0,  getBooleanCppuType(),              0, 0 },
-        { SC_UNO_DP_DATADESC, 0,  getCppuType((OUString*)0),    beans::PropertyAttribute::READONLY, 0 },
-        { SC_UNO_DP_IGNOREEMPTY, 0,  getBooleanCppuType(),              0, 0 },     // for sheet data only
-        { SC_UNO_DP_REPEATEMPTY, 0,  getBooleanCppuType(),              0, 0 },     // for sheet data only
-        { SC_UNO_DP_ROWGRAND, 0,  getBooleanCppuType(),              0, 0 },
-        { SC_UNO_DP_ROWFIELDCOUNT,    0, getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
-        { SC_UNO_DP_COLUMNFIELDCOUNT, 0, getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
-        { SC_UNO_DP_DATAFIELDCOUNT,   0, getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
-        { SC_UNO_DP_GRANDTOTAL_NAME,  0, getCppuType(static_cast<OUString*>(0)), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_DP_COLGRAND), 0,  &getBooleanCppuType(),              0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_DATADESC), 0,  &getCppuType((OUString*)0),    beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_IGNOREEMPTY), 0,  &getBooleanCppuType(),              0, 0 },     // for sheet data only
+        {MAP_CHAR_LEN(SC_UNO_DP_REPEATEMPTY), 0,  &getBooleanCppuType(),              0, 0 },     // for sheet data only
+        {MAP_CHAR_LEN(SC_UNO_DP_ROWGRAND), 0,  &getBooleanCppuType(),              0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_ROWFIELDCOUNT),    0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_COLUMNFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_DATAFIELDCOUNT),   0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_GRANDTOTAL_NAME),  0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
+        {0,0,0,0,0,0}
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPSourceMap_Impl );
@@ -1517,21 +1517,21 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
 
     static const SfxItemPropertyMapEntry aDPDimensionMap_Impl[] =
     {
-        { SC_UNO_DP_FILTER,   0,  getCppuType((uno::Sequence<sheet::TableFilterField>*)0), 0, 0 },
-        { SC_UNO_DP_FLAGS,    0,  getCppuType((sal_Int32*)0),                beans::PropertyAttribute::READONLY, 0 },
-        { SC_UNO_DP_FUNCTION, 0,  getCppuType((sheet::GeneralFunction*)0),   0, 0 },
-        { SC_UNO_DP_ISDATALAYOUT, 0,  getBooleanCppuType(),                      beans::PropertyAttribute::READONLY, 0 },
-        { SC_UNO_DP_NUMBERFO, 0,  getCppuType((sal_Int32*)0),                beans::PropertyAttribute::READONLY, 0 },
-        { SC_UNO_DP_ORIENTATION, 0,  getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 },
-        { SC_UNO_DP_ORIGINAL, 0,  getCppuType((uno::Reference<container::XNamed>*)0), beans::PropertyAttribute::READONLY, 0 },
-        { SC_UNO_DP_ORIGINAL_POS, 0, getCppuType((sal_Int32*)0),             0, 0 },
-        { SC_UNO_DP_POSITION, 0,  getCppuType((sal_Int32*)0),                0, 0 },
-        { SC_UNO_DP_REFVALUE, 0,  getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
-        { SC_UNO_DP_USEDHIERARCHY, 0,  getCppuType((sal_Int32*)0),                0, 0 },
-        { SC_UNO_DP_LAYOUTNAME, 0, getCppuType(static_cast<OUString*>(0)), 0, 0 },
-        { SC_UNO_DP_FIELD_SUBTOTALNAME, 0, getCppuType(static_cast<OUString*>(0)), 0, 0 },
-        { SC_UNO_DP_HAS_HIDDEN_MEMBER, 0, getBooleanCppuType(), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_DP_FILTER),   0,  &getCppuType((uno::Sequence<sheet::TableFilterField>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_FLAGS),    0,  &getCppuType((sal_Int32*)0),                beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_FUNCTION), 0,  &getCppuType((sheet::GeneralFunction*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_ISDATALAYOUT), 0,  &getBooleanCppuType(),                      beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_NUMBERFO), 0,  &getCppuType((sal_Int32*)0),                beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_ORIENTATION), 0,  &getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_ORIGINAL), 0,  &getCppuType((uno::Reference<container::XNamed>*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_ORIGINAL_POS), 0, &getCppuType((sal_Int32*)0),             0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_POSITION), 0,  &getCppuType((sal_Int32*)0),                0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_REFVALUE), 0,  &getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_USEDHIERARCHY), 0,  &getCppuType((sal_Int32*)0),                0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_LAYOUTNAME), 0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_HAS_HIDDEN_MEMBER), 0, &getBooleanCppuType(), 0, 0 },
+        {0,0,0,0,0,0}
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPDimensionMap_Impl );
@@ -2232,12 +2232,12 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo()
     static const SfxItemPropertyMapEntry aDPLevelMap_Impl[] =
     {
         //! change type of AutoShow/Layout/Sorting to API struct when available
-        { SC_UNO_DP_AUTOSHOW, 0,  getCppuType((sheet::DataPilotFieldAutoShowInfo*)0),     0, 0 },
-        { SC_UNO_DP_LAYOUT,   0,  getCppuType((sheet::DataPilotFieldLayoutInfo*)0),       0, 0 },
-        { SC_UNO_DP_SHOWEMPTY, 0, getBooleanCppuType(),                                   0, 0 },
-        { SC_UNO_DP_SORTING,  0,  getCppuType((sheet::DataPilotFieldSortInfo*)0),         0, 0 },
-        { SC_UNO_DP_SUBTOTAL, 0,  getCppuType((uno::Sequence<sheet::GeneralFunction>*)0), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_DP_AUTOSHOW), 0,  &getCppuType((sheet::DataPilotFieldAutoShowInfo*)0),     0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_LAYOUT),   0,  &getCppuType((sheet::DataPilotFieldLayoutInfo*)0),       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_SHOWEMPTY), 0,  &getBooleanCppuType(),                                   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_SORTING),  0,  &getCppuType((sheet::DataPilotFieldSortInfo*)0),         0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_SUBTOTAL), 0,  &getCppuType((uno::Sequence<sheet::GeneralFunction>*)0), 0, 0 },
+        {0,0,0,0,0,0}
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPLevelMap_Impl );
@@ -2701,11 +2701,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
 
     static const SfxItemPropertyMapEntry aDPMemberMap_Impl[] =
     {
-        { SC_UNO_DP_ISVISIBLE, 0,  getBooleanCppuType(),              0, 0 },
-        { SC_UNO_DP_POSITION, 0,  getCppuType((sal_Int32*)0),        0, 0 },
-        { SC_UNO_DP_SHOWDETAILS, 0,  getBooleanCppuType(),              0, 0 },
-        { SC_UNO_DP_LAYOUTNAME, 0, getCppuType(static_cast<OUString*>(0)), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_DP_ISVISIBLE), 0,  &getBooleanCppuType(),              0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_POSITION), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_SHOWDETAILS), 0,  &getBooleanCppuType(),              0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_LAYOUTNAME), 0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
+        {0,0,0,0,0,0}
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPMemberMap_Impl );
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index a4f826e3bb81..5b99a8cbbe25 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -71,6 +71,8 @@
 #include "sheetdata.hxx"
 #include "XMLCodeNameProvider.hxx"
 
+#define MAP_LEN(x) x, sizeof(x) - 1
+
 using namespace com::sun::star;
 
 
@@ -326,23 +328,24 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
         uno::Reference<frame::XModel> xModel(pObjSh->GetModel());
 
         /** property map for export info set */
-        comphelper::PropertyMapEntry const aImportInfoMap[] =
+        comphelper::PropertyMapEntry aImportInfoMap[] =
         {
-            { "ProgressRange", 0, ::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "ProgressMax", 0, ::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "ProgressCurrent", 0, ::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "NumberStyles", 0, ::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "PrivateData", 0, ::getCppuType( (uno::Reference<uno::XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "BaseURI", 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamRelPath", 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamName", 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "BuildId", 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "VBACompatibilityMode", 0, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "ScriptConfiguration", 0, ::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "OrganizerMode", 0, ::getBooleanCppuType(),
+            { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "NumberStyles" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (uno::Reference<uno::XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "BuildId" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "VBACompatibilityMode" ), 0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+            { MAP_LEN( "ScriptConfiguration" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "OrganizerMode" ), 0, &::getBooleanCppuType(),
                 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "SourceStorage", 0, embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            {}
+            { MAP_LEN( "SourceStorage" ), 0, &embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+
+            { NULL, 0, 0, NULL, 0, 0 }
         };
         uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aImportInfoMap ) ) );
 
@@ -773,20 +776,20 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
     pProps[0].Value <<= sFileName;
 
     /** property map for export info set */
-    comphelper::PropertyMapEntry const aExportInfoMap[] =
+    comphelper::PropertyMapEntry aExportInfoMap[] =
     {
-        { "ProgressRange", 0, ::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressMax", 0, ::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressCurrent", 0, ::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "WrittenNumberStyles", 0, ::getCppuType((uno::Sequence<sal_Int32>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "UsePrettyPrinting", 0, ::getCppuType((sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "BaseURI", 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StyleNames", 0, ::getCppuType( (uno::Sequence<OUString>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StyleFamilies", 0, ::getCppuType( (uno::Sequence<sal_Int32>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "TargetStorage", 0, embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "WrittenNumberStyles" ), 0, &::getCppuType((uno::Sequence<sal_Int32>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StyleNames" ), 0, &::getCppuType( (uno::Sequence<OUString>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "StyleFamilies" ), 0, &::getCppuType( (uno::Sequence<sal_Int32>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "TargetStorage" ), 0, &embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
 
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index e106651ada64..0cf18e6f131d 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -102,13 +102,13 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
     {
         static const SfxItemPropertyMapEntry aPropertyMap[] =
         {
-            { SC_UNONAME_ADDRESS,  0,  getCppuType((table::CellRangeAddress*)0), 0, 0 },
-            { SC_UNONAME_PERSREPR, 0,  getCppuType((OUString*)0),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  getCppuType((OUString*)0),    0, 0 },
-            { SC_UNONAME_REFSHEET, 0,  getCppuType((sal_Int32*)0),        0, 0 },
-            { SC_UNONAME_UIREPR,   0,  getCppuType((OUString*)0),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  getCppuType((OUString*)0),    0, 0 },
-            {}
+            {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellRangeAddress*)0), 0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0,  &getCppuType((OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0,  &getCppuType((OUString*)0),    0, 0 },
+            {0,0,0,0,0,0}
         };
         static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap ));
         return aRef;
@@ -117,13 +117,13 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
     {
         static const SfxItemPropertyMapEntry aPropertyMap[] =
         {
-            { SC_UNONAME_ADDRESS,  0,  getCppuType((table::CellAddress*)0), 0, 0 },
-            { SC_UNONAME_PERSREPR, 0,  getCppuType((OUString*)0),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  getCppuType((OUString*)0),    0, 0 },
-            { SC_UNONAME_REFSHEET, 0,  getCppuType((sal_Int32*)0),        0, 0 },
-            { SC_UNONAME_UIREPR,   0,  getCppuType((OUString*)0),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  getCppuType((OUString*)0),    0, 0 },
-            {}
+            {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellAddress*)0), 0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0,  &getCppuType((OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0,  &getCppuType((OUString*)0),    0, 0 },
+            {0,0,0,0,0,0}
         };
         static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap ));
         return aRef;
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 146c0d1969f7..91e960d4709d 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -73,13 +73,13 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap()
 {
     static const SfxItemPropertyMapEntry aAutoFormatMap_Impl[] =
     {
-        { SC_UNONAME_INCBACK,  0,  ::getBooleanCppuType(),    0, 0 },
-        { SC_UNONAME_INCBORD,  0,  ::getBooleanCppuType(),    0, 0 },
-        { SC_UNONAME_INCFONT,  0,  ::getBooleanCppuType(),    0, 0 },
-        { SC_UNONAME_INCJUST,  0,  ::getBooleanCppuType(),    0, 0 },
-        { SC_UNONAME_INCNUM,   0,  ::getBooleanCppuType(),    0, 0 },
-        { SC_UNONAME_INCWIDTH, 0,  ::getBooleanCppuType(),    0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_INCBACK),  0,  &::getBooleanCppuType(),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_INCBORD),  0,  &::getBooleanCppuType(),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_INCFONT),  0,  &::getBooleanCppuType(),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_INCJUST),  0,  &::getBooleanCppuType(),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_INCNUM),   0,  &::getBooleanCppuType(),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_INCWIDTH), 0,  &::getBooleanCppuType(),    0, 0 },
+        {0,0,0,0,0,0}
     };
     return aAutoFormatMap_Impl;
 }
@@ -91,54 +91,54 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap()
 {
     static const SfxItemPropertyMapEntry aAutoFieldMap_Impl[] =
     {
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,        ::getCppuType((const sal_Int32*)0),        0, MID_BACK_COLOR },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,        ::getCppuType((const sal_Int32*)0),        0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,      ::getBooleanCppuType(),                    0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,   ::getBooleanCppuType(),                    0, MID_CROSSED_OUT },
-        {SC_UNONAME_CFONT,    ATTR_FONT,              ::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,              ::getCppuType((sal_Int16*)0),              0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,          ::getCppuType((sal_Int16*)0),              0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,          ::getCppuType((sal_Int16*)0),              0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,              ::getCppuType((sal_Int16*)0),              0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,          ::getCppuType((sal_Int16*)0),              0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,          ::getCppuType((sal_Int16*)0),              0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,              ::getCppuType((OUString*)0),          0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,          ::getCppuType((OUString*)0),          0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,          ::getCppuType((OUString*)0),          0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,              ::getCppuType((sal_Int16*)0),              0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,          ::getCppuType((sal_Int16*)0),              0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,          ::getCppuType((sal_Int16*)0),              0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,              ::getCppuType((OUString*)0),          0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,          ::getCppuType((OUString*)0),          0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,          ::getCppuType((OUString*)0),          0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,       ::getCppuType((float*)0),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,   ::getCppuType((float*)0),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,   ::getCppuType((float*)0),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE,     ::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,      ::getCppuType((awt::FontSlant*)0),         0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,  ::getCppuType((awt::FontSlant*)0),         0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,  ::getCppuType((awt::FontSlant*)0),         0, MID_POSTURE },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED,     ::getBooleanCppuType(),                    0, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD,     ::getCppuType((table::TableBorder*)0),     0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2,     ::getCppuType((table::TableBorder2*)0),     0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,    ::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,       ::getCppuType((float*)0),                  0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,   ::getCppuType((float*)0),                  0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,   ::getCppuType((float*)0),                  0, MID_WEIGHT },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,       ::getCppuType((const table::CellHoriJustify*)0),   0, 0 },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,        ::getBooleanCppuType(),                    0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,         ::getBooleanCppuType(),                    0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,           ::getCppuType((const table::CellOrientation*)0),   0, 0 },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,            ::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,            ::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,            ::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,            ::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,      ::getCppuType((const sal_Int32*)0),        0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,       ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,       ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,        &::getCppuType((const sal_Int32*)0),        0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,        &::getCppuType((const sal_Int32*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,      &::getBooleanCppuType(),                    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,   &::getBooleanCppuType(),                    0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,              &::getCppuType((const sal_Int16*)0),        0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,              &::getCppuType((sal_Int16*)0),              0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,          &::getCppuType((sal_Int16*)0),              0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,          &::getCppuType((sal_Int16*)0),              0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,              &::getCppuType((sal_Int16*)0),              0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,          &::getCppuType((sal_Int16*)0),              0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,          &::getCppuType((sal_Int16*)0),              0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,              &::getCppuType((OUString*)0),          0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,          &::getCppuType((OUString*)0),          0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,          &::getCppuType((OUString*)0),          0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,              &::getCppuType((sal_Int16*)0),              0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,          &::getCppuType((sal_Int16*)0),              0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,          &::getCppuType((sal_Int16*)0),              0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,              &::getCppuType((OUString*)0),          0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,          &::getCppuType((OUString*)0),          0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,          &::getCppuType((OUString*)0),          0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,       &::getCppuType((float*)0),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,   &::getCppuType((float*)0),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,   &::getCppuType((float*)0),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE,     &::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,      &::getCppuType((awt::FontSlant*)0),         0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,  &::getCppuType((awt::FontSlant*)0),         0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,  &::getCppuType((awt::FontSlant*)0),         0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED,     &::getBooleanCppuType(),                    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD,     &::getCppuType((table::TableBorder*)0),     0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD2),  SC_WID_UNO_TBLBORD2,     &::getCppuType((table::TableBorder2*)0),     0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,    &::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,       &::getCppuType((float*)0),                  0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,   &::getCppuType((float*)0),                  0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,   &::getCppuType((float*)0),                  0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,       &::getCppuType((const table::CellHoriJustify*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,        &::getBooleanCppuType(),                    0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,         &::getBooleanCppuType(),                    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,           &::getCppuType((const table::CellOrientation*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,            &::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,            &::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,            &::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,            &::getCppuType((const sal_Int32*)0),        0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,      &::getCppuType((const sal_Int32*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,       &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,       &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {0,0,0,0,0,0}
     };
     return aAutoFieldMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 1361de5a5975..4a6888787de1 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -139,25 +139,25 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aSettingsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_DOAUTOCP, 0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_ENTERED,  0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_EXPREF,   0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_EXTFMT,   0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_LINKUPD,  0,  getCppuType((sal_Int16*)0),        0, 0},
-        {SC_UNONAME_MARKHDR,  0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_METRIC,   0,  getCppuType((sal_Int16*)0),        0, 0},
-        {SC_UNONAME_MOVEDIR,  0,  getCppuType((sal_Int16*)0),        0, 0},
-        {SC_UNONAME_MOVESEL,  0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_PRALLSH,  0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_PREMPTY,  0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_RANGEFIN, 0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_SCALE,    0,  getCppuType((sal_Int16*)0),        0, 0},
-        {SC_UNONAME_STBFUNC,  0,  getCppuType((sal_Int16*)0),        0, 0},
-        {SC_UNONAME_ULISTS,   0,  getCppuType((uno::Sequence<OUString>*)0), 0, 0},
-        {SC_UNONAME_PRMETRICS,0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_USETABCOL,0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_REPLWARN, 0,  getBooleanCppuType(),              0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_DOAUTOCP), 0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ENTERED),  0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_EXPREF),   0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_EXTFMT),   0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_LINKUPD),  0,  &getCppuType((sal_Int16*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_MARKHDR),  0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_METRIC),   0,  &getCppuType((sal_Int16*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_MOVEDIR),  0,  &getCppuType((sal_Int16*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_MOVESEL),  0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_PRALLSH),  0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_PREMPTY),  0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_RANGEFIN), 0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_SCALE),    0,  &getCppuType((sal_Int16*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_STBFUNC),  0,  &getCppuType((sal_Int16*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ULISTS),   0,  &getCppuType((uno::Sequence<OUString>*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_PRMETRICS),0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_USETABCOL),0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_REPLWARN), 0,  &getBooleanCppuType(),              0, 0},
+        {0,0,0,0,0,0}
     };
     return aSettingsPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 166c9a15ef4f..78b59f2b33fc 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -158,103 +158,103 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet()
 {
     static const SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    getCppuType((util::CellProtection*)0), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,getBooleanCppuType(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   getCppuType((sal_Int16*)0),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   getCppuType((float*)0),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       getCppuType((table::CellOrientation*)0), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, getBooleanCppuType(),               0, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, getCppuType((OUString*)0),        0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ABSNAME),  SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,    &getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLPRO),  ATTR_PROTECTION,    &getCppuType((util::CellProtection*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,    &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,  &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(),                 0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS),  ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,   &getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,  &getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CRELIEF),  ATTR_FONT_RELIEF,   &getCppuType((sal_Int16*)0),            0, MID_RELIEF },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE),  ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,   &getCppuType((float*)0),                0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDFMT),  SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDLOC),  SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDXML),  SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,   &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,    &getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   ATTR_VALUE_FORMAT,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,       &getCppuType((table::CellOrientation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PADJUST),  ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PINDENT),  ATTR_INDENT,        &getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
+        {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE,   &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHANG),  ATTR_HANGPUNCTUATION,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER,      &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER,     &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHADOW),   ATTR_SHADOW,        &getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(),               0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD2),  SC_WID_UNO_TBLBORD2, &getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIDAT),  SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALILOC),  SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIXML),  SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK),  ATTR_HYPERLINK, &getCppuType((OUString*)0),        0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl );
     return &aCellsPropertySet;
@@ -267,104 +267,104 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet()
 {
     static const SfxItemPropertyMapEntry aRangePropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    getCppuType((util::CellProtection*)0), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,getBooleanCppuType(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   getCppuType((sal_Int16*)0),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   getCppuType((float*)0),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   getCppuType((table::CellHoriJustify*)0),   0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       getCppuType((table::CellOrientation*)0), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, getBooleanCppuType(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ABSNAME),  SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,    &getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLPRO),  ATTR_PROTECTION,    &getCppuType((util::CellProtection*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,    &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,  &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(),                 0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS),  ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,   &getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,  &getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CRELIEF),  ATTR_FONT_RELIEF,   &getCppuType((sal_Int16*)0),            0, MID_RELIEF },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE),  ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,   &getCppuType((float*)0),                0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDFMT),  SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDLOC),  SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDXML),  SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,   &getCppuType((table::CellHoriJustify*)0),   0, MID_HORJUST_HORJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,    &getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   ATTR_VALUE_FORMAT,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,       &getCppuType((table::CellOrientation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PADJUST),  ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PINDENT),  ATTR_INDENT,        &getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
+        {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE,   &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHANG),  ATTR_HANGPUNCTUATION,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_POS),      SC_WID_UNO_POS,     &getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER,      &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER,     &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHADOW),   ATTR_SHADOW,        &getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(),               0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SIZE),     SC_WID_UNO_SIZE,    &getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD2),  SC_WID_UNO_TBLBORD2, &getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIDAT),  SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALILOC),  SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIXML),  SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aRangePropertySet( aRangePropertyMap_Impl );
     return &aRangePropertySet;
@@ -377,108 +377,108 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet()
 {
     static const SfxItemPropertyMapEntry aCellPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    getCppuType((util::CellProtection*)0), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,getBooleanCppuType(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   getCppuType((sal_Int16*)0),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   getCppuType((float*)0),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_FORMLOC,  SC_WID_UNO_FORMLOC, getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_FORMRT,   SC_WID_UNO_FORMRT,  getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       getCppuType((table::CellOrientation*)0), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, getBooleanCppuType(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {UNO_NAME_EDIT_CHAR_ESCAPEMENT,   EE_CHAR_ESCAPEMENT, getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, getCppuType((OUString*)0),        0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ABSNAME),  SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,    &getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLPRO),  ATTR_PROTECTION,    &getCppuType((util::CellProtection*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,    &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,  &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(),                 0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS),  ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,   &getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,  &getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CRELIEF),  ATTR_FONT_RELIEF,   &getCppuType((sal_Int16*)0),            0, MID_RELIEF },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE),  ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,   &getCppuType((float*)0),                0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDFMT),  SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDLOC),  SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDXML),  SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_FORMLOC),  SC_WID_UNO_FORMLOC, &getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_FORMRT),   SC_WID_UNO_FORMRT,  &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,   &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,    &getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   ATTR_VALUE_FORMAT,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,       &getCppuType((table::CellOrientation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PADJUST),  ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PINDENT),  ATTR_INDENT,        &getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
+        {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE,   &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHANG),  ATTR_HANGPUNCTUATION,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_POS),      SC_WID_UNO_POS,     &getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER,      &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER,     &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHADOW),   ATTR_SHADOW,        &getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(),               0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SIZE),     SC_WID_UNO_SIZE,    &getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD2),  SC_WID_UNO_TBLBORD2, &getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIDAT),  SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALILOC),  SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIXML),  SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT),   EE_CHAR_ESCAPEMENT, &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK),  ATTR_HYPERLINK, &getCppuType((OUString*)0),        0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl );
     return &aCellPropertySet;
@@ -491,109 +491,109 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet()
 {
     static const SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    getCppuType((util::CellProtection*)0), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,getBooleanCppuType(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   getCppuType((sal_Int16*)0),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   getCppuType((float*)0),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_MANPAGE,  SC_WID_UNO_MANPAGE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_NEWPAGE,  SC_WID_UNO_NEWPAGE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
-        {SC_UNONAME_OWIDTH,   SC_WID_UNO_OWIDTH,  getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       getCppuType((table::CellOrientation*)0), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, getBooleanCppuType(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLWID,  SC_WID_UNO_CELLWID, getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ABSNAME),  SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,    &getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLPRO),  ATTR_PROTECTION,    &getCppuType((util::CellProtection*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,    &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,  &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(),                 0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS),  ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,   &getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,  &getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CRELIEF),  ATTR_FONT_RELIEF,   &getCppuType((sal_Int16*)0),            0, MID_RELIEF },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE),  ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,   &getCppuType((float*)0),                0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDFMT),  SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDLOC),  SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDXML),  SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,   &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,    &getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_MANPAGE),  SC_WID_UNO_MANPAGE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE),  SC_WID_UNO_NEWPAGE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVIS),  SC_WID_UNO_CELLVIS, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   ATTR_VALUE_FORMAT,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_OWIDTH),   SC_WID_UNO_OWIDTH,  &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,       &getCppuType((table::CellOrientation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PADJUST),  ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PINDENT),  ATTR_INDENT,        &getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
+        {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE,   &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHANG),  ATTR_HANGPUNCTUATION,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_POS),      SC_WID_UNO_POS,     &getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER,      &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHADOW),   ATTR_SHADOW,        &getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(),               0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SIZE),     SC_WID_UNO_SIZE,    &getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD2),  SC_WID_UNO_TBLBORD2, &getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIDAT),  SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALILOC),  SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIXML),  SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLWID),  SC_WID_UNO_CELLWID, &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aColumnPropertySet( aColumnPropertyMap_Impl );
     return &aColumnPropertySet;
@@ -603,110 +603,110 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet()
 {
     static const SfxItemPropertyMapEntry aRowPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    getCppuType((util::CellProtection*)0), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,getBooleanCppuType(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   getCppuType((sal_Int16*)0),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   getCppuType((float*)0),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHGT,  SC_WID_UNO_CELLHGT, getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_CELLFILT, SC_WID_UNO_CELLFILT,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_MANPAGE,  SC_WID_UNO_MANPAGE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_NEWPAGE,  SC_WID_UNO_NEWPAGE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
-        {SC_UNONAME_OHEIGHT,  SC_WID_UNO_OHEIGHT, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       getCppuType((table::CellOrientation*)0), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, getBooleanCppuType(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ABSNAME),  SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,    &getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLPRO),  ATTR_PROTECTION,    &getCppuType((util::CellProtection*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,    &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,  &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(),                 0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS),  ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,   &getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,  &getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CRELIEF),  ATTR_FONT_RELIEF,   &getCppuType((sal_Int16*)0),            0, MID_RELIEF },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE),  ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,   &getCppuType((float*)0),                0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDFMT),  SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDLOC),  SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDXML),  SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHGT),  SC_WID_UNO_CELLHGT, &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,   &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,    &getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_MANPAGE),  SC_WID_UNO_MANPAGE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE),  SC_WID_UNO_NEWPAGE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVIS),  SC_WID_UNO_CELLVIS, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   ATTR_VALUE_FORMAT,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT),  SC_WID_UNO_OHEIGHT, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,       &getCppuType((table::CellOrientation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PADJUST),  ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PINDENT),  ATTR_INDENT,        &getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
+        {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE,   &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHANG),  ATTR_HANGPUNCTUATION,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_POS),      SC_WID_UNO_POS,     &getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER,      &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER,     &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHADOW),   ATTR_SHADOW,        &getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(),               0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SIZE),     SC_WID_UNO_SIZE,    &getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD2),  SC_WID_UNO_TBLBORD2, &getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIDAT),  SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALILOC),  SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIXML),  SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aRowPropertySet( aRowPropertyMap_Impl );
     return &aRowPropertySet;
@@ -716,121 +716,121 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet()
 {
     static const SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_AUTOPRINT,SC_WID_UNO_AUTOPRINT,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_BORDCOL,  SC_WID_UNO_BORDCOL, getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    getCppuType((util::CellProtection*)0), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,getBooleanCppuType(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   getCppuType((sal_Int16*)0),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   getCppuType((float*)0),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,getCppuType((float*)0),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
-        {SC_UNONAME_COPYBACK, SC_WID_UNO_COPYBACK,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_COPYFORM, SC_WID_UNO_COPYFORM,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_COPYSTYL, SC_WID_UNO_COPYSTYL,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_ISACTIVE, SC_WID_UNO_ISACTIVE,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_LINKDISPBIT,  SC_WID_UNO_LINKDISPBIT,getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME, SC_WID_UNO_LINKDISPNAME,getCppuType((OUString*)0),    0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       getCppuType((table::CellOrientation*)0), 0, 0 },
-        {SC_UNONAME_PAGESTL,  SC_WID_UNO_PAGESTL, getCppuType((OUString*)0),        0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_PRINTBORD,SC_WID_UNO_PRINTBORD,getBooleanCppuType(),                 0, 0 },
-        {SC_UNONAME_PROTECT,  SC_WID_UNO_PROTECT, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  getCppuType((sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHOWBORD, SC_WID_UNO_SHOWBORD,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, getBooleanCppuType(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TABLAYOUT,SC_WID_UNO_TABLAYOUT,getCppuType((sal_Int16*)0),           0, 0 },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {SC_UNONAME_TABCOLOR, SC_WID_UNO_TABCOLOR, getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNO_CODENAME,        SC_WID_UNO_CODENAME, getCppuType(static_cast< const OUString * >(0)),    0, 0},
-        {SC_UNO_NAMEDRANGES, SC_WID_UNO_NAMES, getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ABSNAME),  SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BORDCOL),  SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,    &getCppuType((sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLPRO),  ATTR_PROTECTION,    &getCppuType((util::CellProtection*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,    &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,  &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(),                 0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS),  ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,   &getCppuType((float*)0),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0),         0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,  &getCppuType((awt::FontSlant*)0),       0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CRELIEF),  ATTR_FONT_RELIEF,   &getCppuType((sal_Int16*)0),            0, MID_RELIEF },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE),  ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0),            0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,   &getCppuType((float*)0),                0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0),               0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDFMT),  SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDLOC),  SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CONDXML),  SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COPYBACK), SC_WID_UNO_COPYBACK,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COPYFORM), SC_WID_UNO_COPYFORM,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COPYSTYL), SC_WID_UNO_COPYSTYL,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,   &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ISACTIVE), SC_WID_UNO_ISACTIVE,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,    &getBooleanCppuType(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVIS),  SC_WID_UNO_CELLVIS, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT),  SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((OUString*)0),    0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   ATTR_VALUE_FORMAT,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,       &getCppuType((table::CellOrientation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PAGESTL),  SC_WID_UNO_PAGESTL, &getCppuType((OUString*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PADJUST),  ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PINDENT),  ATTR_INDENT,        &getCppuType((sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
+        {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE,   &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHANG),  ATTR_HANGPUNCTUATION,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,        &getCppuType((sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_POS),      SC_WID_UNO_POS,     &getCppuType((awt::Point*)0),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PRINTBORD),SC_WID_UNO_PRINTBORD,&getBooleanCppuType(),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PROTECT),  SC_WID_UNO_PROTECT, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER,      &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER,     &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,  &getCppuType((sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHADOW),   ATTR_SHADOW,        &getCppuType((table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_SHOWBORD), SC_WID_UNO_SHOWBORD,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(),               0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SIZE),     SC_WID_UNO_SIZE,    &getCppuType((awt::Size*)0),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD2),  SC_WID_UNO_TBLBORD2, &getCppuType((table::TableBorder2*)0),   0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TABLAYOUT),SC_WID_UNO_TABLAYOUT,&getCppuType((sal_Int16*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIDAT),  SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALILOC),  SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VALIXML),  SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_CODENAME),        SC_WID_UNO_CODENAME, &getCppuType(static_cast< const OUString * >(0)),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES), SC_WID_UNO_NAMES, &getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aSheetPropertySet( aSheetPropertyMap_Impl );
     return &aSheetPropertySet;
@@ -844,9 +844,9 @@ static const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
         SVX_UNOEDIT_NUMBERING_PROPERTIE,    // for completeness of service ParagraphProperties
-        {SC_UNONAME_TEXTUSER, EE_CHAR_XMLATTRIBS, getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
-        {SC_UNONAME_USERDEF,  EE_PARA_XMLATTRIBS, getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  EE_PARA_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
+        {0,0,0,0,0,0}
     };
     return aEditPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 2f7318dc32d1..1057fb562b3b 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -80,9 +80,9 @@ const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap()
 {
     static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
     {
-        { SC_UNONAME_INCLUDEHIDDENCELLS, 0, getBooleanCppuType(), 0, 0 },
-        { SC_UNONAME_USE_INTERNAL_DATA_PROVIDER, 0, getBooleanCppuType(), 0, 0 },
-        {}
+        { MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 },
+        { MAP_CHAR_LEN(SC_UNONAME_USE_INTERNAL_DATA_PROVIDER), 0, &getBooleanCppuType(), 0, 0 },
+        {0,0,0,0,0,0}
     };
     return aDataProviderPropertyMap_Impl;
 }
@@ -91,10 +91,10 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap()
 {
     static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] =
     {
-        {SC_UNONAME_HIDDENVALUES, 0, getCppuType((uno::Sequence<sal_Int32>*)0 ),                 0, 0 },
-        {SC_UNONAME_ROLE, 0, getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0),                  0, 0 },
-        {SC_UNONAME_INCLUDEHIDDENCELLS, 0,        getBooleanCppuType(),                  0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ),                 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,        &getBooleanCppuType(),                  0, 0 },
+        {0,0,0,0,0,0}
     };
     return aDataSequencePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 666a86841e7f..b28a62865e12 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -45,38 +45,38 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap()
 {
     static const SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] =
     {
-        {SC_UNO_SHOWZERO,     0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_SHOWNOTES,    0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_SHOWGRID,     0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_GRIDCOLOR,    0,  getCppuType((sal_Int32*)0),        0, 0},
-        {SC_UNO_SHOWPAGEBR,   0,  getBooleanCppuType(),              0, 0},
-        {SC_UNONAME_LINKUPD,  0,  getCppuType((sal_Int16*)0),        0, 0},
-        {SC_UNO_COLROWHDR,    0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_SHEETTABS,    0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_OUTLSYMB,     0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_SNAPTORASTER, 0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_RASTERVIS,    0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_RASTERRESX,   0,  getCppuType((sal_Int32*)0),        0, 0},
-        {SC_UNO_RASTERRESY,   0,  getCppuType((sal_Int32*)0),        0, 0},
-        {SC_UNO_RASTERSUBX,   0,  getCppuType((sal_Int32*)0),        0, 0},
-        {SC_UNO_RASTERSUBY,   0,  getCppuType((sal_Int32*)0),        0, 0},
-        {SC_UNO_RASTERSYNC,   0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_AUTOCALC,     0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_PRINTERNAME,  0,  getCppuType((OUString*)0),    0, 0},
-        {SC_UNO_PRINTERSETUP, 0,  getCppuType((uno::Sequence<sal_Int8>*)0), 0, 0},
-        {SC_UNO_APPLYDOCINF,  0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_FORBIDDEN,    0,  getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_CHARCOMP,     0,  getCppuType((sal_Int16*)0),        0, 0},
-        {SC_UNO_ASIANKERN,    0,  getBooleanCppuType(),              0, 0},
-        {SCSAVEVERSION,       0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_UPDTEMPL,     0,  getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWZERO),     0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWNOTES),    0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWGRID),     0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_GRIDCOLOR),    0,  &getCppuType((sal_Int32*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWPAGEBR),   0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_LINKUPD),  0,  &getCppuType((sal_Int16*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_COLROWHDR),    0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHEETTABS),    0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_OUTLSYMB),     0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SNAPTORASTER), 0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_RASTERVIS),    0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_RASTERRESX),   0,  &getCppuType((sal_Int32*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_RASTERRESY),   0,  &getCppuType((sal_Int32*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_RASTERSUBX),   0,  &getCppuType((sal_Int32*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_RASTERSUBY),   0,  &getCppuType((sal_Int32*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_RASTERSYNC),   0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_AUTOCALC),     0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_PRINTERNAME),  0,  &getCppuType((OUString*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_PRINTERSETUP), 0,  &getCppuType((uno::Sequence<sal_Int8>*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNO_APPLYDOCINF),  0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_FORBIDDEN),    0,  &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_CHARCOMP),     0,  &getCppuType((sal_Int16*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ASIANKERN),    0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SCSAVEVERSION),       0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_UPDTEMPL),     0,  &getBooleanCppuType(),              0, 0},
         /*Stampit enable/disable print cancel */
-        {SC_UNO_ALLOWPRINTJOBCANCEL, 0, getBooleanCppuType(),        0, 0},
-        {SC_UNO_LOADREADONLY, 0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_SHAREDOC,     0,  getBooleanCppuType(),              0, 0},
-        {SC_UNO_MODIFYPASSWORDINFO, 0,  getCppuType((uno::Sequence< beans::PropertyValue >*)0),              0, 0},
-        {SC_UNO_EMBED_FONTS, 0,  getBooleanCppuType(),              0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNO_ALLOWPRINTJOBCANCEL), 0, &getBooleanCppuType(),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_LOADREADONLY), 0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHAREDOC),     0,  &getBooleanCppuType(),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_MODIFYPASSWORDINFO), 0,  &getCppuType((uno::Sequence< beans::PropertyValue >*)0),              0, 0},
+        {MAP_CHAR_LEN(SC_UNO_EMBED_FONTS), 0,  &getBooleanCppuType(),              0, 0},
+        {0,0,0,0,0,0}
     };
     return aConfigPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 18eef7e8f745..180c06129c36 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -95,17 +95,17 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap()
 {
     static const SfxItemPropertyMapEntry aDataPilotDescriptorBaseMap_Impl[] =
     {
-        {SC_UNO_DP_COLGRAND,     0,  getBooleanCppuType(),  0, 0 },
-        {SC_UNO_DP_DRILLDOWN,    0,  getBooleanCppuType(),  0, 0 },
-        {SC_UNO_DP_GRANDTOTAL_NAME,0,getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0 },
-        {SC_UNO_DP_IGNORE_EMPTYROWS,   0,  getBooleanCppuType(),  0, 0 },
-        {SC_UNO_DP_IMPORTDESC,   0,  getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 },
-        {SC_UNO_DP_REPEATEMPTY,     0,  getBooleanCppuType(),  0, 0 },
-        {SC_UNO_DP_ROWGRAND,     0,  getBooleanCppuType(),  0, 0 },
-        {SC_UNO_DP_SERVICEARG,   0,  getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 },
-        {SC_UNO_DP_SHOWFILTER,     0,  getBooleanCppuType(),  0, 0 },
-        {SC_UNO_DP_SOURCESERVICE,   0,  getCppuType((OUString*)0), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_DP_COLGRAND),     0,  &getBooleanCppuType(),  0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_DRILLDOWN),    0,  &getBooleanCppuType(),  0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_GRANDTOTAL_NAME),0,&getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_IGNORE_EMPTYROWS),   0,  &getBooleanCppuType(),  0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_IMPORTDESC),   0,  &getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_REPEATEMPTY),     0,  &getBooleanCppuType(),  0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_ROWGRAND),     0,  &getBooleanCppuType(),  0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_SERVICEARG),   0,  &getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_SHOWFILTER),     0,  &getBooleanCppuType(),  0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_DP_SOURCESERVICE),   0,  &getCppuType((OUString*)0), 0, 0 },
+        {0,0,0,0,0,0}
     };
     return aDataPilotDescriptorBaseMap_Impl;
 }
@@ -117,23 +117,23 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap()
     using namespace ::com::sun::star::beans::PropertyAttribute;
     static const SfxItemPropertyMapEntry aDataPilotFieldMap_Impl[] =
     {
-        {SC_UNONAME_AUTOSHOW,     0,  getCppuType((DataPilotFieldAutoShowInfo*)0),   MAYBEVOID, 0 },
-        {SC_UNONAME_FUNCTION,     0,  getCppuType((GeneralFunction*)0),              0, 0 },
-        {SC_UNONAME_GROUPINFO,    0,  getCppuType((DataPilotFieldGroupInfo*)0),      MAYBEVOID, 0 },
-        {SC_UNONAME_HASAUTOSHOW,  0,  getBooleanCppuType(),                          0, 0 },
-        {SC_UNONAME_HASLAYOUTINFO,0,  getBooleanCppuType(),                          0, 0 },
-        {SC_UNONAME_HASREFERENCE, 0,  getBooleanCppuType(),                          0, 0 },
-        {SC_UNONAME_HASSORTINFO,  0,  getBooleanCppuType(),                          0, 0 },
-        {SC_UNONAME_ISGROUP,      0,  getBooleanCppuType(),                          0, 0 },
-        {SC_UNONAME_LAYOUTINFO,   0,  getCppuType((DataPilotFieldLayoutInfo*)0),     MAYBEVOID, 0 },
-        {SC_UNONAME_ORIENT,       0,  getCppuType((DataPilotFieldOrientation*)0),    MAYBEVOID, 0 },
-        {SC_UNONAME_REFERENCE,    0,  getCppuType((DataPilotFieldReference*)0),      MAYBEVOID, 0 },
-        {SC_UNONAME_SELPAGE,      0,  getCppuType((OUString*)0),                     0, 0 },
-        {SC_UNONAME_SHOWEMPTY,    0,  getBooleanCppuType(),                          0, 0 },
-        {SC_UNONAME_SORTINFO,     0,  getCppuType((DataPilotFieldSortInfo*)0),       MAYBEVOID, 0 },
-        {SC_UNONAME_SUBTOTALS,    0,  getCppuType((Sequence<GeneralFunction>*)0),    0, 0 },
-        {SC_UNONAME_USESELPAGE,   0,  getBooleanCppuType(),                          0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_AUTOSHOW),     0,  &getCppuType((DataPilotFieldAutoShowInfo*)0),   MAYBEVOID, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_FUNCTION),     0,  &getCppuType((GeneralFunction*)0),              0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_GROUPINFO),    0,  &getCppuType((DataPilotFieldGroupInfo*)0),      MAYBEVOID, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HASAUTOSHOW),  0,  &getBooleanCppuType(),                          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HASLAYOUTINFO),0,  &getBooleanCppuType(),                          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HASREFERENCE), 0,  &getBooleanCppuType(),                          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HASSORTINFO),  0,  &getBooleanCppuType(),                          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ISGROUP),      0,  &getBooleanCppuType(),                          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LAYOUTINFO),   0,  &getCppuType((DataPilotFieldLayoutInfo*)0),     MAYBEVOID, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ORIENT),       0,  &getCppuType((DataPilotFieldOrientation*)0),    MAYBEVOID, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_REFERENCE),    0,  &getCppuType((DataPilotFieldReference*)0),      MAYBEVOID, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SELPAGE),      0,  &getCppuType((OUString*)0),                     0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHOWEMPTY),    0,  &getBooleanCppuType(),                          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SORTINFO),     0,  &getCppuType((DataPilotFieldSortInfo*)0),       MAYBEVOID, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SUBTOTALS),    0,  &getCppuType((Sequence<GeneralFunction>*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_USESELPAGE),   0,  &getBooleanCppuType(),                          0, 0 },
+        {0,0,0,0,0,0}
     };
     return aDataPilotFieldMap_Impl;
 }
@@ -144,10 +144,10 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap()
 {
     static const SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] =
     {
-        {SC_UNONAME_ISHIDDEN,     0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_POS,          0,  getCppuType((sal_Int32*)0),    0, 0 },
-        {SC_UNONAME_SHOWDETAIL,   0,  getBooleanCppuType(),          0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ISHIDDEN),     0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_POS),          0,  &getCppuType((sal_Int32*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHOWDETAIL),   0,  &getBooleanCppuType(),          0, 0 },
+        {0,0,0,0,0,0}
     };
     return aDataPilotItemMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 7f24a3906382..62d72a585b3b 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -71,19 +71,19 @@ static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap()
 
     static const SfxItemPropertyMapEntry aSubTotalPropertyMap_Impl[] =
     {
-        {SC_UNONAME_BINDFMT,  0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_CASE,     0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_ENABSORT, 0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_ENUSLIST, 0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_FORMATS,  0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_INSBRK,   0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_ISCASE,   0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_MAXFLD,   0,  getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0},
-        {SC_UNONAME_SORTASC,  0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_ULIST,    0,  getBooleanCppuType(),       0, 0},
-        {SC_UNONAME_UINDEX,   0,  getCppuType((sal_Int32*)0), 0, 0},
-        {SC_UNONAME_USINDEX,  0,  getCppuType((sal_Int32*)0), 0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_BINDFMT),  0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_CASE),     0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ENABSORT), 0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ENUSLIST), 0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_FORMATS),  0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_INSBRK),   0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ISCASE),   0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_MAXFLD),   0,  &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_SORTASC),  0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ULIST),    0,  &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_UINDEX),   0,  &getCppuType((sal_Int32*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_USINDEX),  0,  &getCppuType((sal_Int32*)0), 0, 0},
+        {0,0,0,0,0,0}
     };
     return aSubTotalPropertyMap_Impl;
 }
@@ -92,16 +92,16 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap()
 {
     static const SfxItemPropertyMapEntry aFilterPropertyMap_Impl[] =
     {
-        {SC_UNONAME_CONTHDR,  0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_COPYOUT,  0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_ISCASE,   0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_MAXFLD,   0,  getCppuType((sal_Int32*)0),                beans::PropertyAttribute::READONLY, 0},
-        {SC_UNONAME_ORIENT,   0,  getCppuType((table::TableOrientation*)0),  0, 0},
-        {SC_UNONAME_OUTPOS,   0,  getCppuType((table::CellAddress*)0),       0, 0},
-        {SC_UNONAME_SAVEOUT,  0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_SKIPDUP,  0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_USEREGEX, 0,  getBooleanCppuType(),                      0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_CONTHDR),  0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_COPYOUT),  0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ISCASE),   0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_MAXFLD),   0,  &getCppuType((sal_Int32*)0),                beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ORIENT),   0,  &getCppuType((table::TableOrientation*)0),  0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_OUTPOS),   0,  &getCppuType((table::CellAddress*)0),       0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_SAVEOUT),  0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_SKIPDUP),  0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_USEREGEX), 0,  &getBooleanCppuType(),                      0, 0},
+        {0,0,0,0,0,0}
     };
     return aFilterPropertyMap_Impl;
 }
@@ -110,19 +110,19 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap()
 {
     static const SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] =
     {
-        {SC_UNONAME_AUTOFLT,  0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_FLTCRT,   0,  getCppuType((table::CellRangeAddress*)0),  0, 0},
-        {SC_UNONAME_FROMSELECT,0, getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_ISUSER,   0,  getBooleanCppuType(),           beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_KEEPFORM, 0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNO_LINKDISPBIT,  0,  getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME, 0,  getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_MOVCELLS, 0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_REFPERIOD, 0, getCppuType((sal_Int32*)0),                0, 0},
-        {SC_UNONAME_STRIPDAT, 0,  getBooleanCppuType(),                      0, 0},
-        {SC_UNONAME_TOKENINDEX,0, getCppuType((sal_Int32*)0),     beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_USEFLTCRT,0,  getBooleanCppuType(),                      0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_AUTOFLT),  0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_FLTCRT),   0,  &getCppuType((table::CellRangeAddress*)0),  0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_FROMSELECT),0, &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ISUSER),   0,  &getBooleanCppuType(),           beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_KEEPFORM), 0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT),  0,  &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0,  &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_MOVCELLS), 0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0),                0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_STRIPDAT), 0,  &getBooleanCppuType(),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_TOKENINDEX),0, &getCppuType((sal_Int32*)0),     beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_USEFLTCRT),0,  &getBooleanCppuType(),                      0, 0},
+        {0,0,0,0,0,0}
     };
     return aDBRangePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index 3e5b8e4bf8d0..5299528a46df 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -44,27 +44,27 @@ static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap()
 {
     static const SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] =
     {
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),        0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),        0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),        0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),        0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),        0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),        0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),    0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),    0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),    0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),        0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),        0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),        0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),    0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),    0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),    0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, getCppuType((lang::Locale*)0),     0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE, getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE, getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
-        {SC_UNO_STANDARDDEC,              0,      getCppuType((sal_Int16*)0),        0, 0 },
-        {SC_UNO_TABSTOPDIS,               0,      getCppuType((sal_Int32*)0),        0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),        0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),        0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),        0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),        0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),        0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),        0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),    0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),    0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),    0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),        0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),        0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),        0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),    0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),    0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),    0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0),     0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_STANDARDDEC),              0,      &getCppuType((sal_Int16*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_TABSTOPDIS),               0,      &getCppuType((sal_Int32*)0),        0, 0 },
+        {0,0,0,0,0,0}
     };
     return aDocDefaultsMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 34724898ad12..b909df959fe6 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -109,48 +109,49 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
 {
     static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
     {
-        {SC_UNO_APPLYFMDES,              0, getBooleanCppuType(),                                             0, 0},
-        {SC_UNO_AREALINKS,               0, getCppuType((uno::Reference<sheet::XAreaLinks>*)0),               0, 0},
-        {SC_UNO_AUTOCONTFOC,             0, getBooleanCppuType(),                                             0, 0},
-        {SC_UNO_BASICLIBRARIES,          0, getCppuType((uno::Reference< script::XLibraryContainer >*)0),     beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_DIALOGLIBRARIES,         0, getCppuType((uno::Reference< script::XLibraryContainer >*)0),     beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_VBAGLOBNAME,             0, getCppuType(static_cast< const OUString * >(0)),                  beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_CALCASSHOWN,             PROP_UNO_CALCASSHOWN, getBooleanCppuType(),                          0, 0},
-        {SC_UNONAME_CLOCAL,              0, getCppuType((lang::Locale*)0),                                    0, 0},
-        {SC_UNO_CJK_CLOCAL,              0, getCppuType((lang::Locale*)0),                                    0, 0},
-        {SC_UNO_CTL_CLOCAL,              0, getCppuType((lang::Locale*)0),                                    0, 0},
-        {SC_UNO_COLLABELRNG,             0, getCppuType((uno::Reference<sheet::XLabelRanges>*)0),             0, 0},
-        {SC_UNO_DDELINKS,                0, getCppuType((uno::Reference<container::XNameAccess>*)0),          0, 0},
-        {SC_UNO_DEFTABSTOP,              PROP_UNO_DEFTABSTOP, getCppuType((sal_Int16*)0),                     0, 0},
-        {SC_UNO_EXTERNALDOCLINKS,        0, getCppuType((uno::Reference<sheet::XExternalDocLinks>*)0),        0, 0},
-        {SC_UNO_FORBIDDEN,               0, getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0),      beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_HASDRAWPAGES,            0, getBooleanCppuType(),                                             beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_IGNORECASE,              PROP_UNO_IGNORECASE, getBooleanCppuType(),                           0, 0},
-        {SC_UNO_ITERENABLED,             PROP_UNO_ITERENABLED, getBooleanCppuType(),                          0, 0},
-        {SC_UNO_ITERCOUNT,               PROP_UNO_ITERCOUNT, getCppuType((sal_Int32*)0),                      0, 0},
-        {SC_UNO_ITEREPSILON,             PROP_UNO_ITEREPSILON, getCppuType((double*)0),                       0, 0},
-        {SC_UNO_LOOKUPLABELS,            PROP_UNO_LOOKUPLABELS, getBooleanCppuType(),                         0, 0},
-        {SC_UNO_MATCHWHOLE,              PROP_UNO_MATCHWHOLE, getBooleanCppuType(),                           0, 0},
-        {SC_UNO_NAMEDRANGES,             0, getCppuType((uno::Reference<sheet::XNamedRanges>*)0),             0, 0},
-        {SC_UNO_DATABASERNG,             0, getCppuType((uno::Reference<sheet::XDatabaseRanges>*)0),          0, 0},
-        {SC_UNO_NULLDATE,                PROP_UNO_NULLDATE, getCppuType((util::Date*)0),                      0, 0},
-        {SC_UNO_ROWLABELRNG,             0, getCppuType((uno::Reference<sheet::XLabelRanges>*)0),             0, 0},
-        {SC_UNO_SHEETLINKS,              0, getCppuType((uno::Reference<container::XNameAccess>*)0),          0, 0},
-        {SC_UNO_SPELLONLINE,             PROP_UNO_SPELLONLINE, getBooleanCppuType(),                          0, 0},
-        {SC_UNO_STANDARDDEC,             PROP_UNO_STANDARDDEC, getCppuType((sal_Int16*)0),                    0, 0},
-        {SC_UNO_REGEXENABLED,            PROP_UNO_REGEXENABLED, getBooleanCppuType(),                         0, 0},
-        {SC_UNO_RUNTIMEUID,              0, getCppuType(static_cast< const OUString * >(0)),                  beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_HASVALIDSIGNATURES,      0, getBooleanCppuType(),                                             beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_ISLOADED,                0, getBooleanCppuType(),                                             0, 0},
-        {SC_UNO_ISUNDOENABLED,           0, getBooleanCppuType(),                                             0, 0},
-        {SC_UNO_ISADJUSTHEIGHTENABLED,   0, getBooleanCppuType(),                                             0, 0},
-        {SC_UNO_ISEXECUTELINKENABLED,    0, getBooleanCppuType(),                                             0, 0},
-        {SC_UNO_ISCHANGEREADONLYENABLED, 0, getBooleanCppuType(),                                             0, 0},
-        {SC_UNO_REFERENCEDEVICE,         0, getCppuType((uno::Reference<awt::XDevice>*)0),                    beans::PropertyAttribute::READONLY, 0},
-        {"BuildId",                      0, ::getCppuType(static_cast< const OUString * >(0)),                0, 0},
-        {SC_UNO_CODENAME,                0, getCppuType(static_cast< const OUString * >(0)),                  0, 0},
-        {SC_UNO_INTEROPGRABBAG,          0, ::getCppuType((uno::Sequence< beans::PropertyValue >*)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, &::getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0},
+
+        {0,0,0,0,0,0}
     };
     return aDocOptPropertyMap_Impl;
 }
@@ -161,12 +162,12 @@ static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_MANPAGE,  0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_NEWPAGE,  0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_CELLVIS,  0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_OWIDTH,   0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_CELLWID,  0,  getCppuType((sal_Int32*)0),    0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_MANPAGE),  0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE),  0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVIS),  0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_OWIDTH),   0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLWID),  0,  &getCppuType((sal_Int32*)0),    0, 0 },
+        {0,0,0,0,0,0}
     };
     return aColumnsPropertyMap_Impl;
 }
@@ -175,16 +176,16 @@ static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_CELLHGT,  0,  getCppuType((sal_Int32*)0),    0, 0 },
-        {SC_UNONAME_CELLFILT, 0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_OHEIGHT,  0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_MANPAGE,  0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_NEWPAGE,  0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_CELLVIS,  0,  getBooleanCppuType(),          0, 0 },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND, ::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND, ::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHGT),  0,  &getCppuType((sal_Int32*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), 0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT),  0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_MANPAGE),  0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE),  0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVIS),  0,  &getBooleanCppuType(),          0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
         // not sorted, not used with SfxItemPropertyMapEntry::GetByName
-        {}
+        {0,0,0,0,0,0}
     };
     return aRowsPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index b61e2746345d..54d182076e85 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -56,11 +56,11 @@ const SfxItemPropertySet* getDateTimePropertySet()
 {
     static const SfxItemPropertyMapEntry aMapContent[] =
     {
-        { SC_UNONAME_DATETIME, 0, getCppuType((const util::DateTime*)0), 0, 0 },
-        { SC_UNONAME_ISFIXED,  0, getBooleanCppuType(),                  0, 0 },
-        { SC_UNONAME_ISDATE,   0, getBooleanCppuType(),                  0, 0 },
-        { SC_UNONAME_NUMFMT,   0, getCppuType((const sal_Int32*)0),      0, 0 },
-        {}
+        { MAP_CHAR_LEN(SC_UNONAME_DATETIME), 0, &getCppuType((const util::DateTime*)0), 0, 0 },
+        { MAP_CHAR_LEN(SC_UNONAME_ISFIXED),  0, &getBooleanCppuType(),                  0, 0 },
+        { MAP_CHAR_LEN(SC_UNONAME_ISDATE),   0, &getBooleanCppuType(),                  0, 0 },
+        { MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   0, &getCppuType((const sal_Int32*)0),      0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aMap(aMapContent);
     return &aMap;
@@ -70,7 +70,7 @@ const SfxItemPropertySet* getEmptyPropertySet()
 {
     static const SfxItemPropertyMapEntry aMapContent[] =
     {
-        {}
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aMap(aMapContent);
     return &aMap;
@@ -80,13 +80,13 @@ const SfxItemPropertySet* lcl_GetURLPropertySet()
 {
     static const SfxItemPropertyMapEntry aURLPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ANCTYPE,  0,  getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ANCTYPES, 0,  getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_REPR,     0,  getCppuType((OUString*)0),    0, 0},
-        {SC_UNONAME_TARGET,   0,  getCppuType((OUString*)0),    0, 0},
-        {SC_UNONAME_TEXTWRAP, 0,  getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_URL,      0,  getCppuType((OUString*)0),    0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE),  0,  &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0,  &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_REPR),     0,  &getCppuType((OUString*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_TARGET),   0,  &getCppuType((OUString*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0,  &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_URL),      0,  &getCppuType((OUString*)0),    0, 0},
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aURLPropertySet_Impl( aURLPropertyMap_Impl );
     return &aURLPropertySet_Impl;
@@ -96,10 +96,10 @@ const SfxItemPropertySet* lcl_GetHeaderFieldPropertySet()
 {
     static const SfxItemPropertyMapEntry aHeaderFieldPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ANCTYPE,  0,  getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ANCTYPES, 0,  getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TEXTWRAP, 0,  getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE),  0,  &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0,  &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0,  &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aHeaderFieldPropertySet_Impl( aHeaderFieldPropertyMap_Impl );
     return &aHeaderFieldPropertySet_Impl;
@@ -109,11 +109,11 @@ const SfxItemPropertySet* lcl_GetFileFieldPropertySet()
 {
     static const SfxItemPropertyMapEntry aFileFieldPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ANCTYPE,  0,  getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ANCTYPES, 0,  getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_FILEFORM, 0,  getCppuType((sal_Int16*)0),        0, 0 },
-        {SC_UNONAME_TEXTWRAP, 0,  getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE),  0,  &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0,  &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_FILEFORM), 0,  &getCppuType((sal_Int16*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0,  &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aFileFieldPropertySet_Impl( aFileFieldPropertyMap_Impl );
     return &aFileFieldPropertySet_Impl;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index d682ccc2f7f0..0084fa3f23a5 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -48,17 +48,17 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap()
 {
     static const SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] =
     {
-        {SC_UNONAME_ERRALSTY, 0,  getCppuType((sheet::ValidationAlertStyle*)0),  0, 0},
-        {SC_UNONAME_ERRMESS,  0,  getCppuType((OUString*)0),                0, 0},
-        {SC_UNONAME_ERRTITLE, 0,  getCppuType((OUString*)0),                0, 0},
-        {SC_UNONAME_IGNOREBL, 0,  getBooleanCppuType(),                          0, 0},
-        {SC_UNONAME_INPMESS,  0,  getCppuType((OUString*)0),                0, 0},
-        {SC_UNONAME_INPTITLE, 0,  getCppuType((OUString*)0),                0, 0},
-        {SC_UNONAME_SHOWERR,  0,  getBooleanCppuType(),                          0, 0},
-        {SC_UNONAME_SHOWINP,  0,  getBooleanCppuType(),                          0, 0},
-        {SC_UNONAME_SHOWLIST, 0,  getCppuType((sal_Int16*)0),                    0, 0},
-        {SC_UNONAME_TYPE,     0,  getCppuType((sheet::ValidationType*)0),        0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ERRALSTY), 0,  &getCppuType((sheet::ValidationAlertStyle*)0),  0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ERRMESS),  0,  &getCppuType((OUString*)0),                0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_ERRTITLE), 0,  &getCppuType((OUString*)0),                0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_IGNOREBL), 0,  &getBooleanCppuType(),                          0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_INPMESS),  0,  &getCppuType((OUString*)0),                0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_INPTITLE), 0,  &getCppuType((OUString*)0),                0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_SHOWERR),  0,  &getBooleanCppuType(),                          0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_SHOWINP),  0,  &getBooleanCppuType(),                          0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_SHOWLIST), 0,  &getCppuType((sal_Int16*)0),                    0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_TYPE),     0,  &getCppuType((sheet::ValidationType*)0),        0, 0},
+        {0,0,0,0,0,0}
     };
     return aValidatePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 4d40302e46c9..2d19a4631db0 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -55,12 +55,12 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap()
 {
     static const SfxItemPropertyMapEntry aSheetLinkMap_Impl[] =
     {
-        {SC_UNONAME_FILTER,   0,  getCppuType((OUString*)0),    0, 0 },
-        {SC_UNONAME_FILTOPT,  0,  getCppuType((OUString*)0),    0, 0 },
-        {SC_UNONAME_LINKURL,  0,  getCppuType((OUString*)0),    0, 0 },
-        {SC_UNONAME_REFDELAY, 0,  getCppuType((sal_Int32*)0),        0, 0 },
-        {SC_UNONAME_REFPERIOD,    0,  getCppuType((sal_Int32*)0),        0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_FILTER),   0,  &getCppuType((OUString*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_FILTOPT),  0,  &getCppuType((OUString*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LINKURL),  0,  &getCppuType((OUString*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD),    0,  &getCppuType((sal_Int32*)0),        0, 0 },
+        {0,0,0,0,0,0}
     };
     return aSheetLinkMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 64e3997ea61f..269104aa22d3 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -52,11 +52,11 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap()
 {
     static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] =
     {
-        {SC_UNO_LINKDISPBIT,      0,  getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME,     0,  getCppuType((OUString*)0),                beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TOKENINDEX,   0,  getCppuType((sal_Int32*)0),                    beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ISSHAREDFMLA, 0,  getBooleanCppuType(),                          0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT),      0,  &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME),     0,  &getCppuType((OUString*)0),                beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TOKENINDEX),   0,  &getCppuType((sal_Int32*)0),                    beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ISSHAREDFMLA), 0,  &getBooleanCppuType(),                          0, 0 },
+        {0,0,0,0,0,0}
     };
     return aNamedRangeMap_Impl;
 }
@@ -65,8 +65,8 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap()
 {
     static const SfxItemPropertyMapEntry aNamedRangesMap_Impl[] =
     {
-        {SC_UNO_MODIFY_BROADCAST, 0,  getBooleanCppuType(), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_MODIFY_BROADCAST), 0,  &getBooleanCppuType(), 0, 0 },
+        {0,0,0,0,0,0}
     };
     return aNamedRangesMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index a40e54bec0d7..1822003b5b4d 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -48,7 +48,7 @@ static const SvxItemPropertySet* lcl_GetAnnotationPropertySet()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
         SVX_UNOEDIT_NUMBERING_PROPERTIE,    // for completeness of service ParagraphProperties
-        {}
+        {0,0,0,0,0,0}
     };
     static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aAnnotationPropertySet_Impl;
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index 3ac4d770a819..6dae636f87bb 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -33,19 +33,19 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap()
 {
     static const SfxItemPropertyMapEntry aMap[] =
     {
-        {SC_UNO_CALCASSHOWN,  PROP_UNO_CALCASSHOWN ,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_DEFTABSTOP,   PROP_UNO_DEFTABSTOP  ,  getCppuType((sal_Int16*)0),    0, 0},
-        {SC_UNO_IGNORECASE,   PROP_UNO_IGNORECASE  ,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_ITERENABLED,  PROP_UNO_ITERENABLED ,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_ITERCOUNT,    PROP_UNO_ITERCOUNT   ,  getCppuType((sal_Int32*)0),    0, 0},
-        {SC_UNO_ITEREPSILON,  PROP_UNO_ITEREPSILON ,  getCppuType((double*)0),       0, 0},
-        {SC_UNO_LOOKUPLABELS, PROP_UNO_LOOKUPLABELS,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_MATCHWHOLE,   PROP_UNO_MATCHWHOLE  ,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_NULLDATE,     PROP_UNO_NULLDATE    ,  getCppuType((util::Date*)0),   0, 0},
-        {SC_UNO_SPELLONLINE,  PROP_UNO_SPELLONLINE ,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_STANDARDDEC,  PROP_UNO_STANDARDDEC ,  getCppuType((sal_Int16*)0),    0, 0},
-        {SC_UNO_REGEXENABLED, PROP_UNO_REGEXENABLED,  getBooleanCppuType(),          0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN),  PROP_UNO_CALCASSHOWN ,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP),   PROP_UNO_DEFTABSTOP  ,  &getCppuType((sal_Int16*)0),    0, 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_NULLDATE),     PROP_UNO_NULLDATE    ,  &getCppuType((util::Date*)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},
+        {0,0,0,0,0,0}
     };
     return aMap;
 }
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 5197ba6bbac0..0609869452d5 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -58,15 +58,16 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap()
 {
     static const SfxItemPropertyMapEntry aShapeMap_Impl[] =
     {
-        {SC_UNONAME_ANCHOR, 0, getCppuType((uno::Reference<uno::XInterface>*)0), 0, 0 },
-        {SC_UNONAME_HORIPOS, 0, getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_IMAGEMAP, 0, getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
-        {SC_UNONAME_VERTPOS, 0, getCppuType((sal_Int32*)0), 0, 0 },
-        {SC_UNONAME_MOVEPROTECT, 0, getCppuType((sal_Bool*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ANCHOR), 0, &getCppuType((uno::Reference<uno::XInterface>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_MOVEPROTECT), 0, &getCppuType((sal_Bool*)0), 0, 0 },
         // #i66550 HLINK_FOR_SHAPES
-        {SC_UNONAME_HYPERLINK, 0, getCppuType((OUString*)0), 0, 0 },
-        {SC_UNONAME_URL, 0, getCppuType((OUString*)0), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((OUString*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((OUString*)0), 0, 0 },
+
+        {0,0,0,0,0,0}
     };
     return aShapeMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 751fa8d829dc..d52428aeae12 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -44,19 +44,19 @@ static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap()
 {
     static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
     {
-        {SC_UNO_SRCHBACK,     0,      getBooleanCppuType(),       0, 0},
-        {SC_UNO_SRCHBYROW,    0,      getBooleanCppuType(),       0, 0},
-        {SC_UNO_SRCHCASE,     0,      getBooleanCppuType(),       0, 0},
-        {SC_UNO_SRCHREGEXP,   0,      getBooleanCppuType(),       0, 0},
-        {SC_UNO_SRCHSIM,      0,      getBooleanCppuType(),       0, 0},
-        {SC_UNO_SRCHSIMADD,   0,      getCppuType((sal_Int16*)0), 0, 0},
-        {SC_UNO_SRCHSIMEX,    0,      getCppuType((sal_Int16*)0), 0, 0},
-        {SC_UNO_SRCHSIMREL,   0,      getBooleanCppuType(),       0, 0},
-        {SC_UNO_SRCHSIMREM,   0,      getCppuType((sal_Int16*)0), 0, 0},
-        {SC_UNO_SRCHSTYLES,   0,      getBooleanCppuType(),       0, 0},
-        {SC_UNO_SRCHTYPE,     0,      getCppuType((sal_Int16*)0), 0, 0}, // enum TableSearch ist weg
-        {SC_UNO_SRCHWORDS,    0,      getBooleanCppuType(),       0, 0},
-        {}
+        {MAP_CHAR_LEN(SC_UNO_SRCHBACK),     0,      &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHBYROW),    0,      &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHCASE),     0,      &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHREGEXP),   0,      &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHSIM),      0,      &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHSIMADD),   0,      &getCppuType((sal_Int16*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHSIMEX),    0,      &getCppuType((sal_Int16*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHSIMREL),   0,      &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHSIMREM),   0,      &getCppuType((sal_Int16*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHSTYLES),   0,      &getBooleanCppuType(),       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SRCHTYPE),     0,      &getCppuType((sal_Int16*)0), 0, 0}, // enum TableSearch ist weg
+        {MAP_CHAR_LEN(SC_UNO_SRCHWORDS),    0,      &getBooleanCppuType(),       0, 0},
+        {0,0,0,0,0,0}
     };
     return aSearchPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index eedfc05092da..ec64c93b45c5 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -74,95 +74,95 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet()
 {
     static const SfxItemPropertyMapEntry aCellStyleMap_Impl[] =
     {
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    ::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    ::getCppuType((const util::CellProtection*)0), 0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    ::getCppuType((const sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,::getBooleanCppuType(),           0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          ::getCppuType((const sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   ::getCppuType((const float*)0),            0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,::getCppuType((const float*)0),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,::getCppuType((const float*)0),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, ::getCppuType((const lang::Locale*)0),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,::getCppuType((const lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,::getCppuType((const lang::Locale*)0),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, ::getCppuType((const sal_Int16*)0),    0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  ::getCppuType((const awt::FontSlant*)0),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,::getCppuType((const awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,::getCppuType((const awt::FontSlant*)0),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   getCppuType((sal_Int16*)0),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, ::getBooleanCppuType(),            0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,::getCppuType((const sal_Int16*)0),    0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   ::getCppuType((const float*)0),            0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,::getCppuType((const float*)0),           0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,::getCppuType((const float*)0),           0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DISPNAME, SC_WID_UNO_DISPNAME,::getCppuType((OUString*)0),  beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   ::getCppuType((const table::CellHoriJustify*)0),   0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    ::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     ::getBooleanCppuType(),            0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,       ::getCppuType((const table::BorderLine2*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  ::getCppuType((const sal_Int32*)0),            0, 0 },
-//      {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       ::getCppuType((const table::CellOrientation*)0),   0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        ::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        ::getCppuType((const sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   ::getBooleanCppuType(),                    0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,::getBooleanCppuType(),                   0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,::getBooleanCppuType(),                   0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     getBooleanCppuType(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        ::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        ::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        ::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,      ::getCppuType((const table::BorderLine2*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  ::getCppuType((const sal_Int32*)0),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   ::getCppuType((const sal_Int32*)0),    0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        ::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, getBooleanCppuType(),               0, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, ::getCppuType((const table::TableBorder*)0),       0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD2, ::getCppuType((const table::TableBorder2*)0),       0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,        ::getCppuType((const table::BorderLine2*)0),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   ::getCppuType((const sal_Int32*)0),    0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::getCppuType((const sal_Int32*)0),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {SC_UNONAME_HIDDEN,   ATTR_HIDDEN,        getCppuType((sal_Bool*)0),             0, 0 },
-        {SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, getCppuType((OUString*)0),        0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND,    &::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLPRO),  ATTR_PROTECTION,    &::getCppuType((const util::CellProtection*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCOLOR),   ATTR_FONT_COLOR,    &::getCppuType((const sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_COUTL),    ATTR_FONT_CONTOUR,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CCROSS),   ATTR_FONT_CROSSEDOUT,&::getBooleanCppuType(),           0, MID_CROSSED_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS),  ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0),         0, MID_EMPHASIS },
+        {MAP_CHAR_LEN(SC_UNONAME_CFONT),    ATTR_FONT,          &::getCppuType((const sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFCHARS),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_CHAR_SET },
+        {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_FAMILY },
+        {MAP_CHAR_LEN(SC_UNONAME_CFNAME),   ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME),   ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME),   ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_FAMILY_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CFPITCH),  ATTR_FONT,          &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH),  ATTR_CJK_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH),  ATTR_CTL_FONT,      &getCppuType((sal_Int16*)0),            0, MID_FONT_PITCH },
+        {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE),  ATTR_FONT,          &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE),  ATTR_CJK_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE),  ATTR_CTL_FONT,      &getCppuType((OUString*)0),        0, MID_FONT_STYLE_NAME },
+        {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT),  ATTR_FONT_HEIGHT,   &::getCppuType((const float*)0),            0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT),  ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT),  ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),   ATTR_FONT_LANGUAGE, &::getCppuType((const lang::Locale*)0),         0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),   ATTR_CJK_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),   ATTR_CTL_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0),          0, MID_LANG_LOCALE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVER),    ATTR_FONT_OVERLINE, &::getCppuType((const sal_Int16*)0),    0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CPOST),    ATTR_FONT_POSTURE,  &::getCppuType((const awt::FontSlant*)0),       0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CPOST),    ATTR_CJK_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CPOST),    ATTR_CTL_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0),     0, MID_POSTURE },
+        {MAP_CHAR_LEN(SC_UNONAME_CRELIEF),  ATTR_FONT_RELIEF,   &getCppuType((sal_Int16*)0),            0, MID_RELIEF },
+        {MAP_CHAR_LEN(SC_UNONAME_CSHADD),   ATTR_FONT_SHADOWED, &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE),  ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0),           0, MID_CROSS_OUT },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDER),   ATTR_FONT_UNDERLINE,&::getCppuType((const sal_Int16*)0),    0, MID_TL_STYLE },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0),            0, MID_TL_COLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(),                  0, MID_TL_HASCOLOR },
+        {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT),  ATTR_FONT_WEIGHT,   &::getCppuType((const float*)0),            0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT),  ATTR_CJK_FONT_WEIGHT,&::getCppuType((const float*)0),           0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT),  ATTR_CTL_FONT_WEIGHT,&::getCppuType((const float*)0),           0, MID_WEIGHT },
+        {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0),  beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY,   &::getCppuType((const table::CellHoriJustify*)0),   0, MID_HORJUST_HORJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND,    &::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNONAME_WRAP),     ATTR_LINEBREAK,     &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER,       &::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER,       &::getCppuType((const table::BorderLine2*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_NUMFMT),   ATTR_VALUE_FORMAT,  &::getCppuType((const sal_Int32*)0),            0, 0 },
+//      {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLORI),  ATTR_STACKED,       &::getCppuType((const table::CellOrientation*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PADJUST),  ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN,        &::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PINDENT),  ATTR_INDENT,        &::getCppuType((const sal_Int16*)0),            0, 0 }, //! CONVERT_TWIPS
+        {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE,   &::getBooleanCppuType(),                    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&::getBooleanCppuType(),                   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHANG),  ATTR_HANGPUNCTUATION,&::getBooleanCppuType(),                   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE,     &getBooleanCppuType(),                  0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY,   &::getCppuType((const sal_Int16*)0),    0, MID_HORJUST_ADJUST },
+        {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN,        &::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN,        &::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN,        &::getCppuType((const sal_Int32*)0),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER,      &::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER,      &::getCppuType((const table::BorderLine2*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTANG),   ATTR_ROTATE_VALUE,  &::getCppuType((const sal_Int32*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_ROTREF),   ATTR_ROTATE_MODE,   &::getCppuType((const sal_Int32*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_SHADOW),   ATTR_SHADOW,        &::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(),               0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD, &::getCppuType((const table::TableBorder*)0),       0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TBLBORD),  SC_WID_UNO_TBLBORD2, &::getCppuType((const table::TableBorder2*)0),       0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER2),ATTR_BORDER,        &::getCppuType((const table::BorderLine2*)0),        0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),  ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &::getCppuType((const sal_Int32*)0),    0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HIDDEN),   ATTR_HIDDEN,        &getCppuType((sal_Bool*)0),             0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK),  ATTR_HYPERLINK, &getCppuType((OUString*)0),        0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl );
     return &aCellStyleSet_Impl;
@@ -174,116 +174,116 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet()
 {
     static const SfxItemPropertyMapEntry aPageStyleMap_Impl[] =
     {
-        {SC_UNO_PAGE_BACKCOLOR,   ATTR_BACKGROUND,    ::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_GRAPHICFILT, ATTR_BACKGROUND,    ::getCppuType((const OUString*)0),          0, MID_GRAPHIC_FILTER },
-        {SC_UNO_PAGE_GRAPHICLOC,  ATTR_BACKGROUND,    ::getCppuType((const style::GraphicLocation*)0),   0, MID_GRAPHIC_POSITION },
-        {SC_UNO_PAGE_GRAPHICURL,  ATTR_BACKGROUND,    ::getCppuType((const OUString*)0),          0, MID_GRAPHIC_URL },
-        {SC_UNO_PAGE_BACKTRANS,   ATTR_BACKGROUND,    ::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
-        {OLD_UNO_PAGE_BACKCOLOR,  ATTR_BACKGROUND,    ::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_BORDERDIST,  ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_BOTTBORDER,  ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_BOTTBRDDIST, ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_BOTTMARGIN,  ATTR_ULSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_CENTERHOR,   ATTR_PAGE_HORCENTER,::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_CENTERVER,   ATTR_PAGE_VERCENTER,::getBooleanCppuType(),            0, 0 },
-        {SC_UNONAME_DISPNAME,     SC_WID_UNO_DISPNAME,::getCppuType((OUString*)0),  beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_PAGE_FIRSTPAGE,   ATTR_PAGE_FIRSTPAGENO,::getCppuType((const sal_Int16*)0),      0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR),   ATTR_BACKGROUND,    &::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND,    &::getCppuType((const OUString*)0),          0, MID_GRAPHIC_FILTER },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC),  ATTR_BACKGROUND,    &::getCppuType((const style::GraphicLocation*)0),   0, MID_GRAPHIC_POSITION },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL),  ATTR_BACKGROUND,    &::getCppuType((const OUString*)0),          0, MID_GRAPHIC_URL },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS),   ATTR_BACKGROUND,    &::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR),  ATTR_BACKGROUND,    &::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST),  ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER),  ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN),  ATTR_ULSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR),   ATTR_PAGE_HORCENTER,&::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER),   ATTR_PAGE_VERCENTER,&::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_DISPNAME),     SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0),  beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE),   ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0),      0, 0 },
 //
-        {SC_UNO_PAGE_FTRBACKCOL,  SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRGRFFILT,  SC_WID_UNO_FOOTERSET,::getCppuType((const OUString*)0),     0, 0 },
-        {SC_UNO_PAGE_FTRGRFLOC,   SC_WID_UNO_FOOTERSET,::getCppuType((const style::GraphicLocation*)0), 0, 0 },
-        {SC_UNO_PAGE_FTRGRFURL,   SC_WID_UNO_FOOTERSET,::getCppuType((const OUString*)0),     0, 0 },
-        {SC_UNO_PAGE_FTRBACKTRAN, SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {OLD_UNO_PAGE_FTRBACKCOL, SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRBODYDIST, SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRBRDDIST,  SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRBOTTBOR,  SC_WID_UNO_FOOTERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_FTRBOTTBDIS, SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {OLD_UNO_PAGE_FTRDYNAMIC, SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_FTRHEIGHT,   SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRDYNAMIC,  SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_FTRON,       SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_FTRSHARED,   SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_FTRLEFTBOR,  SC_WID_UNO_FOOTERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_FTRLEFTBDIS, SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRLEFTMAR,  SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {OLD_UNO_PAGE_FTRON,      SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTBOR, SC_WID_UNO_FOOTERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTBDIS,SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTMAR, SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_FTRSHADOW,   SC_WID_UNO_FOOTERSET,::getCppuType((const table::ShadowFormat*)0), 0, 0 },
-        {OLD_UNO_PAGE_FTRSHARED,  SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_FTRTOPBOR,   SC_WID_UNO_FOOTERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_FTRTOPBDIS,  SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL),  SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT),  SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0),     0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC),   SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL),   SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0),     0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST),  SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),  SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT),   SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC),  SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON),       SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED),   SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),  SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR),  SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON),      SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW),   SC_WID_UNO_FOOTERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED),  SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR),   SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS),  SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
 //
-        {SC_UNO_PAGE_HDRBACKCOL,  SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRGRFFILT,  SC_WID_UNO_HEADERSET,::getCppuType((const OUString*)0),     0, 0 },
-        {SC_UNO_PAGE_HDRGRFLOC,   SC_WID_UNO_HEADERSET,::getCppuType((const style::GraphicLocation*)0), 0, 0 },
-        {SC_UNO_PAGE_HDRGRFURL,   SC_WID_UNO_HEADERSET,::getCppuType((const OUString*)0),     0, 0 },
-        {SC_UNO_PAGE_HDRBACKTRAN, SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {OLD_UNO_PAGE_HDRBACKCOL, SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRBODYDIST, SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRBRDDIST,  SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRBOTTBOR,  SC_WID_UNO_HEADERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_HDRBOTTBDIS, SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {OLD_UNO_PAGE_HDRDYNAMIC, SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_HDRHEIGHT,   SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRDYNAMIC,  SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_HDRON,       SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_HDRSHARED,   SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_HDRLEFTBOR,  SC_WID_UNO_HEADERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_HDRLEFTBDIS, SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRLEFTMAR,  SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {OLD_UNO_PAGE_HDRON,      SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTBOR, SC_WID_UNO_HEADERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTBDIS,SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTMAR, SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
-        {SC_UNO_PAGE_HDRSHADOW,   SC_WID_UNO_HEADERSET,::getCppuType((const table::ShadowFormat*)0), 0, 0 },
-        {OLD_UNO_PAGE_HDRSHARED,  SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNO_PAGE_HDRTOPBOR,   SC_WID_UNO_HEADERSET,::getCppuType((const table::BorderLine*)0),   0, 0 },
-        {SC_UNO_PAGE_HDRTOPBDIS,  SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL),  SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT),  SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0),     0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC),   SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL),   SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0),     0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST),  SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR),  SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT),   SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC),  SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON),       SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED),   SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR),  SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR),  SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON),      SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW),   SC_WID_UNO_HEADERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED),  SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR),   SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0),   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS),  SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0),           0, 0 },
 //
-        {SC_UNO_PAGE_HEIGHT,      ATTR_PAGE_SIZE,     ::getCppuType((const sal_Int32*)0),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_BACKTRANS,  ATTR_BACKGROUND,    ::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNO_PAGE_LANDSCAPE,   ATTR_PAGE,          ::getBooleanCppuType(),            0, MID_PAGE_ORIENTATION },
-        {SC_UNO_PAGE_LEFTBORDER,  ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_LEFTBRDDIST, ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_LEFTMARGIN,  ATTR_LRSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_L_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_LEFTFTRCONT, ATTR_PAGE_FOOTERLEFT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
-        {SC_UNO_PAGE_LEFTHDRCONT, ATTR_PAGE_HEADERLEFT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
-        {SC_UNO_PAGE_NUMBERTYPE,  ATTR_PAGE,          ::getCppuType((const sal_Int16*)0),            0, MID_PAGE_NUMTYPE },
-        {SC_UNO_PAGE_SCALEVAL,    ATTR_PAGE_SCALE,    ::getCppuType((const sal_Int16*)0),            0, 0 },
-        {SC_UNO_PAGE_SYTLELAYOUT, ATTR_PAGE,          ::getCppuType((const style::PageStyleLayout*)0),   0, MID_PAGE_LAYOUT },
-        {SC_UNO_PAGE_PRINTANNOT,  ATTR_PAGE_NOTES,    ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTCHARTS, ATTR_PAGE_CHARTS,   ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTDOWN,   ATTR_PAGE_TOPDOWN,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTDRAW,   ATTR_PAGE_DRAWINGS, ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTFORMUL, ATTR_PAGE_FORMULAS, ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTGRID,   ATTR_PAGE_GRID,     ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTHEADER, ATTR_PAGE_HEADERS,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTOBJS,   ATTR_PAGE_OBJECTS,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PRINTZERO,   ATTR_PAGE_NULLVALS, ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_PAPERTRAY,   ATTR_PAGE_PAPERBIN, ::getCppuType((const OUString*)0),      0, 0 },
-        {SC_UNO_PAGE_RIGHTBORDER, ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_RIGHTBRDDIST,ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_RIGHTMARGIN, ATTR_LRSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_RIGHTFTRCON, ATTR_PAGE_FOOTERRIGHT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
-        {SC_UNO_PAGE_RIGHTHDRCON, ATTR_PAGE_HEADERRIGHT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
-        {SC_UNO_PAGE_SCALETOPAG,  ATTR_PAGE_SCALETOPAGES,::getCppuType((const sal_Int16*)0),     0, 0 },
-        {SC_UNO_PAGE_SCALETOX,    ATTR_PAGE_SCALETO,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        {SC_UNO_PAGE_SCALETOY,    ATTR_PAGE_SCALETO,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        {SC_UNO_PAGE_SHADOWFORM,  ATTR_SHADOW,        ::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {SC_UNO_PAGE_SIZE,        ATTR_PAGE_SIZE,     ::getCppuType((const awt::Size*)0),            0, MID_SIZE_SIZE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_TOPBORDER,   ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_TOPBRDDIST,  ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_TOPMARGIN,   ATTR_ULSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_UP_MARGIN | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRBACKTRAN,SC_WID_UNO_FOOTERSET,::getBooleanCppuType(),                       0, 0 },
-        {OLD_UNO_PAGE_HDRBACKTRAN,SC_WID_UNO_HEADERSET,::getBooleanCppuType(),                       0, 0 },
-        {SC_UNONAME_USERDEF,      ATTR_USERDEF,       getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
-        {SC_UNO_PAGE_WIDTH,       ATTR_PAGE_SIZE,     ::getCppuType((const sal_Int32*)0),            0, MID_SIZE_WIDTH | CONVERT_TWIPS },
-        {SC_UNONAME_WRITING,      ATTR_WRITINGDIR,    getCppuType((sal_Int16*)0),            0, 0 },
-        {SC_UNONAME_HIDDEN,       ATTR_HIDDEN,        getCppuType((sal_Bool*)0),             0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HEIGHT),      ATTR_PAGE_SIZE,     &::getCppuType((const sal_Int32*)0),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS),  ATTR_BACKGROUND,    &::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_LANDSCAPE),   ATTR_PAGE,          &::getBooleanCppuType(),            0, MID_PAGE_ORIENTATION },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER),  ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTMARGIN),  ATTR_LRSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_L_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ATTR_PAGE_FOOTERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ATTR_PAGE_HEADERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_NUMBERTYPE),  ATTR_PAGE,          &::getCppuType((const sal_Int16*)0),            0, MID_PAGE_NUMTYPE },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL),    ATTR_PAGE_SCALE,    &::getCppuType((const sal_Int16*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_SYTLELAYOUT), ATTR_PAGE,          &::getCppuType((const style::PageStyleLayout*)0),   0, MID_PAGE_LAYOUT },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTANNOT),  ATTR_PAGE_NOTES,    &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTCHARTS), ATTR_PAGE_CHARTS,   &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDOWN),   ATTR_PAGE_TOPDOWN,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDRAW),   ATTR_PAGE_DRAWINGS, &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTFORMUL), ATTR_PAGE_FORMULAS, &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTGRID),   ATTR_PAGE_GRID,     &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS),   ATTR_PAGE_OBJECTS,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO),   ATTR_PAGE_NULLVALS, &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY),   ATTR_PAGE_PAPERBIN, &::getCppuType((const OUString*)0),      0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ATTR_PAGE_FOOTERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ATTR_PAGE_HEADERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG),  ATTR_PAGE_SCALETOPAGES,&::getCppuType((const sal_Int16*)0),     0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX),    ATTR_PAGE_SCALETO,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY),    ATTR_PAGE_SCALETO,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM),  ATTR_SHADOW,        &::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_SIZE),        ATTR_PAGE_SIZE,     &::getCppuType((const awt::Size*)0),            0, MID_SIZE_SIZE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER),   ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST),  ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_TOPMARGIN),   ATTR_ULSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),SC_WID_UNO_HEADERSET,&::getBooleanCppuType(),                       0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_USERDEF),      ATTR_USERDEF,       &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_WIDTH),       ATTR_PAGE_SIZE,     &::getCppuType((const sal_Int32*)0),            0, MID_SIZE_WIDTH | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNONAME_WRITING),      ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_HIDDEN),       ATTR_HIDDEN,        &getCppuType((sal_Bool*)0),             0, 0 },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl );
     return &aPageStyleSet_Impl;
@@ -295,34 +295,34 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap()
 {
     static const SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] =
     {
-        {SC_UNO_PAGE_HDRBACKCOL,  ATTR_BACKGROUND,    ::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_HDRGRFFILT,  ATTR_BACKGROUND,    ::getCppuType((const OUString*)0),          0, MID_GRAPHIC_FILTER },
-        {SC_UNO_PAGE_HDRGRFLOC,   ATTR_BACKGROUND,    ::getCppuType((const style::GraphicLocation*)0),   0, MID_GRAPHIC_POSITION },
-        {SC_UNO_PAGE_HDRGRFURL,   ATTR_BACKGROUND,    ::getCppuType((const OUString*)0),          0, MID_GRAPHIC_URL },
-        {SC_UNO_PAGE_HDRBACKTRAN, ATTR_BACKGROUND,    ::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
-        {OLD_UNO_PAGE_HDRBACKCOL, ATTR_BACKGROUND,    ::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_HDRBODYDIST, ATTR_ULSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRBRDDIST,  ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRBOTTBOR,  ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRBOTTBDIS, ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRDYNAMIC, ATTR_PAGE_DYNAMIC,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_HDRHEIGHT,   ATTR_PAGE_SIZE,     ::getCppuType((const sal_Int32*)0),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRDYNAMIC,  ATTR_PAGE_DYNAMIC,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_HDRON,       ATTR_PAGE_ON,       ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_HDRSHARED,   ATTR_PAGE_SHARED,   ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_HDRLEFTBOR,  ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRLEFTBDIS, ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRLEFTMAR,  ATTR_LRSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_L_MARGIN | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRON,      ATTR_PAGE_ON,       ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTBOR, ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRRIGHTBDIS,ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRRIGHTMAR, ATTR_LRSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRSHADOW,   ATTR_SHADOW,        ::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRSHARED,  ATTR_PAGE_SHARED,   ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_HDRTOPBOR,   ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRTOPBDIS,  ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRBACKTRAN,ATTR_BACKGROUND,    ::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL),  ATTR_BACKGROUND,    &::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT),  ATTR_BACKGROUND,    &::getCppuType((const OUString*)0),          0, MID_GRAPHIC_FILTER },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC),   ATTR_BACKGROUND,    &::getCppuType((const style::GraphicLocation*)0),   0, MID_GRAPHIC_POSITION },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL),   ATTR_BACKGROUND,    &::getCppuType((const OUString*)0),          0, MID_GRAPHIC_URL },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND,    &::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND,    &::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_LO_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST),  ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR),  ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT),   ATTR_PAGE_SIZE,     &::getCppuType((const sal_Int32*)0),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC),  ATTR_PAGE_DYNAMIC,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON),       ATTR_PAGE_ON,       &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED),   ATTR_PAGE_SHARED,   &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR),  ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR),  ATTR_LRSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_L_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON),      ATTR_PAGE_ON,       &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ATTR_LRSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW),   ATTR_SHADOW,        &::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED),  ATTR_PAGE_SHARED,   &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR),   ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS),  ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),ATTR_BACKGROUND,    &::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertyMap aHeaderStyleMap( aHeaderStyleMap_Impl );
     return &aHeaderStyleMap;
@@ -334,34 +334,34 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
 {
     static const SfxItemPropertyMapEntry aFooterStyleMap_Impl[] =
     {
-        {SC_UNO_PAGE_FTRBACKCOL,  ATTR_BACKGROUND,    ::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_FTRGRFFILT,  ATTR_BACKGROUND,    ::getCppuType((const OUString*)0),          0, MID_GRAPHIC_FILTER },
-        {SC_UNO_PAGE_FTRGRFLOC,   ATTR_BACKGROUND,    ::getCppuType((const style::GraphicLocation*)0),   0, MID_GRAPHIC_POSITION },
-        {SC_UNO_PAGE_FTRGRFURL,   ATTR_BACKGROUND,    ::getCppuType((const OUString*)0),          0, MID_GRAPHIC_URL },
-        {SC_UNO_PAGE_FTRBACKTRAN, ATTR_BACKGROUND,    ::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
-        {OLD_UNO_PAGE_FTRBACKCOL, ATTR_BACKGROUND,    ::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_FTRBODYDIST, ATTR_ULSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRBRDDIST,  ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRBOTTBOR,  ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRBOTTBDIS, ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRDYNAMIC, ATTR_PAGE_DYNAMIC,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_FTRHEIGHT,   ATTR_PAGE_SIZE,     ::getCppuType((const sal_Int32*)0),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRDYNAMIC,  ATTR_PAGE_DYNAMIC,  ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_FTRON,       ATTR_PAGE_ON,       ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_FTRSHARED,   ATTR_PAGE_SHARED,   ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_FTRLEFTBOR,  ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRLEFTBDIS, ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRLEFTMAR,  ATTR_LRSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_L_MARGIN | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRON,      ATTR_PAGE_ON,       ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTBOR, ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRRIGHTBDIS,ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRRIGHTMAR, ATTR_LRSPACE,       ::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRSHADOW,   ATTR_SHADOW,        ::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRSHARED,  ATTR_PAGE_SHARED,   ::getBooleanCppuType(),            0, 0 },
-        {SC_UNO_PAGE_FTRTOPBOR,   ATTR_BORDER,        ::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRTOPBDIS,  ATTR_BORDER,        ::getCppuType((const sal_Int32*)0),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRBACKTRAN,ATTR_BACKGROUND,    ::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL),  ATTR_BACKGROUND,    &::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT),  ATTR_BACKGROUND,    &::getCppuType((const OUString*)0),          0, MID_GRAPHIC_FILTER },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC),   ATTR_BACKGROUND,    &::getCppuType((const style::GraphicLocation*)0),   0, MID_GRAPHIC_POSITION },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL),   ATTR_BACKGROUND,    &::getCppuType((const OUString*)0),          0, MID_GRAPHIC_URL },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND,    &::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND,    &::getCppuType((const sal_Int32*)0),            0, MID_BACK_COLOR },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_UP_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST),  ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),  ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT),   ATTR_PAGE_SIZE,     &::getCppuType((const sal_Int32*)0),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC),  ATTR_PAGE_DYNAMIC,  &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON),       ATTR_PAGE_ON,       &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED),   ATTR_PAGE_SHARED,   &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),  ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR),  ATTR_LRSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_L_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON),      ATTR_PAGE_ON,       &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ATTR_LRSPACE,       &::getCppuType((const sal_Int32*)0),            0, MID_R_MARGIN | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW),   ATTR_SHADOW,        &::getCppuType((const table::ShadowFormat*)0),  0, 0 | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED),  ATTR_PAGE_SHARED,   &::getBooleanCppuType(),            0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR),   ATTR_BORDER,        &::getCppuType((const table::BorderLine*)0),        0, TOP_BORDER | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS),  ATTR_BORDER,        &::getCppuType((const sal_Int32*)0),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+        {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),ATTR_BACKGROUND,    &::getBooleanCppuType(),            0, MID_GRAPHIC_TRANSPARENT },
+        {0,0,0,0,0,0}
     };
     static SfxItemPropertyMap aFooterStyleMap( aFooterStyleMap_Impl );
     return &aFooterStyleMap;
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index a939190944e4..bc209a8bf59d 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -52,9 +52,9 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap()
 {
     static const SfxItemPropertyMapEntry aLinkTargetMap_Impl[] =
     {
-        {SC_UNO_LINKDISPBIT,  0,  getCppuType((const uno::Reference<awt::XBitmap>*)0),   beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME, 0,  getCppuType((const OUString*)0),                beans::PropertyAttribute::READONLY, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT),  0,  &getCppuType((const uno::Reference<awt::XBitmap>*)0),   beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0,  &getCppuType((const OUString*)0),                beans::PropertyAttribute::READONLY, 0 },
+        {0,0,0,0,0,0}
     };
     return aLinkTargetMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 3808515c8005..b8328207ed11 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -59,7 +59,7 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
         SVX_UNOEDIT_NUMBERING_PROPERTIE,    // for completeness of service ParagraphProperties
-        {}
+        {0,0,0,0,0,0}
     };
     static sal_Bool bTwipsSet = false;
 
@@ -69,7 +69,7 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet()
         //  (headers/footers are in twips)
 
         SfxItemPropertyMapEntry* pEntry = aHdFtPropertyMap_Impl;
-        while (!pEntry->aName.isEmpty())
+        while (pEntry->pName)
         {
             if ( ( pEntry->nWID == EE_CHAR_FONTHEIGHT ||
                    pEntry->nWID == EE_CHAR_FONTHEIGHT_CJK ||
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index 0c3abbf1ebe4..ff1b41731b12 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -51,12 +51,12 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap()
 {
     static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] =
     {
-        {SC_UNO_COMPILEFAP,           0,  getBooleanCppuType(),                   0, 0 },
-        {SC_UNO_COMPILEENGLISH,       0,  getBooleanCppuType(),                   0, 0 },
-        {SC_UNO_IGNORELEADING,        0,  getBooleanCppuType(),                   0, 0 },
-        {SC_UNO_FORMULACONVENTION,    0,  getCppuType(&sheet::AddressConvention::UNSPECIFIED), 0, 0 },
-        {SC_UNO_OPCODEMAP,            0,  getCppuType((uno::Sequence< sheet::FormulaOpCodeMapEntry >*)0), 0, 0 },
-        {}
+        {MAP_CHAR_LEN(SC_UNO_COMPILEFAP),           0,  &getBooleanCppuType(),                   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_COMPILEENGLISH),       0,  &getBooleanCppuType(),                   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_IGNORELEADING),        0,  &getBooleanCppuType(),                   0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_FORMULACONVENTION),    0,  &getCppuType(&sheet::AddressConvention::UNSPECIFIED), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNO_OPCODEMAP),            0,  &getCppuType((uno::Sequence< sheet::FormulaOpCodeMapEntry >*)0), 0, 0 },
+        {0,0,0,0,0,0}
     };
     return aFormulaParserMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index c74b68ed4433..db7675ed4ae0 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -84,35 +84,35 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap()
 {
     static const SfxItemPropertyMapEntry aViewOptPropertyMap_Impl[] =
     {
-        {OLD_UNO_COLROWHDR,   0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_GRIDCOLOR,    0,  getCppuType((sal_Int32*)0),    0, 0},
-        {SC_UNO_COLROWHDR,    0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_HORSCROLL,    0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHEETTABS,    0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_VERTSCROLL,   0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_HIDESPELL,    0,  getBooleanCppuType(),          0, 0},  /* deprecated #i91949 */
-        {OLD_UNO_HORSCROLL,   0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_OUTLSYMB,     0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_VALUEHIGH,    0,  getBooleanCppuType(),          0, 0},
-        {OLD_UNO_OUTLSYMB,    0,  getBooleanCppuType(),          0, 0},
-        {OLD_UNO_SHEETTABS,   0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHOWANCHOR,   0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHOWCHARTS,   0,  getCppuType((sal_Int16*)0),    0, 0},
-        {SC_UNO_SHOWDRAW,     0,  getCppuType((sal_Int16*)0),    0, 0},
-        {SC_UNO_SHOWFORM,     0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHOWGRID,     0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHOWHELP,     0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHOWNOTES,    0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHOWOBJ,      0,  getCppuType((sal_Int16*)0),    0, 0},
-        {SC_UNO_SHOWPAGEBR,   0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_SHOWZERO,     0,  getBooleanCppuType(),          0, 0},
-        {OLD_UNO_VALUEHIGH,   0,  getBooleanCppuType(),          0, 0},
-        {OLD_UNO_VERTSCROLL,  0,  getBooleanCppuType(),          0, 0},
-        {SC_UNO_VISAREA,      0,  getCppuType((awt::Rectangle*)0), 0, 0},
-        {SC_UNO_ZOOMTYPE,     0,  getCppuType((sal_Int16*)0),    0, 0},
-        {SC_UNO_ZOOMVALUE,    0,  getCppuType((sal_Int16*)0),    0, 0},
-        {SC_UNO_VISAREASCREEN,0,  getCppuType((awt::Rectangle*)0), 0, 0},
-        {}
+        {MAP_CHAR_LEN(OLD_UNO_COLROWHDR),   0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_GRIDCOLOR),    0,  &getCppuType((sal_Int32*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_COLROWHDR),    0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_HORSCROLL),    0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHEETTABS),    0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_VERTSCROLL),   0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_HIDESPELL),    0,  &getBooleanCppuType(),          0, 0},  /* deprecated #i91949 */
+        {MAP_CHAR_LEN(OLD_UNO_HORSCROLL),   0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_OUTLSYMB),     0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_VALUEHIGH),    0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(OLD_UNO_OUTLSYMB),    0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(OLD_UNO_SHEETTABS),   0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWANCHOR),   0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWCHARTS),   0,  &getCppuType((sal_Int16*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWDRAW),     0,  &getCppuType((sal_Int16*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWFORM),     0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWGRID),     0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWHELP),     0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWNOTES),    0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWOBJ),      0,  &getCppuType((sal_Int16*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWPAGEBR),   0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHOWZERO),     0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(OLD_UNO_VALUEHIGH),   0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(OLD_UNO_VERTSCROLL),  0,  &getBooleanCppuType(),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_VISAREA),      0,  &getCppuType((awt::Rectangle*)0), 0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ZOOMTYPE),     0,  &getCppuType((sal_Int16*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ZOOMVALUE),    0,  &getCppuType((sal_Int16*)0),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_VISAREASCREEN),0,  &getCppuType((awt::Rectangle*)0), 0, 0},
+        {0,0,0,0,0,0}
     };
     return aViewOptPropertyMap_Impl;
 }
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index d2e62d91e44b..2fba24b44a49 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -77,10 +77,10 @@ static SvxItemPropertySet& GetStylePropertySet()
 {
     static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] =
     {
-        { "Family",                 WID_STYLE_FAMILY,       ::getCppuType((const OUString*)0), PropertyAttribute::READONLY,    0},
-        { "UserDefinedAttributes",  SDRATTR_XMLATTRIBUTES,  XNameContainer::static_type(), 0,     0},
-        { "DisplayName",            WID_STYLE_DISPNAME,     ::getCppuType((const OUString*)0), PropertyAttribute::READONLY,    0},
-        { "Hidden",                 WID_STYLE_HIDDEN,       ::getCppuType((bool*)0),       0,     0},
+        { RTL_CONSTASCII_STRINGPARAM("Family"),                 WID_STYLE_FAMILY,       &::getCppuType((const OUString*)0), PropertyAttribute::READONLY,    0},
+        { RTL_CONSTASCII_STRINGPARAM("UserDefinedAttributes"),  SDRATTR_XMLATTRIBUTES,  &XNameContainer::static_type(), 0,     0},
+        { RTL_CONSTASCII_STRINGPARAM("DisplayName"),            WID_STYLE_DISPNAME,     &::getCppuType((const OUString*)0), PropertyAttribute::READONLY,    0},
+        { RTL_CONSTASCII_STRINGPARAM("Hidden"),                 WID_STYLE_HIDDEN,       &::getCppuType((bool*)0),       0,     0},
 
         SVX_UNOEDIT_NUMBERING_PROPERTIE,
         SHADOW_PROPERTIES
@@ -91,11 +91,11 @@ static SvxItemPropertySet& GetStylePropertySet()
         TEXT_PROPERTIES_DEFAULTS
         CONNECTOR_PROPERTIES
         SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS
-        { "TopBorder",                    SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \
-        { "BottomBorder",                 SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \
-        { "LeftBorder",                   SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \
-        { "RightBorder",                  SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \
-        {}
+        { MAP_CHAR_LEN("TopBorder"),                    SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \
+        { MAP_CHAR_LEN("BottomBorder"),                 SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \
+        { MAP_CHAR_LEN("LeftBorder"),                   SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \
+        { MAP_CHAR_LEN("RightBorder"),                  SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \
+        {0,0,0,0,0,0}
     };
 
     static SvxItemPropertySet aPropSet( aFullPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
@@ -1173,10 +1173,10 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
             aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet );
         }
 
-        if( pEntry->aType != aAny.getValueType() )
+        if( *pEntry->pType != aAny.getValueType() )
         {
             // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
-            if( ( pEntry->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
+            if( ( *pEntry->pType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
             {
                 sal_Int32 nValue = 0;
                 aAny >>= nValue;
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 53cfa0888f3a..acd3e8630ff7 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -120,11 +120,11 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {"TextField",                     EE_FEATURE_FIELD,   ::getCppuType((const Reference< XTextField >*)0),  PropertyAttribute::READONLY, 0 },
-        {"TextPortionType",               WID_PORTIONTYPE,    ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 },
-        {"TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     ::getCppuType((const Reference< XNameContainer >*)0)  ,        0,     0},
-        {"ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     ::getCppuType((const Reference< XNameContainer >*)0)  ,        0,     0},
-        {}
+        {MAP_CHAR_LEN("TextField"),                     EE_FEATURE_FIELD,   &::getCppuType((const Reference< XTextField >*)0),  PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN("TextPortionType"),               WID_PORTIONTYPE,    &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN("TextUserDefinedAttributes"),     EE_CHAR_XMLATTRIBS,     &::getCppuType((const Reference< XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),     EE_PARA_XMLATTRIBS,     &::getCppuType((const Reference< XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
     };
     static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() );
 
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 570dc0189eb4..ad14dde7d30f 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -77,6 +77,8 @@ using namespace comphelper;
 
 extern void TransformOOo2xDocument( SdDrawDocument* pDocument );
 
+#define MAP_LEN(x) x, sizeof(x) - 1
+
 #define XML_STRING(i, x) sal_Char const i[sizeof(x)] = x
 
 XML_STRING( sXML_metaStreamName, "meta.xml");
@@ -441,35 +443,35 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
     // -------------------------------------
 
     /** property map for import info set */
-    PropertyMapEntry const aImportInfoMap[] =
+    PropertyMapEntry aImportInfoMap[] =
     {
         // necessary properties for XML progress bar at load time
-        { "ProgressRange",   0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressMax",     0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressCurrent", 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "Preview",         0, ::getCppuType((const sal_Bool*)0),  ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "PageLayouts", 0, ::getCppuType((const uno::Reference< container::XNameAccess >*)0),  ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0},
-        { "PrivateData", 0,
-              ::getCppuType( (Reference<XInterface> *)0 ),
+        { MAP_LEN( "ProgressRange" ),   0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "ProgressMax" ),     0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "Preview" ),         0, &::getCppuType((const sal_Bool*)0),  ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_LEN( "PageLayouts" ), 0, &::getCppuType((const uno::Reference< container::XNameAccess >*)0),  ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0},
+        { MAP_LEN( "PrivateData" ), 0,
+              &::getCppuType( (Reference<XInterface> *)0 ),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "BaseURI", 0,
-              ::getCppuType( (OUString *)0 ),
+        { MAP_LEN( "BaseURI" ), 0,
+              &::getCppuType( (OUString *)0 ),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0,
-              ::getCppuType( (OUString *)0 ),
+        { MAP_LEN( "StreamRelPath" ), 0,
+              &::getCppuType( (OUString *)0 ),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0,
-              ::getCppuType( (OUString *)0 ),
+        { MAP_LEN( "StreamName" ), 0,
+              &::getCppuType( (OUString *)0 ),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "BuildId", 0,
-              ::getCppuType( (OUString *)0 ),
+        { MAP_LEN( "BuildId" ), 0,
+              &::getCppuType( (OUString *)0 ),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "OrganizerMode", 0,
-              ::getBooleanCppuType(),
+        { MAP_LEN( "OrganizerMode" ), 0,
+              &::getBooleanCppuType(),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "SourceStorage", 0, embed::XStorage::static_type(),
+        { MAP_LEN( "SourceStorage" ), 0, &embed::XStorage::static_type(),
           ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { NULL, 0, 0, NULL, 0, 0 }
     };
 
     uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
@@ -820,32 +822,33 @@ sal_Bool SdXMLFilter::Export()
         uno::Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create( xContext );
 
         /** property map for export info set */
-        PropertyMapEntry const aExportInfoMap[] =
+        PropertyMapEntry aExportInfoMap[] =
         {
-            { "ProgressRange",   0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "ProgressMax",     0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "ProgressCurrent", 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-            { "UsePrettyPrinting",0, ::getBooleanCppuType(),             ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-
-            { "PageLayoutNames", 0, ::getCppuType((const OUString*)0),  ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0},
-            { "BaseURI", 0,
-                  ::getCppuType( (OUString *)0 ),
+            { MAP_LEN( "ProgressRange" ),   0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "ProgressMax" ),     0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+            { MAP_LEN( "UsePrettyPrinting"),0, &::getBooleanCppuType(),             ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+
+            { MAP_LEN( "PageLayoutNames" ), 0, &::getCppuType((const OUString*)0),  ::com::sun::star::beans::PropertyAttribute::MAYBEVOID,     0},
+            { MAP_LEN( "BaseURI" ), 0,
+                  &::getCppuType( (OUString *)0 ),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamRelPath", 0,
-                  ::getCppuType( (OUString *)0 ),
+            { MAP_LEN( "StreamRelPath" ), 0,
+                  &::getCppuType( (OUString *)0 ),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StreamName", 0,
-                  ::getCppuType( (OUString *)0 ),
+            { MAP_LEN( "StreamName" ), 0,
+                  &::getCppuType( (OUString *)0 ),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StyleNames", 0,
-                  ::getCppuType( (Sequence<OUString>*)0 ),
+            { MAP_LEN( "StyleNames" ), 0,
+                  &::getCppuType( (Sequence<OUString>*)0 ),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "StyleFamilies", 0,
-                  ::getCppuType( (Sequence<sal_Int32>*)0 ),
+            { MAP_LEN( "StyleFamilies" ), 0,
+                  &::getCppuType( (Sequence<sal_Int32>*)0 ),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { "TargetStorage", 0, embed::XStorage::static_type(),
+            { MAP_LEN( "TargetStorage" ), 0, &embed::XStorage::static_type(),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            {}
+
+            { NULL, 0, 0, NULL, 0, 0 }
         };
 
         uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aExportInfoMap ) ) );
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index ccce32e1bf45..537711410b6f 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -109,22 +109,22 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
     // NOTE: First member must be sorted
     static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] =
     {
-        { "AllowAnimations",          ATTR_PRESENT_ANIMATION_ALLOWED, ::getBooleanCppuType(),                0, 0 },
-        { "CustomShow",               ATTR_PRESENT_CUSTOMSHOW,        ::getCppuType((const OUString*)0),     0, 0 },
-        { "Display",                  ATTR_PRESENT_DISPLAY,           ::getCppuType((const sal_Int32*)0),    0, 0 },
-        { "FirstPage",                ATTR_PRESENT_DIANAME,           ::getCppuType((const OUString*)0),     0, 0 },
-        { "IsAlwaysOnTop",            ATTR_PRESENT_ALWAYS_ON_TOP,     ::getBooleanCppuType(),                0, 0 },
-        { "IsAutomatic",              ATTR_PRESENT_MANUEL,            ::getBooleanCppuType(),                0, 0 },
-        { "IsEndless",                ATTR_PRESENT_ENDLESS,           ::getBooleanCppuType(),                0, 0 },
-        { "IsFullScreen",             ATTR_PRESENT_FULLSCREEN,        ::getBooleanCppuType(),                0, 0 },
-        { "IsShowAll",                ATTR_PRESENT_ALL,               ::getBooleanCppuType(),                0, 0 },
-        { "IsMouseVisible",           ATTR_PRESENT_MOUSE,             ::getBooleanCppuType(),                0, 0 },
-        { "IsShowLogo",               ATTR_PRESENT_SHOW_PAUSELOGO,    ::getBooleanCppuType(),                0, 0 },
-        { "IsTransitionOnClick",      ATTR_PRESENT_CHANGE_PAGE,       ::getBooleanCppuType(),                0, 0 },
-        { "Pause",                    ATTR_PRESENT_PAUSE_TIMEOUT,     ::getCppuType((const sal_Int32*)0),    0, 0 },
-        { "StartWithNavigator",       ATTR_PRESENT_NAVIGATOR,         ::getBooleanCppuType(),                0, 0 },
-        { "UsePen",                   ATTR_PRESENT_PEN,               ::getBooleanCppuType(),                0, 0 },
-        {}
+        { MAP_CHAR_LEN("AllowAnimations"),          ATTR_PRESENT_ANIMATION_ALLOWED, &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("CustomShow"),               ATTR_PRESENT_CUSTOMSHOW,        &::getCppuType((const OUString*)0),     0, 0 },
+        { MAP_CHAR_LEN("Display"),                  ATTR_PRESENT_DISPLAY,           &::getCppuType((const sal_Int32*)0),    0, 0 },
+        { MAP_CHAR_LEN("FirstPage"),                ATTR_PRESENT_DIANAME,           &::getCppuType((const OUString*)0),     0, 0 },
+        { MAP_CHAR_LEN("IsAlwaysOnTop"),            ATTR_PRESENT_ALWAYS_ON_TOP,     &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("IsAutomatic"),              ATTR_PRESENT_MANUEL,            &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("IsEndless"),                ATTR_PRESENT_ENDLESS,           &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("IsFullScreen"),             ATTR_PRESENT_FULLSCREEN,        &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("IsShowAll"),                ATTR_PRESENT_ALL,               &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("IsMouseVisible"),           ATTR_PRESENT_MOUSE,             &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("IsShowLogo"),               ATTR_PRESENT_SHOW_PAUSELOGO,    &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("IsTransitionOnClick"),      ATTR_PRESENT_CHANGE_PAGE,       &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("Pause"),                    ATTR_PRESENT_PAUSE_TIMEOUT,     &::getCppuType((const sal_Int32*)0),    0, 0 },
+        { MAP_CHAR_LEN("StartWithNavigator"),       ATTR_PRESENT_NAVIGATOR,         &::getBooleanCppuType(),                0, 0 },
+        { MAP_CHAR_LEN("UsePen"),                   ATTR_PRESENT_PEN,               &::getBooleanCppuType(),                0, 0 },
+        { 0,0,0,0,0,0}
     };
 
     return aPresentationPropertyMap_Impl;
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 8b258d3d4901..b01d8fbf326b 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -50,6 +50,8 @@
 #include <editeng/editstat.hxx>
 #include <svx/unoapi.hxx>
 
+#define MAP_LEN(x) x, sizeof(x)-1
+
 using namespace ::comphelper;
 using namespace ::osl;
 using namespace ::cppu;
@@ -145,64 +147,64 @@ enum SdDocumentSettingsPropertyHandles
 
 #define MID_PRINTER 1
 
-    PropertySetInfo * createSettingsInfoImpl( sal_Bool bIsDraw )
+    PropertySetInfo* createSettingsInfoImpl( sal_Bool bIsDraw )
     {
-        static PropertyMapEntry const aImpressSettingsInfoMap[] =
+        static PropertyMapEntry aImpressSettingsInfoMap[] =
         {
-            { "IsPrintDrawing",        HANDLE_PRINTDRAWING,        ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintNotes",          HANDLE_PRINTNOTES,          ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintHandout",        HANDLE_PRINTHANDOUT,        ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintOutline",        HANDLE_PRINTOUTLINE,        ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "SlidesPerHandout",      HANDLE_SLIDESPERHANDOUT,    ::getCppuType((const sal_Int16*)0),    0,  MID_PRINTER },
-            { "HandoutsHorizontal",    HANDLE_HANDOUTHORIZONTAL,   ::getBooleanCppuType(),                0,  MID_PRINTER },
-            {}
+            { MAP_LEN("IsPrintDrawing"),        HANDLE_PRINTDRAWING,        &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintNotes"),          HANDLE_PRINTNOTES,          &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintHandout"),        HANDLE_PRINTHANDOUT,        &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintOutline"),        HANDLE_PRINTOUTLINE,        &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("SlidesPerHandout"),      HANDLE_SLIDESPERHANDOUT,    &::getCppuType((const sal_Int16*)0),    0,  MID_PRINTER },
+            { MAP_LEN("HandoutsHorizontal"),    HANDLE_HANDOUTHORIZONTAL,   &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { NULL, 0, 0, NULL, 0, 0 }
         };
 
-        static PropertyMapEntry const aDrawSettingsInfoMap[] =
+        static PropertyMapEntry aDrawSettingsInfoMap[] =
         {
-            { "MeasureUnit",           HANDLE_MEASUREUNIT,         ::getCppuType((const sal_Int16*)0),    0,  0 },
-            { "ScaleNumerator",        HANDLE_SCALE_NUM,           ::getCppuType((const sal_Int32*)0),    0,  0 },
-            { "ScaleDenominator",      HANDLE_SCALE_DOM,           ::getCppuType((const sal_Int32*)0),    0,  0 },
-            {}
+            { MAP_LEN("MeasureUnit"),           HANDLE_MEASUREUNIT,         &::getCppuType((const sal_Int16*)0),    0,  0 },
+            { MAP_LEN("ScaleNumerator"),        HANDLE_SCALE_NUM,           &::getCppuType((const sal_Int32*)0),    0,  0 },
+            { MAP_LEN("ScaleDenominator"),      HANDLE_SCALE_DOM,           &::getCppuType((const sal_Int32*)0),    0,  0 },
+            { NULL, 0, 0, NULL, 0, 0 }
         };
 
-        static PropertyMapEntry const aCommonSettingsInfoMap[] =
+        static PropertyMapEntry aCommonSettingsInfoMap[] =
         {
-            { "DefaultTabStop",        HANDLE_TABSTOP,             ::getCppuType((const sal_Int32*)0),    0,  0 },
-            { "PrinterName",           HANDLE_PRINTERNAME,         ::getCppuType((const OUString*)0),     0,  0 },
-            { "PrinterSetup",          HANDLE_PRINTERJOB,          ::getCppuType((const uno::Sequence < sal_Int8 > *)0),  0, MID_PRINTER },
-
-            { "IsPrintPageName",       HANDLE_PRINTPAGENAME,       ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintDate",           HANDLE_PRINTDATE,           ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintTime",           HANDLE_PRINTTIME,           ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintHiddenPages",    HANDLE_PRINTHIDENPAGES,     ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintFitPage",        HANDLE_PRINTFITPAGE,        ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintTilePage",       HANDLE_PRINTTILEPAGE,       ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintBooklet",        HANDLE_PRINTBOOKLET,        ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintBookletFront",   HANDLE_PRINTBOOKLETFRONT,   ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "IsPrintBookletBack",    HANDLE_PRINTBOOKLETBACK,    ::getBooleanCppuType(),                0,  MID_PRINTER },
-            { "PrintQuality",          HANDLE_PRINTQUALITY,        ::getCppuType((const sal_Int32*)0),    0,  MID_PRINTER },
-            { "ColorTableURL",         HANDLE_COLORTABLEURL,       ::getCppuType((const OUString*)0),     0,  0 },
-            { "DashTableURL",          HANDLE_DASHTABLEURL,        ::getCppuType((const OUString*)0),     0,  0 },
-            { "LineEndTableURL",       HANDLE_LINEENDTABLEURL,     ::getCppuType((const OUString*)0),     0,  0 },
-            { "HatchTableURL",         HANDLE_HATCHTABLEURL,       ::getCppuType((const OUString*)0),     0,  0 },
-            { "GradientTableURL",      HANDLE_GRADIENTTABLEURL,    ::getCppuType((const OUString*)0),     0,  0 },
-            { "BitmapTableURL",        HANDLE_BITMAPTABLEURL,      ::getCppuType((const OUString*)0),     0,  0 },
-
-            { "ForbiddenCharacters",   HANDLE_FORBIDDENCHARS,      ::getCppuType((const Reference< XForbiddenCharacters >*)0),    0, 0 },
-            { "ApplyUserData",         HANDLE_APPLYUSERDATA,       ::getBooleanCppuType(),                0,  0 },
-
-            { "PageNumberFormat",      HANDLE_PAGENUMFMT,          ::getCppuType((const sal_Int32*)0),    0,  0 },
-            { "ParagraphSummation",    HANDLE_PARAGRAPHSUMMATION,  ::getBooleanCppuType(),                0,  0 },
-            { "CharacterCompressionType",HANDLE_CHARCOMPRESS,      ::getCppuType((sal_Int16*)0),          0,  0 },
-            { "IsKernAsianPunctuation",HANDLE_ASIANPUNCT,          ::getBooleanCppuType(),                0,  0 },
-            { "UpdateFromTemplate",    HANDLE_UPDATEFROMTEMPLATE,  ::getBooleanCppuType(),                0,  0 },
-            { "PrinterIndependentLayout",HANDLE_PRINTER_INDEPENDENT_LAYOUT,::getCppuType((const sal_Int16*)0), 0,  0 },
+            { MAP_LEN("DefaultTabStop"),        HANDLE_TABSTOP,             &::getCppuType((const sal_Int32*)0),    0,  0 },
+            { MAP_LEN("PrinterName"),           HANDLE_PRINTERNAME,         &::getCppuType((const OUString*)0),     0,  0 },
+            { MAP_LEN("PrinterSetup"),          HANDLE_PRINTERJOB,          &::getCppuType((const uno::Sequence < sal_Int8 > *)0),  0, MID_PRINTER },
+
+            { MAP_LEN("IsPrintPageName"),       HANDLE_PRINTPAGENAME,       &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintDate"),           HANDLE_PRINTDATE,           &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintTime"),           HANDLE_PRINTTIME,           &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintHiddenPages"),    HANDLE_PRINTHIDENPAGES,     &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintFitPage"),        HANDLE_PRINTFITPAGE,        &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintTilePage"),       HANDLE_PRINTTILEPAGE,       &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintBooklet"),        HANDLE_PRINTBOOKLET,        &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintBookletFront"),   HANDLE_PRINTBOOKLETFRONT,   &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("IsPrintBookletBack"),    HANDLE_PRINTBOOKLETBACK,    &::getBooleanCppuType(),                0,  MID_PRINTER },
+            { MAP_LEN("PrintQuality"),          HANDLE_PRINTQUALITY,        &::getCppuType((const sal_Int32*)0),    0,  MID_PRINTER },
+            { MAP_LEN("ColorTableURL"),         HANDLE_COLORTABLEURL,       &::getCppuType((const OUString*)0),     0,  0 },
+            { MAP_LEN("DashTableURL"),          HANDLE_DASHTABLEURL,        &::getCppuType((const OUString*)0),     0,  0 },
+            { MAP_LEN("LineEndTableURL"),       HANDLE_LINEENDTABLEURL,     &::getCppuType((const OUString*)0),     0,  0 },
+            { MAP_LEN("HatchTableURL"),         HANDLE_HATCHTABLEURL,       &::getCppuType((const OUString*)0),     0,  0 },
+            { MAP_LEN("GradientTableURL"),      HANDLE_GRADIENTTABLEURL,    &::getCppuType((const OUString*)0),     0,  0 },
+            { MAP_LEN("BitmapTableURL"),        HANDLE_BITMAPTABLEURL,      &::getCppuType((const OUString*)0),     0,  0 },
+
+            { MAP_LEN("ForbiddenCharacters"),   HANDLE_FORBIDDENCHARS,      &::getCppuType((const Reference< XForbiddenCharacters >*)0),    0, 0 },
+            { MAP_LEN("ApplyUserData"),         HANDLE_APPLYUSERDATA,       &::getBooleanCppuType(),                0,  0 },
+
+            { MAP_LEN("PageNumberFormat"),      HANDLE_PAGENUMFMT,          &::getCppuType((const sal_Int32*)0),    0,  0 },
+            { MAP_LEN("ParagraphSummation"),    HANDLE_PARAGRAPHSUMMATION,  &::getBooleanCppuType(),                0,  0 },
+            { MAP_LEN("CharacterCompressionType"),HANDLE_CHARCOMPRESS,      &::getCppuType((sal_Int16*)0),          0,  0 },
+            { MAP_LEN("IsKernAsianPunctuation"),HANDLE_ASIANPUNCT,          &::getBooleanCppuType(),                0,  0 },
+            { MAP_LEN("UpdateFromTemplate"),    HANDLE_UPDATEFROMTEMPLATE,  &::getBooleanCppuType(),                0,  0 },
+            { MAP_LEN("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,&::getCppuType((const sal_Int16*)0), 0,  0 },
             // --> #i33095#
-            { "LoadReadonly",          HANDLE_LOAD_READONLY,       ::getBooleanCppuType(),                0,  0 },
-            { "SaveVersionOnClose",    HANDLE_SAVE_VERSION,        ::getBooleanCppuType(),                0,  0 },
-            { "EmbedFonts",            HANDLE_EMBED_FONTS,         ::getBooleanCppuType(),                0,  0 },
-            {}
+            { MAP_LEN("LoadReadonly"),          HANDLE_LOAD_READONLY,       &::getBooleanCppuType(),                0,  0 },
+            { MAP_LEN("SaveVersionOnClose"),    HANDLE_SAVE_VERSION,        &::getBooleanCppuType(),                0,  0 },
+            { MAP_LEN("EmbedFonts"),            HANDLE_EMBED_FONTS,         &::getBooleanCppuType(),                0,  0 },
+            { NULL, 0, 0, NULL, 0, 0 }
         };
 
         PropertySetInfo* pInfo = new PropertySetInfo( aCommonSettingsInfoMap );
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index b362fcdd1a42..557b54abaeb5 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -68,13 +68,13 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet()
 {
     static const SfxItemPropertyMapEntry aSdLayerPropertyMap_Impl[] =
     {
-        { UNO_NAME_LAYER_LOCKED,      WID_LAYER_LOCKED,   ::getBooleanCppuType(),            0, 0 },
-        { UNO_NAME_LAYER_PRINTABLE,   WID_LAYER_PRINTABLE,::getBooleanCppuType(),            0, 0 },
-        { UNO_NAME_LAYER_VISIBLE,     WID_LAYER_VISIBLE,  ::getBooleanCppuType(),            0, 0 },
-        { UNO_NAME_LAYER_NAME,        WID_LAYER_NAME,     ::getCppuType((const OUString*)0), 0, 0 },
-        { "Title",                    WID_LAYER_TITLE,    ::getCppuType((const OUString*)0), 0, 0 },
-        { "Description",              WID_LAYER_DESC,     ::getCppuType((const OUString*)0), 0, 0 },
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_LAYER_LOCKED),      WID_LAYER_LOCKED,   &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_LAYER_PRINTABLE),   WID_LAYER_PRINTABLE,&::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_LAYER_VISIBLE),     WID_LAYER_VISIBLE,  &::getBooleanCppuType(),            0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_LAYER_NAME),        WID_LAYER_NAME,     &::getCppuType((const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("Title"),                    WID_LAYER_TITLE,    &::getCppuType((const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("Description"),              WID_LAYER_DESC,     &::getCppuType((const OUString*)0), 0, 0 },
+        { 0,0,0,0,0,0}
     };
     static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aSDLayerPropertySet_Impl;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ae1ab366f689..3e1b95752dcb 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -180,21 +180,21 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet()
     // Attention: the first parameter HAS TO BE sorted!!!
     const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] =
     {
-        { "BuildId",                      WID_MODEL_BUILDID,            ::getCppuType(static_cast< const OUString * >(0)),                      0, 0},
-        { sUNO_Prop_CharLocale,           WID_MODEL_LANGUAGE,           ::getCppuType((const lang::Locale*)0),                                  0, 0},
-        { sUNO_Prop_TabStop,              WID_MODEL_TABSTOP,            ::getCppuType((const sal_Int32*)0),                                     0, 0},
-        { sUNO_Prop_VisibleArea,          WID_MODEL_VISAREA,            ::getCppuType((const awt::Rectangle*)0),                                0, 0},
-        { sUNO_Prop_MapUnit,              WID_MODEL_MAPUNIT,            ::getCppuType((const sal_Int16*)0),                                     beans::PropertyAttribute::READONLY, 0},
-        { sUNO_Prop_ForbiddenCharacters,  WID_MODEL_FORBCHARS,          ::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0},
-        { sUNO_Prop_AutomContFocus,       WID_MODEL_CONTFOCUS,          ::getBooleanCppuType(),                                                 0, 0},
-        { sUNO_Prop_ApplyFrmDsgnMode,     WID_MODEL_DSGNMODE,           ::getBooleanCppuType(),                                                 0, 0},
-        { "BasicLibraries",               WID_MODEL_BASICLIBS,          ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  beans::PropertyAttribute::READONLY, 0},
-        { "DialogLibraries",              WID_MODEL_DIALOGLIBS,         ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  beans::PropertyAttribute::READONLY, 0},
-        { sUNO_Prop_RuntimeUID,           WID_MODEL_RUNTIMEUID,         ::getCppuType(static_cast< const OUString * >(0)),                      beans::PropertyAttribute::READONLY, 0},
-        { sUNO_Prop_HasValidSignatures,   WID_MODEL_HASVALIDSIGNATURES, ::getCppuType(static_cast< const sal_Bool * >(0)),                      beans::PropertyAttribute::READONLY, 0},
-        { "Fonts",                        WID_MODEL_FONTS,              ::getCppuType((uno::Sequence<uno::Any>*)0),                     beans::PropertyAttribute::READONLY, 0},
-        { sUNO_Prop_InteropGrabBag,       WID_MODEL_INTEROPGRABBAG,     ::getCppuType((uno::Sequence< beans::PropertyValue >*)0),       0, 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,              &::getCppuType((uno::Sequence<uno::Any>*)0),                     beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_InteropGrabBag),       WID_MODEL_INTEROPGRABBAG,     &::getCppuType((uno::Sequence< beans::PropertyValue >*)0),       0, 0},
+        { 0,0,0,0,0,0 }
     };
     static SvxItemPropertySet aDrawModelPropertySet_Impl( aDrawModelPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aDrawModelPropertySet_Impl;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 5d8e9590204c..e864e1906cfa 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -129,30 +129,30 @@ static SdTypesCache gImplTypesCache;
 
 
         #define IMPRESS_MAP_ENTRIES \
-        { UNO_NAME_OBJ_LEGACYFRAGMENT,WID_LEGACYFRAGMENT,  ITYPE(drawing::XShape),                                   0, 0},\
-        { UNO_NAME_OBJ_ANIMATIONPATH, WID_ANIMPATH,        ITYPE(drawing::XShape),                                   0, 0},\
-        { UNO_NAME_OBJ_BOOKMARK,      WID_BOOKMARK,        ::getCppuType((const OUString*)0),                        0, 0},\
-        { UNO_NAME_OBJ_DIMCOLOR,      WID_DIMCOLOR,        ::getCppuType((const sal_Int32*)0),                       0, 0},\
-        { UNO_NAME_OBJ_DIMHIDE,       WID_DIMHIDE,         ::getBooleanCppuType(),                                   0, 0},\
-        { UNO_NAME_OBJ_DIMPREV,       WID_DIMPREV,         ::getBooleanCppuType(),                                   0, 0},\
-        { UNO_NAME_OBJ_EFFECT,        WID_EFFECT,          ::getCppuType((const presentation::AnimationEffect*)0),   0, 0},\
-        { UNO_NAME_OBJ_ISEMPTYPRESOBJ,WID_ISEMPTYPRESOBJ,  ::getBooleanCppuType(),                                   0, 0},\
-        { UNO_NAME_OBJ_ISPRESOBJ,     WID_ISPRESOBJ,       ::getBooleanCppuType(),                                   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
-        { UNO_NAME_OBJ_MASTERDEPENDENT,WID_MASTERDEPEND,   ::getBooleanCppuType(),                                   0, 0},\
-        { UNO_NAME_OBJ_CLICKACTION,   WID_CLICKACTION,     ::getCppuType((const presentation::ClickAction*)0),       0, 0},\
-        { UNO_NAME_OBJ_PLAYFULL,      WID_PLAYFULL,        ::getBooleanCppuType(),                                   0, 0},\
-        { UNO_NAME_OBJ_PRESORDER,     WID_PRESORDER,       ::getCppuType((const sal_Int32*)0),                       0, 0},\
-        { UNO_NAME_OBJ_STYLE,         WID_STYLE,           ITYPE( style::XStyle),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
-        { UNO_NAME_OBJ_SOUNDFILE,     WID_SOUNDFILE,       ::getCppuType((const OUString*)0),                        0, 0},\
-        { UNO_NAME_OBJ_SOUNDON,       WID_SOUNDON,         ::getBooleanCppuType(),                                   0, 0},\
-        { UNO_NAME_OBJ_SPEED,         WID_SPEED,           ::getCppuType((const presentation::AnimationSpeed*)0),    0, 0},\
-        { UNO_NAME_OBJ_TEXTEFFECT,    WID_TEXTEFFECT,      ::getCppuType((const presentation::AnimationEffect*)0),   0, 0},\
-        { UNO_NAME_OBJ_BLUESCREEN,    WID_BLUESCREEN,      ::getCppuType((const sal_Int32*)0),                       0, 0},\
-        { UNO_NAME_OBJ_VERB,          WID_VERB,            ::getCppuType((const sal_Int32*)0),                       0, 0},\
-        { "IsAnimation",              WID_ISANIMATION,     ::getBooleanCppuType(),                                   0, 0},\
-        { "NavigationOrder",          WID_NAVORDER,        ::getCppuType((const sal_Int32*)0),                       0, 0},\
-        { "PlaceholderText",          WID_PLACEHOLDERTEXT, ::getCppuType((const OUString*)0),                        0, 0},\
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT,  &ITYPE(drawing::XShape),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH,        &ITYPE(drawing::XShape),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_BOOKMARK),      WID_BOOKMARK,        &::getCppuType((const OUString*)0),                        0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMCOLOR),      WID_DIMCOLOR,        &::getCppuType((const sal_Int32*)0),                       0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMHIDE),       WID_DIMHIDE,         &::getBooleanCppuType(),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMPREV),       WID_DIMPREV,         &::getBooleanCppuType(),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_EFFECT),        WID_EFFECT,          &::getCppuType((const presentation::AnimationEffect*)0),   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_ISEMPTYPRESOBJ),WID_ISEMPTYPRESOBJ,  &::getBooleanCppuType(),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_ISPRESOBJ),     WID_ISPRESOBJ,       &::getBooleanCppuType(),                                   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND,   &::getBooleanCppuType(),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_CLICKACTION),   WID_CLICKACTION,     &::getCppuType((const presentation::ClickAction*)0),       0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_PLAYFULL),      WID_PLAYFULL,        &::getBooleanCppuType(),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_PRESORDER),     WID_PRESORDER,       &::getCppuType((const sal_Int32*)0),                       0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_STYLE),         WID_STYLE,           &ITYPE( style::XStyle),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDFILE),     WID_SOUNDFILE,       &::getCppuType((const OUString*)0),                        0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDON),       WID_SOUNDON,         &::getBooleanCppuType(),                                   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_SPEED),         WID_SPEED,           &::getCppuType((const presentation::AnimationSpeed*)0),    0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_TEXTEFFECT),    WID_TEXTEFFECT,      &::getCppuType((const presentation::AnimationEffect*)0),   0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_BLUESCREEN),    WID_BLUESCREEN,      &::getCppuType((const sal_Int32*)0),                       0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_VERB),          WID_VERB,            &::getCppuType((const sal_Int32*)0),                       0, 0},\
+        { MAP_CHAR_LEN("IsAnimation"),              WID_ISANIMATION,     &::getBooleanCppuType(),                                   0, 0},\
+        { MAP_CHAR_LEN("NavigationOrder"),          WID_NAVORDER,        &::getCppuType((const sal_Int32*)0),                       0, 0},\
+        { MAP_CHAR_LEN("PlaceholderText"),          WID_PLACEHOLDERTEXT, &::getCppuType((const OUString*)0),                        0, 0},\
+        { 0,0,0,0,0,0}
 
 
     static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()
@@ -160,7 +160,7 @@ static SdTypesCache gImplTypesCache;
 
         static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] =
         {
-            { "ImageMap",             WID_IMAGEMAP,        ::getCppuType((const uno::Reference< container::XIndexContainer >*)0),    0, 0 },
+            { MAP_CHAR_LEN("ImageMap"),             WID_IMAGEMAP,        &::getCppuType((const uno::Reference< container::XIndexContainer >*)0),    0, 0 },
             IMPRESS_MAP_ENTRIES
         };
         return aImpress_SdXShapePropertyGraphicMap_Impl;
@@ -177,11 +177,11 @@ static SdTypesCache gImplTypesCache;
     }
 
     #define DRAW_MAP_ENTRIES\
-        { UNO_NAME_OBJ_BOOKMARK,      WID_BOOKMARK,       ::getCppuType((const OUString*)0),                 0, 0},\
-        { UNO_NAME_OBJ_CLICKACTION,   WID_CLICKACTION,    ::getCppuType((const presentation::ClickAction*)0),0, 0},\
-        { UNO_NAME_OBJ_STYLE,         WID_STYLE,          ITYPE(style::XStyle),                              ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
-        { "NavigationOrder",          WID_NAVORDER,       ::getCppuType((const sal_Int32*)0),                       0, 0},\
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_BOOKMARK),      WID_BOOKMARK,       &::getCppuType((const OUString*)0),                 0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_CLICKACTION),   WID_CLICKACTION,    &::getCppuType((const presentation::ClickAction*)0),0, 0},\
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_STYLE),         WID_STYLE,          &ITYPE(style::XStyle),                              ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
+        { MAP_CHAR_LEN("NavigationOrder"),          WID_NAVORDER,        &::getCppuType((const sal_Int32*)0),                       0, 0},\
+        { 0,0,0,0,0,0}
 
     static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
     {
@@ -195,7 +195,7 @@ static SdTypesCache gImplTypesCache;
     {
         static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] =
         {
-            { "ImageMap",             WID_IMAGEMAP,        ::getCppuType((const uno::Reference< container::XIndexContainer >*)0),    0, 0 },
+            { MAP_CHAR_LEN("ImageMap"),             WID_IMAGEMAP,        &::getCppuType((const uno::Reference< container::XIndexContainer >*)0),    0, 0 },
             DRAW_MAP_ENTRIES
         };
         return aDraw_SdXShapePropertyGraphicMap_Impl;
@@ -255,7 +255,7 @@ static SdTypesCache gImplTypesCache;
     {
         static const SfxItemPropertyMapEntry aEmpty_SdXShapePropertyMap_Impl[] =
         {
-            {}
+            { 0,0,0,0,0,0}
         };
         return aEmpty_SdXShapePropertyMap_Impl;
     }
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 5862db011b0e..a1a7ab45b8e2 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -108,79 +108,79 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
 {
     static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      ITYPE( beans::XPropertySet ),                  beans::PropertyAttribute::MAYBEVOID,0},
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_CHANGE,           WID_PAGE_CHANGE,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_DURATION,         WID_PAGE_DURATION,  ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_EFFECT,           WID_PAGE_EFFECT,    ::getCppuType((const presentation::FadeEffect*)0),     0,  0},
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::getCppuType((const sal_Int16*)0),            0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  ITYPE( awt::XBitmap),                          beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},
-        { UNO_NAME_PAGE_SPEED,            WID_PAGE_SPEED,     ::getCppuType((const presentation::AnimationSpeed*)0), 0,  0},
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_PREVIEW,          WID_PAGE_PREVIEW,   ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_PREVIEWBITMAP,    WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_VISIBLE,          WID_PAGE_VISIBLE,   ::getBooleanCppuType(),                        0, 0},
-        { UNO_NAME_OBJ_SOUNDFILE,         WID_PAGE_SOUNDFILE, ::getCppuType((const Any*)0),              0, 0},
-        { sUNO_Prop_IsBackgroundVisible,  WID_PAGE_BACKVIS,   ::getBooleanCppuType(),                        0, 0},
-        { sUNO_Prop_IsBackgroundObjectsVisible,   WID_PAGE_BACKOBJVIS,    ::getBooleanCppuType(),                        0, 0},
-        { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
-        { sUNO_Prop_BookmarkURL,          WID_PAGE_BOOKMARK,  ::getCppuType((const OUString*)0),             0,  0},
-        { "HighResDuration",              WID_PAGE_HIGHRESDURATION,  ::getCppuType((const double*)0),            0,  0},
-        { "IsBackgroundDark" ,            WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
-        { "IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(),                    0, 0},
-        { "FooterText",                   WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0),                0,  0},
-        { "IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(),                    0, 0},
-        { "IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(),                  0, 0},
-        { "IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(),                    0, 0},
-        { "DateTimeText",                 WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0),              0,  0},
-        { "DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0),           0,  0},
-        { "TransitionType",               WID_TRANSITION_TYPE, ::getCppuType((const sal_Int16*)0),           0,  0},
-        { "TransitionSubtype",            WID_TRANSITION_SUBTYPE, ::getCppuType((const sal_Int16*)0),            0,  0},
-        { "TransitionDirection",          WID_TRANSITION_DIRECTION, ::getCppuType((const sal_Bool*)0),           0,  0},
-        { "TransitionFadeColor",          WID_TRANSITION_FADE_COLOR, ::getCppuType((const sal_Int32*)0),         0,  0},
-        { "TransitionDuration",           WID_TRANSITION_DURATION, ::getCppuType((const double*)0),          0,  0},
-        { "LoopSound",                    WID_LOOP_SOUND, ::getBooleanCppuType(),                    0, 0},
-        { "NavigationOrder",              WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0,  0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      &ITYPE( beans::XPropertySet ),                  beans::PropertyAttribute::MAYBEVOID,0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM),           WID_PAGE_BOTTOM,    &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT),             WID_PAGE_LEFT,      &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_CHANGE),           WID_PAGE_CHANGE,    &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_DURATION),         WID_PAGE_DURATION,  &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_EFFECT),           WID_PAGE_EFFECT,    &::getCppuType((const presentation::FadeEffect*)0),     0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT),           WID_PAGE_LAYOUT,    &::getCppuType((const sal_Int16*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  &ITYPE( awt::XBitmap),                          beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    &::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    &::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    &::getCppuType((const view::PaperOrientation*)0),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_SPEED),            WID_PAGE_SPEED,     &::getCppuType((const presentation::AnimationSpeed*)0), 0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW),          WID_PAGE_PREVIEW,   &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP),    WID_PAGE_PREVIEWBITMAP, &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_VISIBLE),          WID_PAGE_VISIBLE,   &::getBooleanCppuType(),                        0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDFILE),         WID_PAGE_SOUNDFILE, &::getCppuType((const Any*)0),              0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundVisible),  WID_PAGE_BACKVIS,   &::getBooleanCppuType(),                        0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundObjectsVisible),   WID_PAGE_BACKOBJVIS,    &::getBooleanCppuType(),                        0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
+        { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL),          WID_PAGE_BOOKMARK,  &::getCppuType((const OUString*)0),             0,  0},
+        { MAP_CHAR_LEN("HighResDuration"),              WID_PAGE_HIGHRESDURATION,  &::getCppuType((const double*)0),            0,  0},
+        { MAP_CHAR_LEN("IsBackgroundDark" ),            WID_PAGE_ISDARK,    &::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("IsFooterVisible"),              WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("FooterText"),                   WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0),                0,  0},
+        { MAP_CHAR_LEN("IsPageNumberVisible"),          WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("IsDateTimeVisible"),            WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(),                  0, 0},
+        { MAP_CHAR_LEN("IsDateTimeFixed"),              WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("DateTimeText"),                 WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0),              0,  0},
+        { MAP_CHAR_LEN("DateTimeFormat"),               WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0),           0,  0},
+        { MAP_CHAR_LEN("TransitionType"),               WID_TRANSITION_TYPE, &::getCppuType((const sal_Int16*)0),           0,  0},
+        { MAP_CHAR_LEN("TransitionSubtype"),            WID_TRANSITION_SUBTYPE, &::getCppuType((const sal_Int16*)0),            0,  0},
+        { MAP_CHAR_LEN("TransitionDirection"),          WID_TRANSITION_DIRECTION, &::getCppuType((const sal_Bool*)0),           0,  0},
+        { MAP_CHAR_LEN("TransitionFadeColor"),          WID_TRANSITION_FADE_COLOR, &::getCppuType((const sal_Int32*)0),         0,  0},
+        { MAP_CHAR_LEN("TransitionDuration"),           WID_TRANSITION_DURATION, &::getCppuType((const double*)0),          0,  0},
+        { MAP_CHAR_LEN("LoopSound"),                    WID_LOOP_SOUND, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("NavigationOrder"),              WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0,  0},
+        {0,0,0,0,0,0}
     };
 
 #define DRAW_PAGE_NOTES_PROPERTIES \
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
-        { UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::getCppuType((const sal_Int16*)0),            0,  0},                                                                \
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  ITYPE( awt::XBitmap),                          beans::PropertyAttribute::READONLY, 0},                                \
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},                                \
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},                                \
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},                                                                \
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
-        { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,      0,     0},\
-        { "IsHeaderVisible",              WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(),                    0, 0},                                                                 \
-        { "HeaderText",                   WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0),                0,  0},                                                            \
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,     ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},                                \
-        { "IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(),                    0, 0},                                                                 \
-        { "FooterText",                   WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0),                0,  0},                                                            \
-        { "IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(),                    0, 0},                                                             \
-        { "IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(),                  0, 0},                                                                 \
-        { "IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(),                    0, 0},                                                                 \
-        { "DateTimeText",                 WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0),              0,  0},                                                            \
-        { "DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0),           0,  0},                                                            \
-        { "NavigationOrder",              WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0,  0},                                                            \
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM),           WID_PAGE_BOTTOM,    &::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT),             WID_PAGE_LEFT,      &::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     &::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       &::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    &::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT),           WID_PAGE_LAYOUT,    &::getCppuType((const sal_Int16*)0),            0,  0},                                                                \
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  &ITYPE( awt::XBitmap),                          beans::PropertyAttribute::READONLY, 0},                                \
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    &::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    &::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    &::getCppuType((const view::PaperOrientation*)0),0, 0},                                                                \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     &::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
+        { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,      0,     0},\
+        { MAP_CHAR_LEN("IsHeaderVisible"),              WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(),                    0, 0},                                                                 \
+        { MAP_CHAR_LEN("HeaderText"),                   WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0),                0,  0},                                                            \
+        { MAP_CHAR_LEN("IsBackgroundDark" ),            WID_PAGE_ISDARK,    &::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},                                \
+        { MAP_CHAR_LEN("IsFooterVisible"),              WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(),                    0, 0},                                                                 \
+        { MAP_CHAR_LEN("FooterText"),                   WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0),                0,  0},                                                            \
+        { MAP_CHAR_LEN("IsPageNumberVisible"),          WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(),                    0, 0},                                                             \
+        { MAP_CHAR_LEN("IsDateTimeVisible"),            WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(),                  0, 0},                                                                 \
+        { MAP_CHAR_LEN("IsDateTimeFixed"),              WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(),                    0, 0},                                                                 \
+        { MAP_CHAR_LEN("DateTimeText"),                 WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0),              0,  0},                                                            \
+        { MAP_CHAR_LEN("DateTimeFormat"),               WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0),           0,  0},                                                            \
+        { MAP_CHAR_LEN("NavigationOrder"),              WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0,  0},                                                            \
+        {0,0,0,0,0,0}
 
     static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] =
     {
         // this must be the first two entries so they can be excluded for PK_STANDARD
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      ITYPE( beans::XPropertySet ),                  beans::PropertyAttribute::MAYBEVOID,0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      &ITYPE( beans::XPropertySet ),                  beans::PropertyAttribute::MAYBEVOID,0},
         DRAW_PAGE_NOTES_PROPERTIES
     };
     static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] =
@@ -189,27 +189,27 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
     };
 
 #define GRAPHIC_PAGE_PROPERTIES \
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  ITYPE(awt::XBitmap),                           beans::PropertyAttribute::READONLY, 0},                                             \
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},                                             \
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},                                             \
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},                                                                             \
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_PREVIEW,          WID_PAGE_PREVIEW,   ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},    \
-        { UNO_NAME_PAGE_PREVIEWBITMAP,    WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
-        { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},                          \
-        { sUNO_Prop_BookmarkURL,          WID_PAGE_BOOKMARK,  ::getCppuType((const OUString*)0),             0,  0},                                                                             \
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},                                             \
-        { "NavigationOrder",              WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0,  0},                                                                         \
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM),           WID_PAGE_BOTTOM,    &::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT),             WID_PAGE_LEFT,      &::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     &::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       &::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    &::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  &ITYPE(awt::XBitmap),                           beans::PropertyAttribute::READONLY, 0},                                             \
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    &::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    &::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    &::getCppuType((const view::PaperOrientation*)0),0, 0},                                                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     &::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW),          WID_PAGE_PREVIEW,   &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},    \
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP),    WID_PAGE_PREVIEWBITMAP, &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
+        { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},                          \
+        { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL),          WID_PAGE_BOOKMARK,  &::getCppuType((const OUString*)0),             0,  0},                                                                             \
+        { MAP_CHAR_LEN("IsBackgroundDark" ),            WID_PAGE_ISDARK,    &::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},                                             \
+        { MAP_CHAR_LEN("NavigationOrder"),              WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0,  0},                                                                         \
+        {0,0,0,0,0,0}
 
     static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      ITYPE( beans::XPropertySet),                   beans::PropertyAttribute::MAYBEVOID,0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      &ITYPE( beans::XPropertySet),                   beans::PropertyAttribute::MAYBEVOID,0},
         GRAPHIC_PAGE_PROPERTIES
     };
     static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] =
@@ -262,46 +262,46 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
 {
     static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      ITYPE(beans::XPropertySet),                    0,  0},
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  ITYPE(awt::XBitmap),                           beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::getCppuType((const sal_Int32*)0),            0,  0},
-        { "BackgroundFullSize",           WID_PAGE_BACKFULL,  ::getBooleanCppuType(),                        0, 0},
-        { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      &ITYPE(beans::XPropertySet),                    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM),           WID_PAGE_BOTTOM,    &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT),             WID_PAGE_LEFT,      &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  &ITYPE(awt::XBitmap),                           beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    &::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    &::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    &::getCppuType((const view::PaperOrientation*)0),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN("BackgroundFullSize"),           WID_PAGE_BACKFULL,  &::getBooleanCppuType(),                        0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
+        { MAP_CHAR_LEN("IsBackgroundDark" ),            WID_PAGE_ISDARK,    &::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
+        {0,0,0,0,0,0}
     };
 
     static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::getCppuType((const sal_Int32*)0),            0,  0},
-        { UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::getCppuType((const sal_Int16*)0),            0,  0},
-        { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
-        { "IsHeaderVisible",              WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(),                    0, 0},
-        { "HeaderText",                   WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0),                0,  0},
-        { "IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(),                    0, 0},
-        { "FooterText",                   WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0),                0,  0},
-        { "IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(),                    0, 0},
-        { "IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(),                  0, 0},
-        { "IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(),                    0, 0},
-        { "DateTimeText",                 WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0),              0,  0},
-        { "DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0),           0,  0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM),           WID_PAGE_BOTTOM,    &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT),             WID_PAGE_LEFT,      &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    &::getCppuType((const view::PaperOrientation*)0),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    &::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     &::getCppuType((const sal_Int32*)0),            0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT),           WID_PAGE_LAYOUT,    &::getCppuType((const sal_Int16*)0),            0,  0},
+        { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
+        { MAP_CHAR_LEN("IsBackgroundDark" ),            WID_PAGE_ISDARK,    &::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("IsHeaderVisible"),              WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("HeaderText"),                   WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0),                0,  0},
+        { MAP_CHAR_LEN("IsFooterVisible"),              WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("FooterText"),                   WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0),                0,  0},
+        { MAP_CHAR_LEN("IsPageNumberVisible"),          WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("IsDateTimeVisible"),            WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(),                  0, 0},
+        { MAP_CHAR_LEN("IsDateTimeFixed"),              WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(),                    0, 0},
+        { MAP_CHAR_LEN("DateTimeText"),                 WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0),              0,  0},
+        { MAP_CHAR_LEN("DateTimeFormat"),               WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0),           0,  0},
+        {0,0,0,0,0,0}
     };
 
     const SvxItemPropertySet* pRet = 0;
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 116522034fcd..2b5dcbd803c8 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -43,7 +43,7 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet()
     static const SfxItemPropertyMapEntry aPageBackgroundPropertyMap_Impl[] =
     {
         FILL_PROPERTIES
-        {}
+        {0,0,0,0,0,0}
     };
 
     static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index b84f09473bc3..2d81d3631b1c 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -42,10 +42,10 @@ const SfxItemPropertyMapEntry* ImplGetSearchPropertyMap()
 {
     static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
     {
-        { UNO_NAME_SEARCH_BACKWARDS,  WID_SEARCH_BACKWARDS,   ::getBooleanCppuType(),    0,  0 },
-        { UNO_NAME_SEARCH_CASE,       WID_SEARCH_CASE,        ::getBooleanCppuType(),    0,  0 },
-        { UNO_NAME_SEARCH_WORDS,      WID_SEARCH_WORDS,       ::getBooleanCppuType(),    0,  0 },
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_SEARCH_BACKWARDS),  WID_SEARCH_BACKWARDS,   &::getBooleanCppuType(),    0,  0 },
+        { MAP_CHAR_LEN(UNO_NAME_SEARCH_CASE),       WID_SEARCH_CASE,        &::getBooleanCppuType(),    0,  0 },
+        { MAP_CHAR_LEN(UNO_NAME_SEARCH_WORDS),      WID_SEARCH_WORDS,       &::getBooleanCppuType(),    0,  0 },
+        { 0,0,0,0,0,0}
     };
 
     return aSearchPropertyMap_Impl;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 8a92fbf466cb..1ec2f0db6a77 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -79,15 +79,15 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl()
 {
     static const SfxItemPropertyMapEntry aIFramePropertyMap_Impl[] =
     {
-        { "FrameIsAutoBorder",    WID_FRAME_IS_AUTO_BORDER,   ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
-        { "FrameIsAutoScroll",    WID_FRAME_IS_AUTO_SCROLL,   ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
-        { "FrameIsBorder",        WID_FRAME_IS_BORDER,        ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
-        { "FrameIsScrollingMode", WID_FRAME_IS_SCROLLING_MODE,::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
-        { "FrameMarginHeight",    WID_FRAME_MARGIN_HEIGHT,    ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
-        { "FrameMarginWidth",     WID_FRAME_MARGIN_WIDTH,     ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
-        { "FrameName",            WID_FRAME_NAME,             ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
-        { "FrameURL",             WID_FRAME_URL,              ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
-        {}
+        { MAP_CHAR_LEN("FrameIsAutoBorder"),    WID_FRAME_IS_AUTO_BORDER,   &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("FrameIsAutoScroll"),    WID_FRAME_IS_AUTO_SCROLL,   &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("FrameIsBorder"),        WID_FRAME_IS_BORDER,        &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("FrameMarginHeight"),    WID_FRAME_MARGIN_HEIGHT,    &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("FrameMarginWidth"),     WID_FRAME_MARGIN_WIDTH,     &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("FrameName"),            WID_FRAME_NAME,             &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("FrameURL"),             WID_FRAME_URL,              &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+        {0,0,0,0,0,0}
     };
     return aIFramePropertyMap_Impl;
 }
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 82b7ebd0a913..3d24f23a96b4 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -62,10 +62,10 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl()
 {
     static const SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] =
     {
-        { "PluginCommands", WID_COMMANDS, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0},
-        { "PluginMimeType", WID_MIMETYPE, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
-        { "PluginURL",      WID_URL     , ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
-        {}
+        { MAP_CHAR_LEN("PluginCommands"), WID_COMMANDS, &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0},
+        { MAP_CHAR_LEN("PluginMimeType"), WID_MIMETYPE, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+        { MAP_CHAR_LEN("PluginURL"),      WID_URL     , &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+        {0,0,0,0,0,0}
     };
     return aPluginPropertyMap_Impl;
 }
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index e3294b42afd4..7fffe8ff342c 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -143,19 +143,19 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
     // create XPropertySet with three properties for status indicator
     comphelper::PropertyMapEntry aInfoMap[] =
     {
-        { "UsePrettyPrinting", 0,
-              ::getBooleanCppuType(),
+        { "UsePrettyPrinting", sizeof("UsePrettyPrinting")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "BaseURI", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "BaseURI", sizeof("BaseURI")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamRelPath", sizeof("StreamRelPath")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamName", sizeof("StreamName")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet(
                 comphelper::GenericPropertySet_CreateInstance(
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 35744bcd9de3..f8a272e95edf 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -134,19 +134,19 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
 
     comphelper::PropertyMapEntry aInfoMap[] =
     {
-        { "PrivateData", 0,
-              ::getCppuType( (Reference<XInterface> *)0 ),
+        { "PrivateData", sizeof("PrivateData")-1, 0,
+              &::getCppuType( (Reference<XInterface> *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "BaseURI", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "BaseURI", sizeof("BaseURI")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamRelPath", sizeof("StreamRelPath")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamName", sizeof("StreamName")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet(
                 comphelper::GenericPropertySet_CreateInstance(
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 7fe88ec17b7c..bd0676824605 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -237,75 +237,75 @@ static PropertySetInfo * lcl_createModelPropertyInfo ()
 {
     static PropertyMapEntry aModelPropertyInfoMap[] =
     {
-        { "Alignment"                        , HANDLE_ALIGNMENT                          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "BaseFontHeight"                   , HANDLE_BASE_FONT_HEIGHT                   ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "BasicLibraries"                   , HANDLE_BASIC_LIBRARIES                    ,  ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
-        { "BottomMargin"                     , HANDLE_BOTTOM_MARGIN                      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BOTTOMSPACE       },
-        { "CustomFontNameFixed"              , HANDLE_CUSTOM_FONT_NAME_FIXED             ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FIXED             },
-        { "CustomFontNameSans"               , HANDLE_CUSTOM_FONT_NAME_SANS              ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SANS              },
-        { "CustomFontNameSerif"              , HANDLE_CUSTOM_FONT_NAME_SERIF             ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SERIF             },
-        { "DialogLibraries"                  , HANDLE_DIALOG_LIBRARIES                   ,  ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
-        { "FontFixedIsBold"                  , HANDLE_CUSTOM_FONT_FIXED_WEIGHT           ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
-        { "FontFixedIsItalic"                , HANDLE_CUSTOM_FONT_FIXED_POSTURE          ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
-        { "FontFunctionsIsBold"              , HANDLE_FONT_FUNCTIONS_WEIGHT              ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
-        { "FontFunctionsIsItalic"            , HANDLE_FONT_FUNCTIONS_POSTURE             ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
-        { "FontNameFunctions"                , HANDLE_FONT_NAME_FUNCTIONS                ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FUNCTION          },
-        { "FontNameNumbers"                  , HANDLE_FONT_NAME_NUMBERS                  ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_NUMBER            },
-        { "FontNameText"                     , HANDLE_FONT_NAME_TEXT                     ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_TEXT              },
-        { "FontNameVariables"                , HANDLE_FONT_NAME_VARIABLES                ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_VARIABLE          },
-        { "FontNumbersIsBold"                , HANDLE_FONT_NUMBERS_WEIGHT                ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
-        { "FontNumbersIsItalic"              , HANDLE_FONT_NUMBERS_POSTURE               ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
-        { "FontSansIsBold"                   , HANDLE_CUSTOM_FONT_SANS_WEIGHT            ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
-        { "FontSansIsItalic"                 , HANDLE_CUSTOM_FONT_SANS_POSTURE           ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
-        { "FontSerifIsBold"                  , HANDLE_CUSTOM_FONT_SERIF_WEIGHT           ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
-        { "FontSerifIsItalic"                , HANDLE_CUSTOM_FONT_SERIF_POSTURE          ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
-        { "FontTextIsBold"                   , HANDLE_FONT_TEXT_WEIGHT                   ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
-        { "FontTextIsItalic"                 , HANDLE_FONT_TEXT_POSTURE                  ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
-        { "FontVariablesIsBold"              , HANDLE_FONT_VARIABLES_WEIGHT              ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
-        { "FontVariablesIsItalic"            , HANDLE_FONT_VARIABLES_POSTURE             ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
-        { "Formula"                          , HANDLE_FORMULA                            ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
-        { "IsScaleAllBrackets"               , HANDLE_IS_SCALE_ALL_BRACKETS              ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
-        { "IsTextMode"                       , HANDLE_IS_TEXT_MODE                       ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
-        { "GreekCharStyle"                   , HANDLE_GREEK_CHAR_STYLE                   ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "LeftMargin"                       , HANDLE_LEFT_MARGIN                        ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LEFTSPACE         },
-        { "PrinterName"                      , HANDLE_PRINTER_NAME                       ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
-        { "PrinterSetup"                     , HANDLE_PRINTER_SETUP                      ,  ::getCppuType((const Sequence < sal_Int8 >*)0),                         PROPERTY_NONE,  0                     },
-        { "RelativeBracketDistance"          , HANDLE_RELATIVE_BRACKET_DISTANCE          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSPACE      },
-        { "RelativeBracketExcessSize"        , HANDLE_RELATIVE_BRACKET_EXCESS_SIZE       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSIZE       },
-        { "RelativeFontHeightFunctions"      , HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_FUNCTION          },
-        { "RelativeFontHeightIndices"        , HANDLE_RELATIVE_FONT_HEIGHT_INDICES       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_INDEX             },
-        { "RelativeFontHeightLimits"         , HANDLE_RELATIVE_FONT_HEIGHT_LIMITS        ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_LIMITS            },
-        { "RelativeFontHeightOperators"      , HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_OPERATOR          },
-        { "RelativeFontHeightText"           , HANDLE_RELATIVE_FONT_HEIGHT_TEXT          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_TEXT              },
-        { "RelativeFractionBarExcessLength"  , HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_FRACTION          },
-        { "RelativeFractionBarLineWeight"    , HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT  ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_STROKEWIDTH       },
-        { "RelativeFractionDenominatorDepth" , HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_DENOMINATOR       },
-        { "RelativeFractionNumeratorHeight"  , HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NUMERATOR         },
-        { "RelativeIndexSubscript"           , HANDLE_RELATIVE_INDEX_SUBSCRIPT           ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUBSCRIPT         },
-        { "RelativeIndexSuperscript"         , HANDLE_RELATIVE_INDEX_SUPERSCRIPT         ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUPERSCRIPT       },
-        { "RelativeLineSpacing"              , HANDLE_RELATIVE_LINE_SPACING              ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_VERTICAL          },
-        { "RelativeLowerLimitDistance"       , HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LOWERLIMIT        },
-        { "RelativeMatrixColumnSpacing"      , HANDLE_RELATIVE_MATRIX_COLUMN_SPACING     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXCOL         },
-        { "RelativeMatrixLineSpacing"        , HANDLE_RELATIVE_MATRIX_LINE_SPACING       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXROW         },
-        { "RelativeOperatorExcessSize"       , HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSIZE      },
-        { "RelativeOperatorSpacing"          , HANDLE_RELATIVE_OPERATOR_SPACING          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSPACE     },
-        { "RelativeRootSpacing"              , HANDLE_RELATIVE_ROOT_SPACING              ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ROOT              },
-        { "RelativeScaleBracketExcessSize"   , HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NORMALBRACKETSIZE },
-        { "RelativeSpacing"                  , HANDLE_RELATIVE_SPACING                   ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_HORIZONTAL        },
-        { "RelativeSymbolMinimumHeight"      , HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSPACE     },
-        { "RelativeSymbolPrimaryHeight"      , HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSIZE      },
-        { "RelativeUpperLimitDistance"       , HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_UPPERLIMIT        },
-        { "RightMargin"                      , HANDLE_RIGHT_MARGIN                       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_RIGHTSPACE        },
-        { "RuntimeUID"                       , HANDLE_RUNTIME_UID                        ,  ::getCppuType(static_cast< const OUString * >(0)),                      PropertyAttribute::READONLY,  0       },
-        { "Symbols"                          , HANDLE_SYMBOLS                            ,  ::getCppuType((const Sequence < SymbolDescriptor > *)0),                PROPERTY_NONE,  0                     },
-        { "UserDefinedSymbolsInUse"          , HANDLE_USED_SYMBOLS                       ,  ::getCppuType((const Sequence < SymbolDescriptor > *)0),                PropertyAttribute::READONLY,  0       },
-        { "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
-        { "LoadReadonly"                     , HANDLE_LOAD_READONLY                      ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "LoadReadonly"                     ), HANDLE_LOAD_READONLY                      ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
         // #i972#
-        { "BaseLine"                         , HANDLE_BASELINE                           ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "InteropGrabBag"                   , HANDLE_INTEROP_GRAB_BAG                   ,  ::getCppuType((uno::Sequence< beans::PropertyValue >*)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                   ,  &::getCppuType((uno::Sequence< beans::PropertyValue >*)0),       PROPERTY_NONE,  0                     },
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     PropertySetInfo *pInfo = new PropertySetInfo ( aModelPropertyInfoMap );
     return pInfo;
@@ -759,7 +759,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             {
                 const SmFace &  rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
                 bool bVal = IsItalic( rFace );
-                (*pValue).setValue(&bVal, (*ppEntries)->maType);
+                (*pValue).setValue(&bVal, *(*ppEntries)->mpType);
             }
             break;
             case HANDLE_CUSTOM_FONT_FIXED_WEIGHT :
@@ -772,7 +772,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             {
                 const SmFace &  rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
                 bool bVal = IsBold( rFace ); // bold?
-                (*pValue).setValue(&bVal, (*ppEntries)->maType);
+                (*pValue).setValue(&bVal, *(*ppEntries)->mpType);
             }
             break;
             case HANDLE_BASE_FONT_HEIGHT                   :
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 8e88b781b22e..00ca36e2218c 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -62,9 +62,10 @@ SfxItemPropertyMap_Impl::SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl*
 SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ) :
     m_pImpl( new SfxItemPropertyMap_Impl )
 {
-    while( !pEntries->aName.isEmpty() )
+    while( pEntries->pName )
     {
-        (*m_pImpl) [ pEntries->aName ] = pEntries;
+        OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US );
+        (*m_pImpl) [ sEntry ] = pEntries;
         ++pEntries;
     }
 }
@@ -101,7 +102,8 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const
             const SfxItemPropertySimpleEntry* pEntry = &(*aIt).second;
             pPropArray[n].Name = (*aIt).first;
             pPropArray[n].Handle = pEntry->nWID;
-            pPropArray[n].Type = pEntry->aType;
+            if(pEntry->pType)
+                pPropArray[n].Type = *pEntry->pType;
             pPropArray[n].Attributes =
                 sal::static_int_cast< sal_Int16 >(pEntry->nFlags);
             n++;
@@ -122,7 +124,8 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const OUString rName ) co
     beans::Property aProp;
     aProp.Name = rName;
     aProp.Handle = pEntry->nWID;
-    aProp.Type = pEntry->aType;
+    if(pEntry->pType)
+        aProp.Type = *pEntry->pType;
     aProp.Attributes = sal::static_int_cast< sal_Int16 >(pEntry->nFlags);
     return aProp;
 }
@@ -141,7 +144,7 @@ void SfxItemPropertyMap::mergeProperties( const uno::Sequence< beans::Property >
     {
         SfxItemPropertySimpleEntry aTemp(
             sal::static_int_cast< sal_Int16 >( pPropArray[nElement].Handle ), //nWID
-            pPropArray[nElement].Type, //aType
+            &pPropArray[nElement].Type, //pType
             pPropArray[nElement].Attributes, //nFlags
             0 ); //nMemberId
         (*m_pImpl)[pPropArray[nElement].Name] = aTemp;
@@ -206,11 +209,11 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
 
 
     // convert general SfxEnumItem values to specific values
-    if( rEntry.aType.getTypeClass() == TypeClass_ENUM &&
+    if( rEntry.pType && TypeClass_ENUM == rEntry.pType->getTypeClass() &&
          rAny.getValueTypeClass() == TypeClass_LONG )
     {
         sal_Int32 nTmp = *(sal_Int32*)rAny.getValue();
-        rAny.setValue( &nTmp, rEntry.aType );
+        rAny.setValue( &nTmp, *rEntry.pType );
     }
 }
 
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 5ab09bbe9539..daa5bfbe3c45 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -64,20 +64,20 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap()
 {
     static const SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] =
     {
-        {PROPERTYNAME_FMTSTR,   0, getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_LOCALE,   0, getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_TYPE,     0, getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_COMMENT,  0, getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_CURREXT,  0, getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_CURRSYM,  0, getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_DECIMALS, 0, getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_LEADING,  0, getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_NEGRED,   0, getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_STDFORM,  0, getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_THOUS,    0, getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_USERDEF,  0, getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_CURRABB,  0, getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {}
+        {MAP_CHAR_LEN(PROPERTYNAME_FMTSTR),   0, &getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_LOCALE),   0, &getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_TYPE),     0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_COMMENT),  0, &getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_CURREXT),  0, &getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_CURRSYM),  0, &getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_DECIMALS), 0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_LEADING),  0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_NEGRED),   0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_STDFORM),  0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_THOUS),    0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_USERDEF),  0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_CURRABB),  0, &getCppuType((OUString*)0),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {0,0,0,0,0,0}
     };
     return aNumberFormatPropertyMap_Impl;
 }
@@ -86,11 +86,11 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] =
     {
-        {PROPERTYNAME_NOZERO,   0, getBooleanCppuType(),         beans::PropertyAttribute::BOUND, 0},
-        {PROPERTYNAME_NULLDATE, 0, getCppuType((util::Date*)0),  beans::PropertyAttribute::BOUND, 0},
-        {PROPERTYNAME_STDDEC,   0, getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND, 0},
-        {PROPERTYNAME_TWODIGIT, 0, getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND, 0},
-        {}
+        {MAP_CHAR_LEN(PROPERTYNAME_NOZERO),   0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_NULLDATE), 0, &getCppuType((util::Date*)0),  beans::PropertyAttribute::BOUND, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_STDDEC),   0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_TWODIGIT), 0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND, 0},
+        {0,0,0,0,0,0}
     };
     return aNumberSettingsPropertyMap_Impl;
 }
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 76428658dd5e..47588d84b36e 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -296,17 +296,18 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
     SolarMutexGuard aGuard;
     ::comphelper::PropertySetInfo*  pRet = new ::comphelper::PropertySetInfo();
 
-    static ::comphelper::PropertyMapEntry const aEntries[] =
+    static ::comphelper::PropertyMapEntry aEntries[] =
     {
-        { "GraphicType", UNOGRAPHIC_GRAPHICTYPE, ::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { "MimeType", UNOGRAPHIC_MIMETYPE, ::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { "SizePixel", UNOGRAPHIC_SIZEPIXEL, ::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { "Size100thMM", UNOGRAPHIC_SIZE100THMM, ::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { "BitsPerPixel", UNOGRAPHIC_BITSPERPIXEL, ::getCppuType( (const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { "Transparent", UNOGRAPHIC_TRANSPARENT, ::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { "Alpha", UNOGRAPHIC_ALPHA, ::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { "Animated", UNOGRAPHIC_ANIMATED, ::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        {}
+        { MAP_CHAR_LEN( "GraphicType" ), UNOGRAPHIC_GRAPHICTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "SizePixel" ), UNOGRAPHIC_SIZEPIXEL, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM,    &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "BitsPerPixel" ), UNOGRAPHIC_BITSPERPIXEL, &::getCppuType( (const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "Transparent" ), UNOGRAPHIC_TRANSPARENT, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "Alpha" ), UNOGRAPHIC_ALPHA, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "Animated" ), UNOGRAPHIC_ANIMATED, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
+
+        { 0,0,0,0,0,0 }
     };
 
     pRet->acquire();
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 38b1849cf398..ef397f413053 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -191,12 +191,13 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
     SolarMutexGuard aGuard;
     ::comphelper::PropertySetInfo*  pRet = new ::comphelper::PropertySetInfo();
 
-    static ::comphelper::PropertyMapEntry const aEntries[] =
+    static ::comphelper::PropertyMapEntry aEntries[] =
     {
-        { "Device", UNOGRAPHIC_DEVICE, ::getCppuType( (const uno::Any*)(0)), 0, 0 },
-        { "DestinationRect", UNOGRAPHIC_DESTINATIONRECT, ::getCppuType( (const awt::Rectangle*)(0)), 0, 0 },
-        { "RenderData", UNOGRAPHIC_RENDERDATA, ::getCppuType( (const uno::Any*)(0)), 0, 0 },
-        {}
+        { MAP_CHAR_LEN( "Device" ), UNOGRAPHIC_DEVICE, &::getCppuType( (const uno::Any*)(0)), 0, 0 },
+        { MAP_CHAR_LEN( "DestinationRect" ), UNOGRAPHIC_DESTINATIONRECT, &::getCppuType( (const awt::Rectangle*)(0)), 0, 0 },
+        { MAP_CHAR_LEN( "RenderData" ), UNOGRAPHIC_RENDERDATA,  &::getCppuType( (const uno::Any*)(0)), 0, 0 },
+
+        { 0,0,0,0,0,0 }
     };
 
     pRet->acquire();
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index c6f4194672c6..ad57fccc693c 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -42,6 +42,9 @@
 #include <svtools/imaprect.hxx>
 #include <svtools/imappoly.hxx>
 
+#define MAP_LEN(x) x, sizeof(x)-1
+
+
 using namespace comphelper;
 using namespace cppu;
 using namespace com::sun::star;
@@ -123,39 +126,39 @@ private:
 
 UNO3_GETIMPLEMENTATION_IMPL( SvUnoImageMapObject );
 
-PropertySetInfo * SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType )
+PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType )
 {
     switch( nType )
     {
     case IMAP_OBJ_POLYGON:
         {
-            static PropertyMapEntry const aPolygonObj_Impl[] =
+            static PropertyMapEntry aPolygonObj_Impl[] =
             {
-                { "URL",         HANDLE_URL,         ::getCppuType((const OUString*)0),     0, 0 },
-                { "Title",       HANDLE_TITLE,       ::getCppuType((const OUString*)0),     0, 0 },
-                { "Description", HANDLE_DESCRIPTION, ::getCppuType((const OUString*)0),     0, 0 },
-                { "Target",      HANDLE_TARGET,      ::getCppuType((const OUString*)0),     0, 0 },
-                { "Name",        HANDLE_NAME,        ::getCppuType((const OUString*)0),     0, 0 },
-                { "IsActive",    HANDLE_ISACTIVE,    ::getBooleanCppuType(),                0, 0 },
-                { "Polygon",     HANDLE_POLYGON,     ::getCppuType((const PointSequence*)0),    0, 0 },
-                {}
+                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "IsActive" ),    HANDLE_ISACTIVE,    &::getBooleanCppuType(),                0, 0 },
+                { MAP_LEN( "Polygon" ),     HANDLE_POLYGON,     &::getCppuType((const PointSequence*)0),    0, 0 },
+                {0,0,0,0,0,0}
             };
 
             return new PropertySetInfo( aPolygonObj_Impl );
         }
     case IMAP_OBJ_CIRCLE:
         {
-            static PropertyMapEntry const aCircleObj_Impl[] =
+            static PropertyMapEntry aCircleObj_Impl[] =
             {
-                { "URL",         HANDLE_URL,         ::getCppuType((const OUString*)0),     0, 0 },
-                { "Title",       HANDLE_TITLE,       ::getCppuType((const OUString*)0),     0, 0 },
-                { "Description", HANDLE_DESCRIPTION, ::getCppuType((const OUString*)0),     0, 0 },
-                { "Target",      HANDLE_TARGET,      ::getCppuType((const OUString*)0),     0, 0 },
-                { "Name",        HANDLE_NAME,        ::getCppuType((const OUString*)0),     0, 0 },
-                { "IsActive",    HANDLE_ISACTIVE,    ::getBooleanCppuType(),                0, 0 },
-                { "Center",      HANDLE_CENTER,      ::getCppuType((const awt::Point*)0),   0, 0 },
-                { "Radius",      HANDLE_RADIUS,      ::getCppuType((const sal_Int32*)0),    0, 0 },
-                {}
+                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Name" ),            HANDLE_NAME,        &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "IsActive" ),        HANDLE_ISACTIVE,    &::getBooleanCppuType(),                0, 0 },
+                { MAP_LEN( "Center" ),      HANDLE_CENTER,      &::getCppuType((const awt::Point*)0),   0, 0 },
+                { MAP_LEN( "Radius" ),      HANDLE_RADIUS,      &::getCppuType((const sal_Int32*)0),    0, 0 },
+                {0,0,0,0,0,0}
             };
 
             return new PropertySetInfo( aCircleObj_Impl );
@@ -163,16 +166,16 @@ PropertySetInfo * SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType )
     case IMAP_OBJ_RECTANGLE:
     default:
         {
-            static PropertyMapEntry const aRectangleObj_Impl[] =
+            static PropertyMapEntry aRectangleObj_Impl[] =
             {
-                { "URL",         HANDLE_URL,         ::getCppuType((const OUString*)0), 0, 0 },
-                { "Title",       HANDLE_TITLE,       ::getCppuType((const OUString*)0),     0, 0 },
-                { "Description", HANDLE_DESCRIPTION, ::getCppuType((const OUString*)0), 0, 0 },
-                { "Target",      HANDLE_TARGET,      ::getCppuType((const OUString*)0), 0, 0 },
-                { "Name",        HANDLE_NAME,        ::getCppuType((const OUString*)0), 0, 0 },
-                { "IsActive",    HANDLE_ISACTIVE,    ::getBooleanCppuType(),            0, 0 },
-                { "Boundary",    HANDLE_BOUNDARY,    ::getCppuType((const awt::Rectangle*)0),   0, 0 },
-                {}
+                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const OUString*)0), 0, 0 },
+                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 },
+                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const OUString*)0), 0, 0 },
+                { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const OUString*)0), 0, 0 },
+                { MAP_LEN( "IsActive" ),    HANDLE_ISACTIVE,    &::getBooleanCppuType(),            0, 0 },
+                { MAP_LEN( "Boundary" ),    HANDLE_BOUNDARY,    &::getCppuType((const awt::Rectangle*)0),   0, 0 },
+                {0,0,0,0,0,0}
             };
 
             return new PropertySetInfo( aRectangleObj_Impl );
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 89a1b97ae90f..02dde6b27ab4 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -37,6 +37,8 @@ namespace svx
     using namespace ::com::sun::star::ucb;
     using namespace ::comphelper;
 
+#define CONST_CHAR( propname ) propname, sizeof(propname) - 1
+
     //====================================================================
     //= ODADescriptorImpl
     //====================================================================
@@ -52,7 +54,7 @@ namespace svx
         Sequence< PropertyValue >   m_aAsSequence;
         Reference< XPropertySet >   m_xAsSet;
 
-        typedef ::std::map< OUString, PropertyMapEntry const * >    MapString2PropertyEntry;
+        typedef ::std::map< OUString, PropertyMapEntry* >    MapString2PropertyEntry;
 
     public:
         ODADescriptorImpl();
@@ -77,7 +79,7 @@ namespace svx
     protected:
         static PropertyValue                    buildPropertyValue( const DescriptorValues::const_iterator& _rPos );
         static const MapString2PropertyEntry&   getPropertyMap( );
-        static PropertyMapEntry const *         getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos );
+        static PropertyMapEntry*                getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos );
     };
 
     //--------------------------------------------------------------------
@@ -185,29 +187,29 @@ namespace svx
         static MapString2PropertyEntry s_aProperties;
         if ( s_aProperties.empty() )
         {
-            static PropertyMapEntry const s_aDesriptorProperties[] =
+            static PropertyMapEntry s_aDesriptorProperties[] =
             {
-                { "ActiveConnection",   daConnection,           ::getCppuType( static_cast< Reference< XConnection >* >(NULL) ),   PropertyAttribute::TRANSIENT, 0 },
-                { "BookmarkSelection",  daBookmarkSelection,    ::getBooleanCppuType( ),                                           PropertyAttribute::TRANSIENT, 0 },
-                { "Column",             daColumnObject,         ::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ),  PropertyAttribute::TRANSIENT, 0 },
-                { "ColumnName",         daColumnName,           ::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
-                { "Command",            daCommand,              ::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
-                { "CommandType",        daCommandType,          ::getCppuType( static_cast< sal_Int32* >(NULL) ),                  PropertyAttribute::TRANSIENT, 0 },
-                { "Component",          daComponent,            ::getCppuType( static_cast< Reference< XContent >* >(NULL) ),      PropertyAttribute::TRANSIENT, 0 },
-                { "ConnectionResource", daConnectionResource,   ::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
-                { "Cursor",             daCursor,               ::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ),     PropertyAttribute::TRANSIENT, 0 },
-                { "DataSourceName",     daDataSource,           ::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
-                { "DatabaseLocation",   daDatabaseLocation,     ::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
-                { "EscapeProcessing",   daEscapeProcessing,     ::getBooleanCppuType( ),                                           PropertyAttribute::TRANSIENT, 0 },
-                { "Filter",             daFilter,               ::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
-                { "Selection",          daSelection,            ::getCppuType( static_cast< Sequence< Any >* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
-                {}
+                { CONST_CHAR("ActiveConnection"),   daConnection,           &::getCppuType( static_cast< Reference< XConnection >* >(NULL) ),   PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("BookmarkSelection"),  daBookmarkSelection,    &::getBooleanCppuType( ),                                           PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("Column"),             daColumnObject,         &::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ),  PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("ColumnName"),         daColumnName,           &::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("Command"),            daCommand,              &::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("CommandType"),        daCommandType,          &::getCppuType( static_cast< sal_Int32* >(NULL) ),                  PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("Component"),          daComponent,            &::getCppuType( static_cast< Reference< XContent >* >(NULL) ),      PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("ConnectionResource"), daConnectionResource,   &::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("Cursor"),             daCursor,               &::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ),     PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("DataSourceName"),     daDataSource,           &::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("DatabaseLocation"),   daDatabaseLocation,     &::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("EscapeProcessing"),   daEscapeProcessing,     &::getBooleanCppuType( ),                                           PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("Filter"),             daFilter,               &::getCppuType( static_cast< OUString* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
+                { CONST_CHAR("Selection"),          daSelection,            &::getCppuType( static_cast< Sequence< Any >* >(NULL) ),            PropertyAttribute::TRANSIENT, 0 },
+                { NULL, 0, 0, NULL, 0, 0 }
             };
 
-            PropertyMapEntry const * pEntry = s_aDesriptorProperties;
-            while ( !pEntry->maName.isEmpty() )
+            PropertyMapEntry* pEntry = s_aDesriptorProperties;
+            while ( pEntry->mpName )
             {
-                s_aProperties[ pEntry->maName ] = pEntry;
+                s_aProperties[ OUString::createFromAscii( pEntry->mpName ) ] = pEntry;
                 ++pEntry;
             }
         }
@@ -216,7 +218,7 @@ namespace svx
     }
 
     //--------------------------------------------------------------------
-    PropertyMapEntry const * ODADescriptorImpl::getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos )
+    PropertyMapEntry* ODADescriptorImpl::getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos )
     {
         const MapString2PropertyEntry& rProperties = getPropertyMap();
 
@@ -237,11 +239,11 @@ namespace svx
     PropertyValue ODADescriptorImpl::buildPropertyValue( const DescriptorValues::const_iterator& _rPos )
     {
         // the map entry
-        PropertyMapEntry const * pProperty = getPropertyMapEntry( _rPos );
+        PropertyMapEntry* pProperty = getPropertyMapEntry( _rPos );
 
         // build the property value
         PropertyValue aReturn;
-        aReturn.Name    = pProperty->maName;
+        aReturn.Name    = OUString( pProperty->mpName, pProperty->mnNameLen, RTL_TEXTENCODING_ASCII_US );
         aReturn.Handle  = pProperty->mnHandle;
         aReturn.Value   = _rPos->second;
         aReturn.State   = PropertyState_DIRECT_VALUE;
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 3461bd448342..d4f199bf07e6 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -71,27 +71,27 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
     static const SfxItemPropertyMapEntry aSvxCellPropertyMap[] =
     {
         FILL_PROPERTIES
-//      { "HasLevels",                    OWN_ATTR_HASLEVELS,             ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,      0},
-        { "Style",                        OWN_ATTR_STYLE,                 ::com::sun::star::style::XStyle::static_type(),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { UNO_NAME_TEXT_WRITINGMODE,      SDRATTR_TEXTDIRECTION,          ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ),                         0,      0},
-        { UNO_NAME_TEXT_HORZADJUST,       SDRATTR_TEXT_HORZADJUST,        ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0),  0,      0}, \
-        { UNO_NAME_TEXT_LEFTDIST,         SDRATTR_TEXT_LEFTDIST,          ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-        { UNO_NAME_TEXT_LOWERDIST,        SDRATTR_TEXT_LOWERDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-        { UNO_NAME_TEXT_RIGHTDIST,        SDRATTR_TEXT_RIGHTDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-        { UNO_NAME_TEXT_UPPERDIST,        SDRATTR_TEXT_UPPERDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-        { UNO_NAME_TEXT_VERTADJUST,       SDRATTR_TEXT_VERTADJUST,        ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0),    0,      0},\
-        { UNO_NAME_TEXT_WORDWRAP,         SDRATTR_TEXT_WORDWRAP,          ::getBooleanCppuType(),        0,      0}, \
-
-        { "TableBorder",                  OWN_ATTR_TABLEBORDER,           ::getCppuType((const TableBorder*)0), 0, 0 }, \
-        { "TopBorder",                    SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \
-        { "BottomBorder",                 SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \
-        { "LeftBorder",                   SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \
-        { "RightBorder",                  SDRATTR_TABLE_BORDER,           ::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \
+//      { MAP_CHAR_LEN("HasLevels"),                    OWN_ATTR_HASLEVELS,             &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,      0},
+        { MAP_CHAR_LEN("Style"),                        OWN_ATTR_STYLE,                 &::com::sun::star::style::XStyle::static_type(),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_WRITINGMODE),      SDRATTR_TEXTDIRECTION,          &::getCppuType( (::com::sun::star::text::WritingMode*) 0 ),                         0,      0},
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_HORZADJUST),       SDRATTR_TEXT_HORZADJUST,        &::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0),  0,      0}, \
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_LEFTDIST),         SDRATTR_TEXT_LEFTDIST,          &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_LOWERDIST),        SDRATTR_TEXT_LOWERDIST,         &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_RIGHTDIST),        SDRATTR_TEXT_RIGHTDIST,         &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_UPPERDIST),        SDRATTR_TEXT_UPPERDIST,         &::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_VERTADJUST),       SDRATTR_TEXT_VERTADJUST,        &::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0),    0,      0},\
+        { MAP_CHAR_LEN(UNO_NAME_TEXT_WORDWRAP),         SDRATTR_TEXT_WORDWRAP,          &::getBooleanCppuType(),        0,      0}, \
+
+        { MAP_CHAR_LEN("TableBorder"),                  OWN_ATTR_TABLEBORDER,           &::getCppuType((const TableBorder*)0), 0, 0 }, \
+        { MAP_CHAR_LEN("TopBorder"),                    SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \
+        { MAP_CHAR_LEN("BottomBorder"),                 SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \
+        { MAP_CHAR_LEN("LeftBorder"),                   SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \
+        { MAP_CHAR_LEN("RightBorder"),                  SDRATTR_TABLE_BORDER,           &::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \
 
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_CHAR_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {}
+        {0,0,0,0,0,0}
     };
 
     static SvxItemPropertySet aSvxCellPropertySet( aSvxCellPropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
@@ -1006,10 +1006,10 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa
 {
     Any aAny( SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ) );
 
-    if( pMap->aType != aAny.getValueType() )
+    if( *pMap->pType != aAny.getValueType() )
     {
         // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
-        if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
+        if( ( *pMap->pType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
         {
             sal_Int32 nValue = 0;
             aAny >>= nValue;
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 438bd49f14a4..ace5ca0042e0 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -139,12 +139,12 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
         SvxUnoConvertToMM( eMapUnit, rValue );
     }
     // convert int32 to correct enum type if needed
-    else if ( pEntry->maType.getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::getCppuType((const sal_Int32*)0) )
+    else if ( pEntry->mpType->getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::getCppuType((const sal_Int32*)0) )
     {
         sal_Int32 nEnum;
         rValue >>= nEnum;
 
-        rValue.setValue( &nEnum, pEntry->maType );
+        rValue.setValue( &nEnum, *pEntry->mpType );
     }
 }
 
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index e5e689ea6d7e..15e41a94f53e 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -48,9 +48,9 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans::PropertyAttribute;
 using ::com::sun::star::drawing::TextVerticalAdjust;
 
-SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxShapePropertyMap()
 {
-    static SfxItemPropertyMapEntry const aShapePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aShapePropertyMap_Impl[] =
     {
         EDGERADIUS_PROPERTIES
         FILL_PROPERTIES
@@ -64,17 +64,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap()
         // #FontWork#
         FONTWORK_PROPERTIES
         CUSTOMSHAPE_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aShapePropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxTextShapePropertyMap()
 {
-    static SfxItemPropertyMapEntry const aTextShapePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aTextShapePropertyMap_Impl[] =
     {
         EDGERADIUS_PROPERTIES
         FILL_PROPERTIES
@@ -88,17 +89,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap()
         // #FontWork#
         FONTWORK_PROPERTIES
         CUSTOMSHAPE_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aTextShapePropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxConnectorPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aConnectorPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aConnectorPropertyMap_Impl[] =
     {
         SPECIAL_CONNECTOR_PROPERTIES
         EDGERADIUS_PROPERTIES
@@ -112,17 +114,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aConnectorPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxDimensioningPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aDimensioningPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aDimensioningPropertyMap_Impl[] =
     {
         SPECIAL_DIMENSIONING_PROPERTIES
         EDGERADIUS_PROPERTIES
@@ -136,17 +139,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aDimensioningPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxCirclePropertyMap()
 {
-    static SfxItemPropertyMapEntry const aCirclePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aCirclePropertyMap_Impl[] =
     {
         SPECIAL_CIRCLE_PROPERTIES
         EDGERADIUS_PROPERTIES
@@ -161,19 +165,20 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap()
         // #FontWork#
         FONTWORK_PROPERTIES
         CUSTOMSHAPE_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aCirclePropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxPolyPolygonPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aPolyPolygonPropertyMap_Impl[] =
     {
-        { "Geometry", OWN_ATTR_BASE_GEOMETRY, ::getCppuType((const ::com::sun::star::drawing::PointSequenceSequence*)0), 0, 0 },
+        { MAP_CHAR_LEN("Geometry"), OWN_ATTR_BASE_GEOMETRY, &::getCppuType((const ::com::sun::star::drawing::PointSequenceSequence*)0), 0, 0 },
         SPECIAL_POLYGON_PROPERTIES
         SPECIAL_POLYPOLYGON_PROPERTIES
         FILL_PROPERTIES
@@ -187,19 +192,20 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
         // #FontWork#
         FONTWORK_PROPERTIES
         CUSTOMSHAPE_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aPolyPolygonPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxPolyPolygonBezierPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aPolyPolygonBezierPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aPolyPolygonBezierPropertyMap_Impl[] =
     {
-        { "Geometry", OWN_ATTR_BASE_GEOMETRY, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), 0, 0 },
+        { MAP_CHAR_LEN("Geometry"), OWN_ATTR_BASE_GEOMETRY, &::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), 0, 0 },
         SPECIAL_POLYGON_PROPERTIES
         SPECIAL_POLYPOLYGONBEZIER_PROPERTIES
         FILL_PROPERTIES
@@ -213,17 +219,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap()
         // #FontWork#
         FONTWORK_PROPERTIES
         CUSTOMSHAPE_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aPolyPolygonBezierPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxGraphicObjectPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aGraphicObjectPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aGraphicObjectPropertyMap_Impl[] =
     {
         SPECIAL_GRAPHOBJ_PROPERTIES
 
@@ -242,19 +249,20 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "IsMirrored", OWN_ATTR_MIRRORED, ::getCppuBooleanType(), 0, 0},
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "GraphicStream", OWN_ATTR_GRAPHIC_STREAM, ::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        {}
+        { MAP_CHAR_LEN("IsMirrored"),               OWN_ATTR_MIRRORED           , &::getCppuBooleanType(), 0, 0},
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, &::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        {0,0,0,0,0,0}
+
     };
 
     return aGraphicObjectPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvx3DSceneObjectPropertyMap()
 {
-    static SfxItemPropertyMapEntry const a3DSceneObjectPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry a3DSceneObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DSCENEOBJECT_PROPERTIES
         FILL_PROPERTIES
@@ -264,15 +272,16 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        {}
+        {0,0,0,0,0,0}
+
     };
 
     return a3DSceneObjectPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvx3DCubeObjectPropertyMap()
 {
-    static SfxItemPropertyMapEntry const a3DCubeObjectPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry a3DCubeObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DCUBEOBJECT_PROPERTIES
         MISC_3D_OBJ_PROPERTIES
@@ -283,17 +292,18 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return a3DCubeObjectPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvx3DSphereObjectPropertyMap()
 {
-    static SfxItemPropertyMapEntry const a3DSphereObjectPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry a3DSphereObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DSPHEREOBJECT_PROPERTIES
         MISC_3D_OBJ_PROPERTIES
@@ -304,16 +314,17 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
     return a3DSphereObjectPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvx3DLatheObjectPropertyMap()
 {
-    static SfxItemPropertyMapEntry const a3DLatheObjectPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry a3DLatheObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DLATHEOBJECT_PROPERTIES
 
@@ -329,17 +340,18 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return a3DLatheObjectPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvx3DExtrudeObjectPropertyMap()
 {
-    static SfxItemPropertyMapEntry const a3DExtrudeObjectPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry a3DExtrudeObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DEXTRUDEOBJECT_PROPERTIES
 
@@ -355,17 +367,18 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return a3DExtrudeObjectPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvx3DPolygonObjectPropertyMap()
 {
-    static SfxItemPropertyMapEntry const a3DPolygonObjectPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry a3DPolygonObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DPOLYGONOBJECT_PROPERTIES
         MISC_3D_OBJ_PROPERTIES
@@ -376,17 +389,18 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return a3DPolygonObjectPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxAllPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aAllPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aAllPropertyMap_Impl[] =
     {
         SHADOW_PROPERTIES
         LINE_PROPERTIES
@@ -419,30 +433,32 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap()
         SPECIAL_3DBACKSCALE_PROPERTIES
         SPECIAL_3DPOLYGONOBJECT_PROPERTIES
         CUSTOMSHAPE_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aAllPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxGroupPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aGroupPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aGroupPropertyMap_Impl[] =
     {
         SHAPE_DESCRIPTOR_PROPERTIES
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
-        {}
+        {0,0,0,0,0,0}
+
     };
 
     return aGroupPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxOle2PropertyMap()
 {
-    static SfxItemPropertyMapEntry const aOle2PropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aOle2PropertyMap_Impl[] =
     {
         // #i118485# Adding properties for line, fill, text, shadow, fontwork, rotate, shear
         FILL_PROPERTIES
@@ -455,212 +471,217 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
         TEXT_PROPERTIES
         FONTWORK_PROPERTIES
 
-        { "ThumbnailGraphicURL",      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
-        { "Model",                    OWN_ATTR_OLEMODEL           , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "EmbeddedObject",           OWN_ATTR_OLE_EMBEDDED_OBJECT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "EmbeddedObjectNoNewClient",OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "OriginalSize",             OWN_ATTR_OLESIZE            , ::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "CLSID",                    OWN_ATTR_CLSID              , ::getCppuType(( const OUString*)0), 0, 0 },
-        { "IsInternal",               OWN_ATTR_INTERNAL_OLE       , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY,     0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
-        { "Aspect",                   OWN_ATTR_OLE_ASPECT         , ::getCppuType((const sal_Int64*)0), 0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { UNO_NAME_GRAPHOBJ_GRAPHIC,   OWN_ATTR_VALUE_GRAPHIC     , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0),     0,     0},
-        {}
+        { MAP_CHAR_LEN("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("Model"),                    OWN_ATTR_OLEMODEL           , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("EmbeddedObject"),           OWN_ATTR_OLE_EMBEDDED_OBJECT    , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("OriginalSize"),             OWN_ATTR_OLESIZE            , &::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("CLSID"),                    OWN_ATTR_CLSID              , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("IsInternal"),               OWN_ATTR_INTERNAL_OLE       , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY,     0},
+        { MAP_CHAR_LEN("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
+        { MAP_CHAR_LEN("Aspect"),                   OWN_ATTR_OLE_ASPECT         , &::getCppuType((const sal_Int64*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAPHIC),   OWN_ATTR_VALUE_GRAPHIC     , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0),     0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aOle2PropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxPluginPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] =
     {
-        { "PluginMimeType",           OWN_ATTR_PLUGIN_MIMETYPE    , ::getCppuType((const OUString*)0),    0,  0},
-        { "PluginURL",                OWN_ATTR_PLUGIN_URL         , ::getCppuType((const OUString*)0),    0,  0},
-        { "PluginCommands",           OWN_ATTR_PLUGIN_COMMANDS    , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "ThumbnailGraphicURL",      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
+        { MAP_CHAR_LEN("PluginMimeType"),           OWN_ATTR_PLUGIN_MIMETYPE    , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN("PluginURL"),                OWN_ATTR_PLUGIN_URL         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN("PluginCommands"),           OWN_ATTR_PLUGIN_COMMANDS    , &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
+        { MAP_CHAR_LEN("Transformation"),           OWN_ATTR_TRANSFORMATION     , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , &::getCppuType((const sal_Int32*)0),      0,      0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , &::getCppuType((const sal_Int16*)0),      0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , &::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE),     OWN_ATTR_METAFILE           , &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
+        {0,0,0,0,0,0}
+
     };
 
     return aPluginPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxFramePropertyMap()
 {
     //TODO/LATER: new properties for ScrollingMode and DefaultBorder
-    static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aFramePropertyMap_Impl[] =
     {
-        { "FrameURL",                 OWN_ATTR_FRAME_URL          , ::getCppuType((const OUString*)0),    0,  0},
-        { "FrameName",                OWN_ATTR_FRAME_NAME         , ::getCppuType((const OUString*)0),    0,  0},
-        { "FrameIsAutoScroll",        OWN_ATTR_FRAME_ISAUTOSCROLL , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "FrameIsBorder",            OWN_ATTR_FRAME_ISBORDER     , ::getBooleanCppuType() , 0, 0},
-        { "FrameMarginWidth",         OWN_ATTR_FRAME_MARGIN_WIDTH , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { "FrameMarginHeight",        OWN_ATTR_FRAME_MARGIN_HEIGHT, ::getCppuType((const sal_Int32*)0),      0,      0},
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "ThumbnailGraphicURL",      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
+        { MAP_CHAR_LEN("FrameURL"),                 OWN_ATTR_FRAME_URL          , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN("FrameName"),                OWN_ATTR_FRAME_NAME         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN("FrameIsAutoScroll"),        OWN_ATTR_FRAME_ISAUTOSCROLL , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { MAP_CHAR_LEN("FrameIsBorder"),            OWN_ATTR_FRAME_ISBORDER     , &::getBooleanCppuType() , 0, 0},
+        { MAP_CHAR_LEN("FrameMarginWidth"),         OWN_ATTR_FRAME_MARGIN_WIDTH , &::getCppuType((const sal_Int32*)0),      0,      0},
+        { MAP_CHAR_LEN("FrameMarginHeight"),        OWN_ATTR_FRAME_MARGIN_HEIGHT, &::getCppuType((const sal_Int32*)0),      0,      0},
+        { MAP_CHAR_LEN("Transformation"),           OWN_ATTR_TRANSFORMATION     , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , &::getCppuType((const sal_Int32*)0),      0,      0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , &::getCppuType((const sal_Int16*)0),      0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , &::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE),     OWN_ATTR_METAFILE           , &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
+        {0,0,0,0,0,0}
+
     };
 
     return aFramePropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxAppletPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aAppletPropertyMap_Impl[] =
     {
-        { "AppletCodeBase",           OWN_ATTR_APPLET_CODEBASE    , ::getCppuType(( const OUString*)0), 0, 0},
-        { "AppletName",               OWN_ATTR_APPLET_NAME        , ::getCppuType(( const OUString*)0), 0, 0},
-        { "AppletCode",               OWN_ATTR_APPLET_CODE        , ::getCppuType(( const OUString*)0), 0, 0},
-        { "AppletCommands",           OWN_ATTR_APPLET_COMMANDS    , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
-        { "AppletDocBase",            OWN_ATTR_APPLET_DOCBASE     , ::getCppuType(( const OUString*)0), 0, 0},
-        { "AppletIsScript",           OWN_ATTR_APPLET_ISSCRIPT    , ::getBooleanCppuType(), 0, 0 },
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "ThumbnailGraphicURL",      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
+        { MAP_CHAR_LEN("AppletCodeBase"),           OWN_ATTR_APPLET_CODEBASE    , &::getCppuType(( const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN("AppletName"),               OWN_ATTR_APPLET_NAME        , &::getCppuType(( const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN("AppletCode"),               OWN_ATTR_APPLET_CODE        , &::getCppuType(( const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN("AppletCommands"),           OWN_ATTR_APPLET_COMMANDS    , &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
+        { MAP_CHAR_LEN("AppletDocBase"),            OWN_ATTR_APPLET_DOCBASE     , &::getCppuType(( const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN("AppletIsScript"),           OWN_ATTR_APPLET_ISSCRIPT    , &::getBooleanCppuType(), 0, 0 },
+        { MAP_CHAR_LEN("Transformation"),           OWN_ATTR_TRANSFORMATION     , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , &::getCppuType((const sal_Int32*)0),      0,      0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , &::getCppuType((const sal_Int16*)0),      0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , &::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE),     OWN_ATTR_METAFILE           , &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , &::getCppuType(( const OUString*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
+        {0,0,0,0,0,0}
+
     };
 
     return aAppletPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap()
 {
-    static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aControlPropertyMap_Impl[] =
     {
         // the following properties are mapped to the XControl Model of this shape
-        { UNO_NAME_EDIT_CHAR_FONTNAME,        0,  ::getCppuType((const OUString*)0),  0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTSTYLENAME,   0,  ::getCppuType((const OUString*)0),  0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTFAMILY,      0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTCHARSET,     0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_HEIGHT,          0,  ::getCppuType((const float*)0),            0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTPITCH,       0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_POSTURE,         0,  ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, 0 },
-        { UNO_NAME_EDIT_CHAR_WEIGHT,          0,  ::getCppuType((const float*)0),            0, 0 },
-        { UNO_NAME_EDIT_CHAR_UNDERLINE,       0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_STRIKEOUT,       0,  ::getCppuType((const sal_Int16*)0),        0, 0},
-        { UNO_NAME_EDIT_CHAR_COLOR,           0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { "CharRelief",                       0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { "CharUnderlineColor",               0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { "CharKerning",                      0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { "CharWordMode",                     0,  ::getBooleanCppuType(),                    0, 0 },
-        { UNO_NAME_EDIT_PARA_ADJUST,          0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { "TextVerticalAdjust",               0,  ::getCppuType((const TextVerticalAdjust*)0), MAYBEVOID, 0 },
-        { "ControlBackground",                0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { "ControlBorder",                    0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { "ControlBorderColor",               0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { "ControlSymbolColor",               0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { "ImageScaleMode",                   0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { "ControlTextEmphasis",              0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { "ControlWritingMode",               0,  ::cppu::UnoType< sal_Int16 >::get(), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME),        0,  &::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),   0,  &::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY),      0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET),     0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT),          0,  &::getCppuType((const float*)0),            0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH),       0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE),         0,  &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT),          0,  &::getCppuType((const float*)0),            0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_UNDERLINE),       0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_STRIKEOUT),       0,  &::getCppuType((const sal_Int16*)0),        0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_COLOR),           0,  &::getCppuType((const sal_Int32*)0),        0, 0 },
+        { MAP_CHAR_LEN("CharRelief"),                       0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN("CharUnderlineColor"),               0,  &::getCppuType((const sal_Int32*)0),        0, 0 },
+        { MAP_CHAR_LEN("CharKerning"),                      0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN("CharWordMode"),                     0,  &::getBooleanCppuType(),                    0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_ADJUST),          0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN("TextVerticalAdjust"),               0,  &::getCppuType((const TextVerticalAdjust*)0), MAYBEVOID, 0 },
+        { MAP_CHAR_LEN("ControlBackground"),                0,  &::getCppuType((const sal_Int32*)0),        0, 0 },
+        { MAP_CHAR_LEN("ControlBorder"),                    0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN("ControlBorderColor"),               0,  &::getCppuType((const sal_Int32*)0),        0, 0 },
+        { MAP_CHAR_LEN("ControlSymbolColor"),               0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN("ImageScaleMode"),                   0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN("ControlTextEmphasis"),              0,  &::getCppuType((const sal_Int16*)0),        0, 0 },
+        { MAP_CHAR_LEN("ControlWritingMode"),               0,  &::cppu::UnoType< sal_Int16 >::get(), 0, 0},
         // the following properties are handled by SvxShape
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "UserDefinedAttributes",        SDRATTR_XMLATTRIBUTES,      ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("Transformation"),           OWN_ATTR_TRANSFORMATION     , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , &::getCppuType((const sal_Int32*)0),      0,      0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , &::getCppuType((const sal_Int16*)0),      0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , &::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
         // #i112587#
-        { UNO_NAME_MISC_OBJ_PRINTABLE,    SDRATTR_OBJPRINTABLE            , ::getBooleanCppuType(),                      0,  0},
-        { "Visible",                      SDRATTR_OBJVISIBLE              , ::getBooleanCppuType(),                      0,  0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE),    SDRATTR_OBJPRINTABLE            , &::getBooleanCppuType(),                      0,  0}, \
+        { MAP_CHAR_LEN("Visible"),                      SDRATTR_OBJVISIBLE              , &::getBooleanCppuType(),                      0,  0}, \
+        {0,0,0,0,0,0}
     };
 
     return aControlPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxPageShapePropertyMap()
 {
-    static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aPageShapePropertyMap_Impl[] =
     {
-        { "PageNumber",               OWN_ATTR_PAGE_NUMBER        , ::getCppuType((const sal_Int32*)0),      0, 0},
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0), 0, 0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("PageNumber"),               OWN_ATTR_PAGE_NUMBER        , &::getCppuType((const sal_Int32*)0),      0, 0},
+        { MAP_CHAR_LEN("Transformation"),           OWN_ATTR_TRANSFORMATION     , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , &::getCppuType((const sal_Int32*)0),      0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , &::getCppuType((const sal_Int16*)0),      0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , &::getCppuType((const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , &::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
+        {0,0,0,0,0,0}
+
     };
 
     return aPageShapePropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxCaptionPropertyMap()
 {
-    static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aCaptionPropertyMap_Impl[] =
     {
-        { "CaptionPoint",             OWN_ATTR_CAPTION_POINT,     ::getCppuType((const com::sun::star::awt::Point*)0),   0, 0 },
-        { "CaptionType",              SDRATTR_CAPTIONTYPE,        ::getCppuType((const sal_Int16*)0), 0, 0},
-        { "CaptionIsFixedAngle",      SDRATTR_CAPTIONFIXEDANGLE,  ::getBooleanCppuType(), 0, 0},
-        { "CaptionAngle",             SDRATTR_CAPTIONANGLE,       ::getCppuType((const sal_Int32*)0),    0,  0},
-        { "CaptionGap",               SDRATTR_CAPTIONGAP,         ::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
-        { "CaptionEscapeDirection",   SDRATTR_CAPTIONESCDIR,      ::getCppuType((const sal_Int32*)0),    0,  0},
-        { "CaptionIsEscapeRelative",  SDRATTR_CAPTIONESCISREL,    ::getBooleanCppuType(), 0, 0},
-        { "CaptionEscapeRelative",    SDRATTR_CAPTIONESCREL,      ::getCppuType((const sal_Int32*)0),    0,  0},
-        { "CaptionEscapeAbsolute",    SDRATTR_CAPTIONESCABS,      ::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
-        { "CaptionLineLength",        SDRATTR_CAPTIONLINELEN,     ::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
-        { "CaptionIsFitLineLength",   SDRATTR_CAPTIONFITLINELEN,  ::getBooleanCppuType(), 0, 0},
+        { MAP_CHAR_LEN("CaptionPoint"),             OWN_ATTR_CAPTION_POINT,     &::getCppuType((const com::sun::star::awt::Point*)0),   0, 0 },
+        { MAP_CHAR_LEN("CaptionType"),              SDRATTR_CAPTIONTYPE,        &::getCppuType((const sal_Int16*)0), 0, 0},
+        { MAP_CHAR_LEN("CaptionIsFixedAngle"),      SDRATTR_CAPTIONFIXEDANGLE,  &::getBooleanCppuType(), 0, 0},
+        { MAP_CHAR_LEN("CaptionAngle"),             SDRATTR_CAPTIONANGLE,       &::getCppuType((const sal_Int32*)0),    0,  0},
+        { MAP_CHAR_LEN("CaptionGap"),               SDRATTR_CAPTIONGAP,         &::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
+        { MAP_CHAR_LEN("CaptionEscapeDirection"),   SDRATTR_CAPTIONESCDIR,      &::getCppuType((const sal_Int32*)0),    0,  0},
+        { MAP_CHAR_LEN("CaptionIsEscapeRelative"),  SDRATTR_CAPTIONESCISREL,    &::getBooleanCppuType(), 0, 0},
+        { MAP_CHAR_LEN("CaptionEscapeRelative"),    SDRATTR_CAPTIONESCREL,      &::getCppuType((const sal_Int32*)0),    0,  0},
+        { MAP_CHAR_LEN("CaptionEscapeAbsolute"),    SDRATTR_CAPTIONESCABS,      &::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
+        { MAP_CHAR_LEN("CaptionLineLength"),        SDRATTR_CAPTIONLINELEN,     &::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
+        { MAP_CHAR_LEN("CaptionIsFitLineLength"),   SDRATTR_CAPTIONFITLINELEN,  &::getBooleanCppuType(), 0, 0},
         EDGERADIUS_PROPERTIES
         FILL_PROPERTIES
         LINE_PROPERTIES
@@ -672,22 +693,23 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes",        SDRATTR_XMLATTRIBUTES,      ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        { MAP_CHAR_LEN("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
 
     return aCaptionPropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxCustomShapePropertyMap()
 {
-    static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aCustomShapePropertyMap_Impl[] =
     {
-        { "CustomShapeEngine",            SDRATTR_CUSTOMSHAPE_ENGINE,         ::getCppuType((const OUString*)0),  0, 0 },
-        { "CustomShapeData",          SDRATTR_CUSTOMSHAPE_DATA,               ::getCppuType((const OUString*)0),  0, 0 },
-        { "CustomShapeGeometry",      SDRATTR_CUSTOMSHAPE_GEOMETRY,           ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0),  0, 0 },
-        { "CustomShapeGraphicURL",        SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL,    ::getCppuType((const OUString*)0),  0,  0},
+        { MAP_CHAR_LEN("CustomShapeEngine"),            SDRATTR_CUSTOMSHAPE_ENGINE,         &::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN("CustomShapeData"),          SDRATTR_CUSTOMSHAPE_DATA,               &::getCppuType((const OUString*)0),  0, 0 },
+        { MAP_CHAR_LEN("CustomShapeGeometry"),      SDRATTR_CUSTOMSHAPE_GEOMETRY,           &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0),  0, 0 },
+        { MAP_CHAR_LEN("CustomShapeGraphicURL"),        SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL,    &::getCppuType((const OUString*)0),  0,  0},
         CUSTOMSHAPE_PROPERTIES
         FILL_PROPERTIES
         LINE_PROPERTIES
@@ -697,77 +719,80 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
         TEXT_PROPERTIES
-        {"UserDefinedAttributes",     SDRATTR_XMLATTRIBUTES,      ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS,         ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        {}
+        {MAP_CHAR_LEN("UserDefinedAttributes"),     SDRATTR_XMLATTRIBUTES,      &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS,         &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
+        {0,0,0,0,0,0}
+
     };
     return aCustomShapePropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxMediaShapePropertyMap()
 {
-    static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aMediaShapePropertyMap_Impl[] =
     {
-        { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 0, 0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0),  ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "Transformation", OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { "MediaURL", OWN_ATTR_MEDIA_URL, ::getCppuType((const OUString*)0), 0, 0},
-        { "PreferredSize", OWN_ATTR_MEDIA_PREFERREDSIZE, ::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "Loop", OWN_ATTR_MEDIA_LOOP, ::getCppuType((const sal_Bool*)0), 0, 0},
-        { "Mute", OWN_ATTR_MEDIA_MUTE, ::getCppuType((const sal_Bool*)0), 0, 0},
-        { "VolumeDB", OWN_ATTR_MEDIA_VOLUMEDB, ::getCppuType((const sal_Int16*)0), 0, 0},
-        { "Zoom", OWN_ATTR_MEDIA_ZOOM, ::getCppuType((const ::com::sun::star::media::ZoomLevel*)0), 0, 0},
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, &::getCppuType((const sal_Int32*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, &::getCppuType((const sal_Int16*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const OUString*)0),  ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION, &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
+        { MAP_CHAR_LEN("MediaURL"), OWN_ATTR_MEDIA_URL, &::getCppuType((const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, &::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("Loop"), OWN_ATTR_MEDIA_LOOP, &::getCppuType((const sal_Bool*)0), 0, 0},
+        { MAP_CHAR_LEN("Mute"), OWN_ATTR_MEDIA_MUTE, &::getCppuType((const sal_Bool*)0), 0, 0},
+        { MAP_CHAR_LEN("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, &::getCppuType((const sal_Int16*)0), 0, 0},
+        { MAP_CHAR_LEN("Zoom"), OWN_ATTR_MEDIA_ZOOM, &::getCppuType((const ::com::sun::star::media::ZoomLevel*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        {"PrivateStream", OWN_ATTR_MEDIA_STREAM, ::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        {"PrivateTempFileURL", OWN_ATTR_MEDIA_TEMPFILEURL, ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
+        {MAP_CHAR_LEN("PrivateStream"), OWN_ATTR_MEDIA_STREAM, &::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        {0,0,0,0,0,0}
+
     };
 
     return aMediaShapePropertyMap_Impl;
 }
 
-SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
+SfxItemPropertyMapEntry* ImplGetSvxTableShapePropertyMap()
 {
-    static SfxItemPropertyMapEntry const  aTableShapePropertyMap_Impl[] =
+    static SfxItemPropertyMapEntry aTableShapePropertyMap_Impl[] =
     {
-        { UNO_NAME_MISC_OBJ_ZORDER,       OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERID,      SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0,    0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,    SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 0, 0},
-        { UNO_NAME_LINKDISPLAYBITMAP,     OWN_ATTR_LDBITMAP, ::com::sun::star::awt::XBitmap::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,       OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "Transformation",               OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,  SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,  SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT,    OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_MISC_OBJ_NAME,         SDRATTR_OBJECTNAME, ::getCppuType((const ::rtl::OUString*)0),    0,      0},
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        { "Model",                        OWN_ATTR_OLEMODEL               , ::com::sun::star::table::XTable::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { "TableTemplate",                OWN_ATTR_TABLETEMPLATE          , ::com::sun::star::container::XIndexAccess::static_type(), 0, 0},
-        { "UseFirstRowStyle",             OWN_ATTR_TABLETEMPLATE_FIRSTROW, ::getBooleanCppuType(),0, 0},
-        { "UseLastRowStyle",              OWN_ATTR_TABLETEMPLATE_LASTROW, ::getBooleanCppuType(),0, 0},
-        { "UseFirstColumnStyle",          OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, ::getBooleanCppuType(),0, 0},
-        { "UseLastColumnStyle",           OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, ::getBooleanCppuType(),0, 0},
-        { "UseBandingRowStyle",           OWN_ATTR_TABLETEMPLATE_BANDINGROWS, ::getBooleanCppuType(),0, 0},
-        { "UseBandingColumnStyle",        OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, ::getBooleanCppuType(),0, 0},
-        { "ReplacementGraphic",           OWN_ATTR_BITMAP, ::com::sun::star::graphic::XGraphic::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        {}
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),       OWN_ATTR_ZORDER, &::getCppuType((const sal_Int32*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID),      SDRATTR_LAYERID, &::getCppuType((const sal_Int16*)0), 0,    0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),    SDRATTR_LAYERNAME, &::getCppuType((const OUString*)0), 0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP),     OWN_ATTR_LDBITMAP, &::com::sun::star::awt::XBitmap::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME),       OWN_ATTR_LDNAME, &::getCppuType(( const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("Transformation"),               OWN_ATTR_TRANSFORMATION, &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),  SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),  SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT),    OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME),         SDRATTR_OBJECTNAME, &::getCppuType((const ::rtl::OUString*)0),    0,      0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , &::getCppuType((const OUString*)0),    0,  0},
+        { MAP_CHAR_LEN("Model"),                        OWN_ATTR_OLEMODEL               , &::com::sun::star::table::XTable::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("TableTemplate"),                OWN_ATTR_TABLETEMPLATE          , &::com::sun::star::container::XIndexAccess::static_type(), 0, 0},
+        { MAP_CHAR_LEN("UseFirstRowStyle"),             OWN_ATTR_TABLETEMPLATE_FIRSTROW, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN("UseLastRowStyle"),              OWN_ATTR_TABLETEMPLATE_LASTROW, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN("UseFirstColumnStyle"),          OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN("UseLastColumnStyle"),           OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN("UseBandingRowStyle"),           OWN_ATTR_TABLETEMPLATE_BANDINGROWS, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN("UseBandingColumnStyle"),        OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, &::getBooleanCppuType(),0, 0},
+        { MAP_CHAR_LEN("ReplacementGraphic"),           OWN_ATTR_BITMAP, &::com::sun::star::graphic::XGraphic::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+
+        {0,0,0,0,0,0}
     };
 
     return aTableShapePropertyMap_Impl;
 }
 
-comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap()
+comphelper::PropertyMapEntry* ImplGetSvxDrawingDefaultsPropertyMap()
 {
-    static comphelper::PropertyMapEntry const aSvxDrawingDefaultsPropertyMap_Impl[] =
+    static comphelper::PropertyMapEntry aSvxDrawingDefaultsPropertyMap_Impl[] =
     {
         SHADOW_PROPERTIES
         LINE_PROPERTIES_DEFAULTS
@@ -779,18 +804,20 @@ comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap()
         SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS
         MISC_3D_OBJ_PROPERTIES
         SPECIAL_3DBACKSCALE_PROPERTIES
-        {}
+        {0,0,0,0,0,0}
+
     };
 
     return aSvxDrawingDefaultsPropertyMap_Impl;
 }
 
-comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPropertyMap()
+comphelper::PropertyMapEntry* ImplGetAdditionalWriterDrawingDefaultsPropertyMap()
 {
-    static comphelper::PropertyMapEntry const aSvxAdditionalDefaultsPropertyMap_Impl[] =
+    static comphelper::PropertyMapEntry aSvxAdditionalDefaultsPropertyMap_Impl[] =
     {
-        { "IsFollowingTextFlow", SID_SW_FOLLOW_TEXT_FLOW, ::getBooleanCppuType(), 0, 0},
-        {}
+        { MAP_CHAR_LEN("IsFollowingTextFlow"), SID_SW_FOLLOW_TEXT_FLOW, &::getBooleanCppuType(), 0, 0},
+        {0,0,0,0,0,0}
+
     };
 
     return aSvxAdditionalDefaultsPropertyMap_Impl;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 2a97b18a6a69..77fa691f2988 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2053,10 +2053,10 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
         // Hole Wert aus ItemSet
         aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet );
 
-        if( pMap->aType != aAny.getValueType() )
+        if( *pMap->pType != aAny.getValueType() )
         {
             // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
-            if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
+            if( ( *pMap->pType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
             {
                 sal_Int32 nValue = 0;
                 aAny >>= nValue;
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 67df3b4c1d08..8398d75204d6 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -226,27 +226,27 @@ sal_Int8 SAL_CALL GalleryItem::getType()
     SolarMutexGuard aGuard;
     ::comphelper::PropertySetInfo*  pRet = new ::comphelper::PropertySetInfo();
 
-    static ::comphelper::PropertyMapEntry const aEntries[] =
+    static ::comphelper::PropertyMapEntry aEntries[] =
     {
-        { "GalleryItemType", UNOGALLERY_GALLERYITEMTYPE, ::getCppuType( (const sal_Int8*)(0)),
+        { MAP_CHAR_LEN( "GalleryItemType" ), UNOGALLERY_GALLERYITEMTYPE, &::getCppuType( (const sal_Int8*)(0)),
           beans::PropertyAttribute::READONLY, 0 },
 
-        { "URL", UNOGALLERY_URL, ::getCppuType( (const OUString*)(0)),
+        { MAP_CHAR_LEN( "URL" ), UNOGALLERY_URL, &::getCppuType( (const OUString*)(0)),
           beans::PropertyAttribute::READONLY, 0 },
 
-        { "Title", UNOGALLERY_TITLE, ::getCppuType( (const OUString*)(0)),
+        { MAP_CHAR_LEN( "Title" ), UNOGALLERY_TITLE, &::getCppuType( (const OUString*)(0)),
           0, 0 },
 
-        { "Thumbnail", UNOGALLERY_THUMBNAIL, ::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)),
+        { MAP_CHAR_LEN( "Thumbnail" ), UNOGALLERY_THUMBNAIL, &::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)),
           beans::PropertyAttribute::READONLY, 0 },
 
-        { "Graphic", UNOGALLERY_GRAPHIC, ::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)),
+        { MAP_CHAR_LEN( "Graphic" ), UNOGALLERY_GRAPHIC, &::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)),
           beans::PropertyAttribute::READONLY, 0 },
 
-        { "Drawing", UNOGALLERY_DRAWING, ::getCppuType( (const uno::Reference< lang::XComponent >*)(0) ),
+        { MAP_CHAR_LEN( "Drawing" ), UNOGALLERY_DRAWING, &::getCppuType( (const uno::Reference< lang::XComponent >*)(0) ),
           beans::PropertyAttribute::READONLY, 0 },
 
-        {}
+        { 0,0,0,0,0,0}
     };
 
     pRet->acquire();
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 208592a81386..b549792729dd 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -308,7 +308,7 @@
 
 class SwUnoPropertyMapProvider
 {
-    SfxItemPropertyMapEntry const * aMapEntriesArr[PROPERTY_MAP_END];
+    SfxItemPropertyMapEntry*        aMapEntriesArr[PROPERTY_MAP_END];
     SfxItemPropertySet*             aPropertySetArr[PROPERTY_MAP_END];
 
 public:
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 90d71280c46b..062e63ab1d78 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2258,7 +2258,7 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
 //        const SfxItemPropertyMap* pPropMap( rPropSet.getPropertyMap() );
         const SfxItemPropertyMapEntry* pPropMap(
                 aSwMapProvider.GetPropertyMapEntries( PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE ) );
-        while ( !pPropMap->aName.isEmpty() )
+        while ( pPropMap->pName )
         {
             const SfxPoolItem* pItem = pSet->GetItem( pPropMap->nWID );
             if ( pItem )
@@ -2267,7 +2267,7 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
                 pItem->QueryValue( aVal, pPropMap->nMemberId );
 
                 PropertyValue rPropVal;
-                rPropVal.Name = pPropMap->aName;
+                rPropVal.Name = OUString::createFromAscii( pPropMap->pName );
                 rPropVal.Value = aVal;
                 rPropVal.Handle = -1;
                 rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 288ec17ef939..e9804b7b229b 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -37,15 +37,15 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {"TextField",                 EE_FEATURE_FIELD,
-            ::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
-        {"TextPortionType",           WID_PORTIONTYPE,
-            ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
-        {"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS,
-            ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0), 0, 0},
-        {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS,
-            ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0), 0, 0},
-        {}
+        {MAP_CHAR_LEN("TextField"),                 EE_FEATURE_FIELD,
+            &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN("TextPortionType"),           WID_PORTIONTYPE,
+            &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+        {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS,
+            &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0), 0, 0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS,
+            &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0), 0, 0},
+        {0,0,0,0,0,0}
     };
     static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() );
     return &aSvxTextPortionPropertySet;
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 54dbd8c0f309..956d96f9db23 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -20,57 +20,9 @@
 #include <hintids.hxx>
 
 #include <svx/svxids.hrc>
-#include <com/sun/star/awt/FontSlant.hpp>
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
+#include <comphelper/TypeGeneration.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/drawing/ColorMode.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/style/BreakType.hpp>
-#include <com/sun/star/style/DropCapFormat.hpp>
-#include <com/sun/star/style/GraphicLocation.hpp>
-#include <com/sun/star/style/LineSpacing.hpp>
-#include <com/sun/star/style/PageStyleLayout.hpp>
-#include <com/sun/star/style/TabStop.hpp>
-#include <com/sun/star/style/VerticalAlignment.hpp>
-#include <com/sun/star/table/BorderLine.hpp>
-#include <com/sun/star/table/ShadowFormat.hpp>
-#include <com/sun/star/table/TableBorder.hpp>
-#include <com/sun/star/table/TableBorder2.hpp>
-#include <com/sun/star/table/TableBorderDistances.hpp>
-#include <com/sun/star/table/XCell.hpp>
-#include <com/sun/star/text/GraphicCrop.hpp>
 #include <com/sun/star/text/PageNumberType.hpp>
-#include <com/sun/star/text/SectionFileLink.hpp>
-#include <com/sun/star/text/TableColumnSeparator.hpp>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <com/sun/star/text/WrapTextMode.hpp>
-#include <com/sun/star/text/XDependentTextField.hpp>
-#include <com/sun/star/text/XDocumentIndex.hpp>
-#include <com/sun/star/text/XDocumentIndexMark.hpp>
-#include <com/sun/star/text/XFootnote.hpp>
-#include <com/sun/star/text/XTextColumns.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/text/XTextFrame.hpp>
-#include <com/sun/star/text/XTextSection.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 // #i28749#
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
@@ -86,6 +38,9 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
+using namespace ::comphelper;
+
+#define SW_PROP_NMID(id)    ((const char*)id), 0
 
 #ifndef MID_TXT_LMARGIN
 #define MID_TXT_LMARGIN 11
@@ -111,206 +66,206 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
 }
 
 #define _STANDARD_FONT_PROPERTIES \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HEIGHT)), RES_CHRATR_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},      \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WEIGHT)), RES_CHRATR_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},                    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_NAME)), RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },                  \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_STYLE_NAME)), RES_CHRATR_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_FAMILY)), RES_CHRATR_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_CHAR_SET)), RES_CHRATR_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_PITCH)), RES_CHRATR_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_POSTURE)), RES_CHRATR_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE},                   \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_RSID)), RES_CHRATR_RSID, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LOCALE)),           RES_CHRATR_LANGUAGE,    cppu::UnoType<css::lang::Locale>::get(),          PropertyAttribute::MAYBEVOID,   MID_LANG_LOCALE }, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_INTEROP_GRAB_BAG)), RES_CHRATR_GRABBAG,     cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),   PROPERTY_NONE,                  0               }, \
+    { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT), RES_CHRATR_FONTSIZE  ,  CPPU_E2T(CPPUTYPE_FLOAT),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},      \
+    { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT), RES_CHRATR_WEIGHT    ,  CPPU_E2T(CPPUTYPE_FLOAT),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},                    \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT,       CPPU_E2T(CPPUTYPE_OUSTRING),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },                  \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME), RES_CHRATR_FONT,     CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                    \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY), RES_CHRATR_FONT,     CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET), RES_CHRATR_FONT,       CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                    \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH), RES_CHRATR_FONT,      CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE), RES_CHRATR_POSTURE   ,  CPPU_E2T(CPPUTYPE_FONTSLANT),        PropertyAttribute::MAYBEVOID, MID_POSTURE},                   \
+    { SW_PROP_NMID(UNO_NAME_RSID), RES_CHRATR_RSID, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, 0 }, \
+    { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE),           RES_CHRATR_LANGUAGE,    CPPU_E2T(CPPUTYPE_LOCALE),          PropertyAttribute::MAYBEVOID,   MID_LANG_LOCALE }, \
+    { SW_PROP_NMID(UNO_NAME_CHAR_INTEROP_GRAB_BAG), RES_CHRATR_GRABBAG,     CPPU_E2T(CPPUTYPE_PROPERTYVALUE),   PROPERTY_NONE,                  0               }, \
 
 #define _CJK_FONT_PROPERTIES \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HEIGHT_ASIAN)), RES_CHRATR_CJK_FONTSIZE  ,  cppu::UnoType<float>::get(),           PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},   \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WEIGHT_ASIAN)), RES_CHRATR_CJK_WEIGHT    ,  cppu::UnoType<float>::get(),           PropertyAttribute::MAYBEVOID, MID_WEIGHT},                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_NAME_ASIAN)), RES_CHRATR_CJK_FONT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },               \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN)), RES_CHRATR_CJK_FONT,       cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_FAMILY_ASIAN)), RES_CHRATR_CJK_FONT,       cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN)), RES_CHRATR_CJK_FONT,     cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_PITCH_ASIAN)), RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_POSTURE_ASIAN)), RES_CHRATR_CJK_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),          PropertyAttribute::MAYBEVOID, MID_POSTURE},                \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LOCALE_ASIAN)), RES_CHRATR_CJK_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get()  ,        PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+    { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE  ,  CPPU_E2T(CPPUTYPE_FLOAT),           PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},   \
+    { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT_ASIAN), RES_CHRATR_CJK_WEIGHT    ,  CPPU_E2T(CPPUTYPE_FLOAT),           PropertyAttribute::MAYBEVOID, MID_WEIGHT},                 \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_ASIAN), RES_CHRATR_CJK_FONT,     CPPU_E2T(CPPUTYPE_OUSTRING),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },               \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN), RES_CHRATR_CJK_FONT,       CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                 \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_ASIAN), RES_CHRATR_CJK_FONT,       CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN), RES_CHRATR_CJK_FONT,     CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                 \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_ASIAN), RES_CHRATR_CJK_FONT,        CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE_ASIAN), RES_CHRATR_CJK_POSTURE   ,  CPPU_E2T(CPPUTYPE_FONTSLANT),          PropertyAttribute::MAYBEVOID, MID_POSTURE},                \
+    { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE_ASIAN), RES_CHRATR_CJK_LANGUAGE ,   CPPU_E2T(CPPUTYPE_LOCALE)  ,        PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
 
 #define _CTL_FONT_PROPERTIES \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HEIGHT_COMPLEX)), RES_CHRATR_CTL_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WEIGHT_COMPLEX)), RES_CHRATR_CTL_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},              \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_NAME_COMPLEX)), RES_CHRATR_CTL_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },            \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX)), RES_CHRATR_CTL_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },              \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX)), RES_CHRATR_CTL_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX)), RES_CHRATR_CTL_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },              \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_PITCH_COMPLEX)), RES_CHRATR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_POSTURE_COMPLEX)), RES_CHRATR_CTL_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE},             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LOCALE_COMPLEX)), RES_CHRATR_CTL_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get()  ,          PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+    { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE  ,  CPPU_E2T(CPPUTYPE_FLOAT),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
+    { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT_COMPLEX), RES_CHRATR_CTL_WEIGHT    ,  CPPU_E2T(CPPUTYPE_FLOAT),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},              \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_COMPLEX), RES_CHRATR_CTL_FONT,       CPPU_E2T(CPPUTYPE_OUSTRING),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },            \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX), RES_CHRATR_CTL_FONT,     CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },              \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX), RES_CHRATR_CTL_FONT,     CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX), RES_CHRATR_CTL_FONT,       CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },              \
+    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_COMPLEX), RES_CHRATR_CTL_FONT,      CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE_COMPLEX), RES_CHRATR_CTL_POSTURE   ,  CPPU_E2T(CPPUTYPE_FONTSLANT),        PropertyAttribute::MAYBEVOID, MID_POSTURE},             \
+    { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE_COMPLEX), RES_CHRATR_CTL_LANGUAGE ,   CPPU_E2T(CPPUTYPE_LOCALE)  ,          PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
 
 #define _REDLINE_NODE_PROPERTIES \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_START_REDLINE)), FN_UNO_REDLINE_NODE_START , cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xff }, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_END_REDLINE)), FN_UNO_REDLINE_NODE_END ,     cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xff },
+    { SW_PROP_NMID(UNO_NAME_START_REDLINE), FN_UNO_REDLINE_NODE_START , CPPU_E2T(CPPUTYPE_PROPERTYVALUE),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xff }, \
+    { SW_PROP_NMID(UNO_NAME_END_REDLINE), FN_UNO_REDLINE_NODE_END ,     CPPU_E2T(CPPUTYPE_PROPERTYVALUE),       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xff },
 
 #define _REDLINE_PROPERTIES \
-    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_AUTHOR)), 0, cppu::UnoType<OUString>::get(),                     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_DATE_TIME)), 0, cppu::UnoType<css::util::DateTime>::get(),                  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_COMMENT)), 0, cppu::UnoType<OUString>::get(),                        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_TYPE)), 0, cppu::UnoType<OUString>::get(),                       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_SUCCESSOR_DATA)), 0, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_IDENTIFIER)), 0, cppu::UnoType<OUString>::get(),                         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_IN_HEADER_FOOTER)), 0, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_TEXT)), 0, cppu::UnoType<css::text::XText>::get(),                    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {OUString::createFromAscii(GetPropName(UNO_NAME_MERGE_LAST_PARA)), 0, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+    {SW_PROP_NMID(UNO_NAME_REDLINE_AUTHOR), 0, CPPU_E2T(CPPUTYPE_OUSTRING),                     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {SW_PROP_NMID(UNO_NAME_REDLINE_DATE_TIME), 0, CPPU_E2T(CPPUTYPE_DATETIME),                  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {SW_PROP_NMID(UNO_NAME_REDLINE_COMMENT), 0, CPPU_E2T(CPPUTYPE_OUSTRING),                        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {SW_PROP_NMID(UNO_NAME_REDLINE_TYPE), 0, CPPU_E2T(CPPUTYPE_OUSTRING),                       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {SW_PROP_NMID(UNO_NAME_REDLINE_SUCCESSOR_DATA), 0, CPPU_E2T(CPPUTYPE_PROPERTYVALUE),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {SW_PROP_NMID(UNO_NAME_REDLINE_IDENTIFIER), 0, CPPU_E2T(CPPUTYPE_OUSTRING),                         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+    {SW_PROP_NMID(UNO_NAME_IS_IN_HEADER_FOOTER), 0, CPPU_E2T(CPPUTYPE_BOOLEAN),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+    {SW_PROP_NMID(UNO_NAME_REDLINE_TEXT), 0, CPPU_E2T(CPPUTYPE_REFTEXT),                    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {SW_PROP_NMID(UNO_NAME_MERGE_LAST_PARA), 0, CPPU_E2T(CPPUTYPE_BOOLEAN),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
 
 #define COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLE_NAME)), FN_UNO_PARA_STYLE,        cppu::UnoType<OUString>::get(),                PropertyAttribute::MAYBEVOID,     0},                                                       \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_STYLE_NAME)), FN_UNO_PAGE_STYLE,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},                       \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_IS_NUMBER)), FN_UNO_IS_NUMBER,     cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_LEVEL)), FN_UNO_NUM_LEVEL,     cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, 0},                                                            \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_RULES)), FN_UNO_NUM_RULES,     cppu::UnoType<css::container::XIndexReplace>::get(),  PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                        \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_START_VALUE)), FN_UNO_NUM_START_VALUE, cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                                                \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_INDEX)), FN_UNO_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },            \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_TABLE)), FN_UNO_TEXT_TABLE,     cppu::UnoType<css::text::XTextTable>::get(),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },               \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CELL)), FN_UNO_CELL,         cppu::UnoType<css::table::XCell>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_FRAME)), FN_UNO_TEXT_FRAME,     cppu::UnoType<css::text::XTextFrame>::get(),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_SECTION)), FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                    \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL)), FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, 0},                                                     \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME)), FN_UNO_PARA_CONDITIONAL_STYLE_NAME, cppu::UnoType<OUString>::get(),      PropertyAttribute::READONLY, 0},                                                     \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_LIST_ID)), FN_UNO_LIST_ID, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_NUMBERING_RESTART)), FN_NUMBER_NEWSTART,     cppu::UnoType<bool>::get(),     PropertyAttribute::MAYBEVOID, 0 }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE)), FN_UNO_PARA_CONT_PREV_SUBTREE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0 }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LIST_LABEL_STRING)), FN_UNO_PARA_NUM_STRING, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_OUTLINE_LEVEL)), RES_PARATR_OUTLINELEVEL,        cppu::UnoType<sal_Int16>::get(),                PropertyAttribute::MAYBEVOID,     0},
+        { SW_PROP_NMID(UNO_NAME_PARA_STYLE_NAME), FN_UNO_PARA_STYLE,        CPPU_E2T(CPPUTYPE_OUSTRING),                PropertyAttribute::MAYBEVOID,     0},                                                       \
+        { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), FN_UNO_PAGE_STYLE,        CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},                       \
+        { SW_PROP_NMID(UNO_NAME_NUMBERING_IS_NUMBER), FN_UNO_IS_NUMBER,     CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
+        { SW_PROP_NMID(UNO_NAME_NUMBERING_LEVEL), FN_UNO_NUM_LEVEL,     CPPU_E2T(CPPUTYPE_INT16),           PropertyAttribute::MAYBEVOID, 0},                                                            \
+        { SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES,     CPPU_E2T(CPPUTYPE_REFIDXREPL),  PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                        \
+        { SW_PROP_NMID(UNO_NAME_NUMBERING_START_VALUE), FN_UNO_NUM_START_VALUE, CPPU_E2T(CPPUTYPE_INT16),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                                                \
+        { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX), FN_UNO_DOCUMENT_INDEX, CPPU_E2T(CPPUTYPE_REFDOCINDEX), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },            \
+        { SW_PROP_NMID(UNO_NAME_TEXT_TABLE), FN_UNO_TEXT_TABLE,     CPPU_E2T(CPPUTYPE_REFTXTTABLE),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },               \
+        { SW_PROP_NMID(UNO_NAME_CELL), FN_UNO_CELL,         CPPU_E2T(CPPUTYPE_REFCELL),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
+        { SW_PROP_NMID(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME,     CPPU_E2T(CPPUTYPE_REFTEXTFRAME),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
+        { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                    \
+        { SW_PROP_NMID(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL), FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},                                                     \
+        { SW_PROP_NMID(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME), FN_UNO_PARA_CONDITIONAL_STYLE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::READONLY, 0},                                                     \
+        { SW_PROP_NMID(UNO_NAME_LIST_ID), FN_UNO_LIST_ID, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, \
+        { SW_PROP_NMID(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART,     CPPU_E2T(CPPUTYPE_BOOLEAN),     PropertyAttribute::MAYBEVOID, 0 }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE), FN_UNO_PARA_CONT_PREV_SUBTREE, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0 }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_LIST_LABEL_STRING), FN_UNO_PARA_NUM_STRING, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0 }, \
+        { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL,        CPPU_E2T(CPPUTYPE_INT16),                PropertyAttribute::MAYBEVOID,     0},
 
 #define COMMON_HYPERLINK_PROPERTIES \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_U_R_L)), RES_TXTATR_INETFMT,          cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_URL},                \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_TARGET)), RES_TXTATR_INETFMT,         cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_TARGET},             \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_NAME)), RES_TXTATR_INETFMT,           cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_HYPERLINKNAME  },    \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_UNVISITED_CHAR_STYLE_NAME)), RES_TXTATR_INETFMT, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_UNVISITED_FMT   },   \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_VISITED_CHAR_STYLE_NAME)), RES_TXTATR_INETFMT,   cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_VISITED_FMT  },
+        { SW_PROP_NMID(UNO_NAME_HYPER_LINK_U_R_L), RES_TXTATR_INETFMT,          CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_URL_URL},                \
+        { SW_PROP_NMID(UNO_NAME_HYPER_LINK_TARGET), RES_TXTATR_INETFMT,         CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_URL_TARGET},             \
+        { SW_PROP_NMID(UNO_NAME_HYPER_LINK_NAME), RES_TXTATR_INETFMT,           CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_URL_HYPERLINKNAME  },    \
+        { SW_PROP_NMID(UNO_NAME_UNVISITED_CHAR_STYLE_NAME), RES_TXTATR_INETFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_URL_UNVISITED_FMT   },   \
+        { SW_PROP_NMID(UNO_NAME_VISITED_CHAR_STYLE_NAME), RES_TXTATR_INETFMT,   CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_URL_VISITED_FMT  },
 
 // same as COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 but without
-// OUString::createFromAscii(GetPropName(UNO_NAME_BREAK_TYPE)) and OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_DESC_NAME)) which can not be used
+// 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 \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARRSID)),                             RES_PARATR_RSID,               cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_HYPHENATION)),                 RES_PARATR_HYPHENZONE,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS)),  RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD                    }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS)), RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL                   }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS)),        RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS                 }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_AUTO_KERNING)),                   RES_CHRATR_AUTOKERN,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_COLOR)),                     RES_CHRATR_BACKGROUND,         cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIGHLIGHT)),                      RES_CHRATR_HIGHLIGHT,          cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BACK_COLOR)),                     RES_BACKGROUND,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CASE_MAP)),                       RES_CHRATR_CASEMAP,            cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COLOR)),                          RES_CHRATR_COLOR,              cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STRIKEOUT)),                      RES_CHRATR_CROSSEDOUT,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_CROSS_OUT                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CROSSED_OUT)),                    RES_CHRATR_CROSSEDOUT,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_CROSSED_OUT                        }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT)),                     RES_CHRATR_ESCAPEMENT,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_ESC                                }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT)),              RES_CHRATR_ESCAPEMENT,         cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, MID_ESC_HEIGHT                         }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_AUTO_ESCAPEMENT)),                RES_CHRATR_ESCAPEMENT,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_AUTO_ESC                           }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FLASH)),                          RES_CHRATR_BLINK,              cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIDDEN)),                         RES_CHRATR_HIDDEN,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE)),                      RES_CHRATR_UNDERLINE,          cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_COLOR)),                RES_CHRATR_UNDERLINE,          cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR)),            RES_CHRATR_UNDERLINE,          cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE)),                       RES_CHRATR_OVERLINE,           cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_COLOR)),                 RES_CHRATR_OVERLINE,           cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_HAS_COLOR)),             RES_CHRATR_OVERLINE,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_GRAPHIC_URL)),                    RES_BACKGROUND,                cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_URL                        }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_GRAPHIC_FILTER)),                 RES_BACKGROUND,                cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_FILTER                     }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_GRAPHIC_LOCATION)),               RES_BACKGROUND,                cppu::UnoType<css::style::GraphicLocation>::get(),    PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION                   }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LEFT_MARGIN)),                    RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN        | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_RIGHT_MARGIN)),                   RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_R_MARGIN           | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT)),      RES_LR_SPACE,                  cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_FIRST_AUTO                         }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_FIRST_LINE_INDENT)),              RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         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_CHAR_HIGHLIGHT),                      RES_CHRATR_HIGHLIGHT,          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 \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_KERNING)),                        RES_CHRATR_KERNING,            cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_NO_HYPHENATION)),                 RES_CHRATR_NOHYPHEN,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOWED)),                       RES_CHRATR_SHADOWED,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CONTOURED)),                      RES_CHRATR_CONTOUR,            cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_DROP_CAP_FORMAT)),                     RES_PARATR_DROP,               cppu::UnoType<css::style::DropCapFormat>::get(),    PropertyAttribute::MAYBEVOID, MID_DROPCAP_FORMAT     | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_DROP_CAP_WHOLE_WORD)),                 RES_PARATR_DROP,               cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_DROPCAP_WHOLE_WORD                 }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_DROP_CAP_CHAR_STYLE_NAME)),            RES_PARATR_DROP,               cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME            }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_KEEP_TOGETHER)),                  RES_KEEP,                      cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_SPLIT)),                          RES_PARATR_SPLIT,              cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_WIDOWS)),                         RES_PARATR_WIDOWS,             cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_ORPHANS)),                        RES_PARATR_ORPHANS,            cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_NUMBER_OFFSET)),                  RES_PAGEDESC,                  cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET             }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_ADJUST)),                         RES_PARATR_ADJUST,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST                        }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_EXPAND_SINGLE_WORD)),             RES_PARATR_ADJUST,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_EXPAND_SINGLE                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LAST_LINE_ADJUST)),               RES_PARATR_ADJUST,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_LAST_LINE_ADJUST                   }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LINE_NUMBER_COUNT)),              RES_LINENUMBER,                cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_LINENUMBER_COUNT                   }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LINE_NUMBER_START_VALUE)),        RES_LINENUMBER,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_LINENUMBER_STARTVALUE              }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LINE_SPACING)),                   RES_PARATR_LINESPACING,        cppu::UnoType<css::style::LineSpacing>::get(),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_REGISTER_MODE_ACTIVE)),           RES_PARATR_REGISTER,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_TOP_MARGIN)),                     RES_UL_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_UP_MARGIN          | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BOTTOM_MARGIN)),                  RES_UL_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_LO_MARGIN          | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_CONTEXT_MARGIN)),                 RES_UL_SPACE,                  cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_CTX_MARGIN                         }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_TRANSPARENT)),               RES_CHRATR_BACKGROUND,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BACK_TRANSPARENT)),               RES_BACKGROUND,                cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_STYLE_NAME)),                RES_PARATR_NUMRULE,            cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WORD_MODE)),                      RES_CHRATR_WORDLINEMODE,       cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER)),                    RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER)),                   RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER)),                     RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER)),                  RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BORDER_DISTANCE)),                RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE)),           RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE)),          RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER_DISTANCE)),            RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE)),         RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOW_FORMAT)),                  RES_CHRATR_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER)),                         RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER)),                        RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER)),                          RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER)),                       RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_BORDER_DISTANCE)),                     RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER_DISTANCE)),                RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER_DISTANCE)),               RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER_DISTANCE)),                 RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER_DISTANCE)),              RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES)),        RES_UNKNOWNATR_CONTAINER,      cppu::UnoType<css::container::XNameContainer>::get(),    PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES)),        RES_TXTATR_UNKNOWN_CONTAINER,  cppu::UnoType<css::container::XNameContainer>::get(),    PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_SHADOW_FORMAT)),                  RES_SHADOW,                    cppu::UnoType<css::table::ShadowFormat>::get(),     PROPERTY_NONE,                CONVERT_TWIPS                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_IS_ON)),                  RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TWOLINES                           }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_PREFIX)),                 RES_CHRATR_TWO_LINES,          cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_START_BRACKET                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_SUFFIX)),                 RES_CHRATR_TWO_LINES,          cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_END_BRACKET                        }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_EMPHASIS)),                       RES_CHRATR_EMPHASIS_MARK,      cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_EMPHASIS                           }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_HANGING_PUNCTUATION)),         RES_PARATR_HANGINGPUNCTUATION, cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_CHARACTER_DISTANCE)),          RES_PARATR_SCRIPTSPACE,        cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_FORBIDDEN_RULES)),             RES_PARATR_FORBIDDEN_RULES,    cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_VERT_ALIGNMENT)),                 RES_PARATR_VERTALIGN,          cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION)),                       RES_CHRATR_ROTATE,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_ROTATE                             }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE)),        RES_CHRATR_ROTATE,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_FITTOLINE                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SCALE_WIDTH)),                    RES_CHRATR_SCALEW,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_RUBY_TEXT)),                           RES_TXTATR_CJK_RUBY,           cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_RUBY_TEXT                          }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_RUBY_ADJUST)),                         RES_TXTATR_CJK_RUBY,           cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_RUBY_ADJUST                        }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_RUBY_CHAR_STYLE_NAME)),                RES_TXTATR_CJK_RUBY,           cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_RUBY_CHARSTYLE                     }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_RUBY_IS_ABOVE)),                       RES_TXTATR_CJK_RUBY,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_RUBY_ABOVE                         }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RELIEF)),                         RES_CHRATR_RELIEF,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_RELIEF                             }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_SNAP_TO_GRID)),                        RES_PARATR_SNAPTOGRID,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_CONNECT_BORDER)),              RES_PARATR_CONNECT_BORDER,     cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)),                        RES_FRAMEDIR,                  cppu::UnoType<sal_Int16>::get(),         PROPERTY_NONE,                0                                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADING_VALUE)),                  RES_CHRATR_BACKGROUND,         cppu::UnoType<sal_Int32>::get(),         PROPERTY_NONE,                MID_SHADING_VALUE                      }, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_INTEROP_GRAB_BAG)),               RES_PARATR_GRABBAG,            cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), 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 \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_BREAK_TYPE)), RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),           PropertyAttribute::MAYBEVOID, 0}, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_DESC_NAME)), RES_PAGEDESC,          cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },
+        { SW_PROP_NMID(UNO_NAME_BREAK_TYPE), RES_BREAK,                 CPPU_E2T(CPPUTYPE_BREAK),           PropertyAttribute::MAYBEVOID, 0}, \
+        { SW_PROP_NMID(UNO_NAME_PAGE_DESC_NAME), RES_PAGEDESC,          CPPU_E2T(CPPUTYPE_OUSTRING),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },
 
 
-#define TABSTOPS_MAP_ENTRY                { OUString::createFromAscii(GetPropName(UNO_NAME_TABSTOPS)), RES_PARATR_TABSTOP,   cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},
+#define TABSTOPS_MAP_ENTRY                { SW_PROP_NMID(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP,   CPPU_E2T(CPPUTYPE_SEQTABSTOP),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},
 
 #define COMMON_CRSR_PARA_PROPERTIES \
         COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
         COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \
         COMMON_HYPERLINK_PROPERTIES \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAME)), RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAMES)), FN_UNO_CHARFMT_SEQUENCE,  cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),     PropertyAttribute::MAYBEVOID,     0}, \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_AUTO_STYLE_NAME)), RES_TXTATR_AUTOFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_AUTO_STYLE_NAME)), RES_AUTO_STYLE,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
+        { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT,     CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,     0},\
+        { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAMES), FN_UNO_CHARFMT_SEQUENCE,  CPPU_E2T(CPPUTYPE_OUSTRINGS),     PropertyAttribute::MAYBEVOID,     0},\
+        { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_STYLE_NAME), RES_TXTATR_AUTOFMT,     CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,     0},\
+        { SW_PROP_NMID(UNO_NAME_PARA_AUTO_STYLE_NAME), RES_AUTO_STYLE,     CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,     0},
 
 #define COMMON_CRSR_PARA_PROPERTIES_2 \
         COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
@@ -318,255 +273,255 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
 
 #define  COMPLETE_TEXT_CURSOR_MAP\
         COMMON_CRSR_PARA_PROPERTIES\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_INDEX_MARK)), FN_UNO_DOCUMENT_INDEX_MARK, cppu::UnoType<css::text::XDocumentIndexMark>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_FIELD)), FN_UNO_TEXT_FIELD,      cppu::UnoType<css::text::XTextField>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_REFERENCE_MARK)), FN_UNO_REFERENCE_MARK,  cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE)), FN_UNO_FOOTNOTE,        cppu::UnoType<css::text::XFootnote>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE)), FN_UNO_ENDNOTE,         cppu::UnoType<css::text::XFootnote>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_EVENTS)), RES_TXTATR_INETFMT,     cppu::UnoType<css::container::XNameReplace>::get(), PropertyAttribute::MAYBEVOID, MID_URL_HYPERLINKEVENTS},\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NESTED_TEXT_CONTENT)), FN_UNO_NESTED_TEXT_CONTENT, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
+        { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARK), FN_UNO_DOCUMENT_INDEX_MARK, CPPU_E2T(CPPUTYPE_REFDOCIDXMRK), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { SW_PROP_NMID(UNO_NAME_TEXT_FIELD), FN_UNO_TEXT_FIELD,      CPPU_E2T(CPPUTYPE_REFTXTFIELD),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { SW_PROP_NMID(UNO_NAME_REFERENCE_MARK), FN_UNO_REFERENCE_MARK,  CPPU_E2T(CPPUTYPE_REFTEXTCNTNT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
+        { SW_PROP_NMID(UNO_NAME_FOOTNOTE), FN_UNO_FOOTNOTE,        CPPU_E2T(CPPUTYPE_REFFOOTNOTE),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { SW_PROP_NMID(UNO_NAME_ENDNOTE), FN_UNO_ENDNOTE,         CPPU_E2T(CPPUTYPE_REFFOOTNOTE),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { SW_PROP_NMID(UNO_NAME_HYPER_LINK_EVENTS), RES_TXTATR_INETFMT,     CPPU_E2T(CPPUTYPE_REFNMREPLACE), PropertyAttribute::MAYBEVOID, MID_URL_HYPERLINKEVENTS},\
+        { SW_PROP_NMID(UNO_NAME_NESTED_TEXT_CONTENT), FN_UNO_NESTED_TEXT_CONTENT, CPPU_E2T(CPPUTYPE_REFTEXTCNTNT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
         TABSTOPS_MAP_ENTRY
 
 
 
 #define _BASE_INDEX_PROPERTIES_\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TITLE)), WID_IDX_TITLE,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),  WID_IDX_NAME,   cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT_SECTION)), WID_IDX_CONTENT_SECTION,  cppu::UnoType<css::text::XTextSection>::get()  , PropertyAttribute::READONLY,     0},\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_SECTION)), WID_IDX_HEADER_SECTION,  cppu::UnoType<css::text::XTextSection>::get()  , PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,     0},\
+        { SW_PROP_NMID(UNO_NAME_TITLE), WID_IDX_TITLE,  CPPU_E2T(CPPUTYPE_OUSTRING)  , PROPERTY_NONE,     0},\
+        { SW_PROP_NMID(UNO_NAME_NAME),  WID_IDX_NAME,   CPPU_E2T(CPPUTYPE_OUSTRING)  , PROPERTY_NONE,     0},\
+        { SW_PROP_NMID(UNO_NAME_CONTENT_SECTION), WID_IDX_CONTENT_SECTION,  CPPU_E2T(CPPUTYPE_REFTEXTSECTION)  , PropertyAttribute::READONLY,     0},\
+        { SW_PROP_NMID(UNO_NAME_HEADER_SECTION), WID_IDX_HEADER_SECTION,  CPPU_E2T(CPPUTYPE_REFTEXTSECTION)  , PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,     0},\
 
-#define ANCHOR_TYPES_PROPERTY    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_TYPES)), FN_UNO_ANCHOR_TYPES,    cppu::UnoType< cppu::UnoSequenceType<css::text::TextContentAnchorType> >::get(),PropertyAttribute::READONLY, 0xff},
+#define ANCHOR_TYPES_PROPERTY    { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPES), FN_UNO_ANCHOR_TYPES,    CPPU_E2T(CPPUTYPE_SEQANCHORTYPE),PropertyAttribute::READONLY, 0xff},
 
 // #i18732# #i28701# #i73249#
 #define COMMON_FRAME_PROPERTIES \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_PAGE_NO)), RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },              \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_TYPE)), RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_FRAME)), RES_ANCHOR,             cppu::UnoType<css::text::XTextFrame>::get(),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},             \
+    { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR,            CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },              \
+    { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR,           CPPU_E2T(CPPUTYPE_TXTCNTANCHOR),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},             \
+    { SW_PROP_NMID(UNO_NAME_ANCHOR_FRAME), RES_ANCHOR,             CPPU_E2T(CPPUTYPE_REFTEXTFRAME),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},             \
     ANCHOR_TYPES_PROPERTY\
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },                      \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR_R_G_B)), RES_BACKGROUND,      cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR_TRANSPARENCY)), RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_FILL_STYLE)), RES_FILL_STYLE,      cppu::UnoType<css::drawing::FillStyle>::get(), PROPERTY_NONE ,0}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_FILL_GRADIENT)), RES_FILL_GRADIENT,      cppu::UnoType<css::awt::Gradient>::get(), PROPERTY_NONE ,MID_FILLGRADIENT}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_FILL_GRADIENT_NAME)), RES_FILL_GRADIENT, cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_NAME}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_INTEROP_GRAB_BAG)), RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT_PROTECTED)), RES_PROTECT,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_CONTENT  },                          \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_STYLE_NAME)), FN_UNO_FRAME_STYLE_NAME,cppu::UnoType<OUString>::get(),         PROPERTY_NONE, 0},                                   \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_GRAPHIC_URL    },                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_GRAPHIC_FILTER    },              \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_TRANSPARENCY)), RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_MARGIN)), RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},            \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},            \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH)), RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS},\
-    { OUString::createFromAscii(GetPropName(UNO_NAME_HEIGHT)), RES_FRM_SIZE,          cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS},\
-    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT)), RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT_POSITION)), RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    }, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT_RELATION)), RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },               \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_U_R_L)), RES_URL,                 cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_URL_URL},                         \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_TARGET)), RES_URL,                cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_URL_TARGET},                      \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_NAME)), RES_URL,              cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_OPAQUE)), RES_OPAQUE,            cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},                                        \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_TOGGLE)), RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },               \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_POSITION_PROTECTED)), RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_POSITION},                      \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_PRINT)), RES_PRINT,              cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},                                        \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_RELATIVE_HEIGHT)), RES_FRM_SIZE,         cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },            \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_RELATIVE_WIDTH)), RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },         \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_FORMAT)), RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_TRANSPARENCE)), RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_IMAGE_MAP)), RES_URL,                    cppu::UnoType<css::container::XIndexContainer>::get(), PROPERTY_NONE, MID_URL_CLIENTMAP}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_SERVER_MAP)), RES_URL,                cppu::UnoType<bool>::get(),            PROPERTY_NONE ,MID_URL_SERVERMAP   },                      \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE)), RES_FRM_SIZE,            cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},        \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE_PROTECTED)), RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_SIZE    },                      \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT)), RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },  \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH)), RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },     \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_WRAP)), RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },        \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND)), RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),            PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },        \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND_ANCHORONLY)), RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_MARGIN)), RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},          \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_MARGIN)), RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},          \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },                    \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT)), RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT_POSITION)), RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    }, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT_RELATION)), RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },               \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER)), RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER)), RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER)), RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },             \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER)), RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },                 \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BORDER_DISTANCE)), RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BORDER_DISTANCE|CONVERT_TWIPS },                       \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER_DISTANCE)), RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },                \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER_DISTANCE)), RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },                \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER_DISTANCE)), RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },            \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER_DISTANCE)), RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },            \
-    { OUString::createFromAscii(GetPropName(UNO_LINK_DISPLAY_NAME)), FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xff}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },\
-    { OUString::createFromAscii(GetPropName(UNO_NAME_Z_ORDER)), FN_UNO_Z_ORDER,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, 0}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_FOLLOWING_TEXT_FLOW)), RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_WRAP_INFLUENCE_ON_POSITION)), RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_TITLE)), FN_UNO_TITLE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_DESCRIPTION)), FN_UNO_DESCRIPTION, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_LAYOUT_SIZE)), WID_LAYOUT_SIZE, cppu::UnoType<css::awt::Size>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_LINE_STYLE)), RES_BOX, cppu::UnoType<css::drawing::LineStyle>::get(),  0, LINE_STYLE }, \
-    { OUString::createFromAscii(GetPropName(UNO_NAME_LINE_WIDTH)), RES_BOX, cppu::UnoType<sal_Int32>::get(),  0, LINE_WIDTH |CONVERT_TWIPS },
+    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },                      \
+    { SW_PROP_NMID(UNO_NAME_BACK_COLOR_R_G_B), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},    \
+    { SW_PROP_NMID(UNO_NAME_BACK_COLOR_TRANSPARENCY), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},    \
+    { SW_PROP_NMID(UNO_NAME_FILL_STYLE), RES_FILL_STYLE,      CPPU_E2T(CPPUTYPE_FILLSTYLE), PROPERTY_NONE ,0}, \
+    { SW_PROP_NMID(UNO_NAME_FILL_GRADIENT), RES_FILL_GRADIENT,      CPPU_E2T(CPPUTYPE_GRADIENT), PROPERTY_NONE ,MID_FILLGRADIENT}, \
+    { SW_PROP_NMID(UNO_NAME_FILL_GRADIENT_NAME), RES_FILL_GRADIENT, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_NAME}, \
+    { SW_PROP_NMID(UNO_NAME_FRAME_INTEROP_GRAB_BAG), RES_FRMATR_GRABBAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0}, \
+    { SW_PROP_NMID(UNO_NAME_CONTENT_PROTECTED), RES_PROTECT,            CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_PROTECT_CONTENT  },                          \
+    { SW_PROP_NMID(UNO_NAME_FRAME_STYLE_NAME), FN_UNO_FRAME_STYLE_NAME,CPPU_E2T(CPPUTYPE_OUSTRING),         PROPERTY_NONE, 0},                                   \
+    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE ,MID_GRAPHIC_URL    },                 \
+    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE ,MID_GRAPHIC_FILTER    },              \
+    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},    \
+    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_TRANSPARENCY), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},    \
+    { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE,             CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},            \
+    { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},            \
+    { SW_PROP_NMID(UNO_NAME_WIDTH), RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS},\
+    { SW_PROP_NMID(UNO_NAME_HEIGHT), RES_FRM_SIZE,          CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS},\
+    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },             \
+    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_POSITION), RES_HORI_ORIENT,     CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    }, \
+    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_RELATION), RES_HORI_ORIENT,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },               \
+    { SW_PROP_NMID(UNO_NAME_HYPER_LINK_U_R_L), RES_URL,                 CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE ,MID_URL_URL},                         \
+    { SW_PROP_NMID(UNO_NAME_HYPER_LINK_TARGET), RES_URL,                CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE ,MID_URL_TARGET},                      \
+    { SW_PROP_NMID(UNO_NAME_HYPER_LINK_NAME), RES_URL,              CPPU_E2T(CPPUTYPE_OUSTRING),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },                 \
+    { SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE,            CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},                                        \
+    { SW_PROP_NMID(UNO_NAME_PAGE_TOGGLE), RES_HORI_ORIENT,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },               \
+    { SW_PROP_NMID(UNO_NAME_POSITION_PROTECTED), RES_PROTECT,           CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_PROTECT_POSITION},                      \
+    { SW_PROP_NMID(UNO_NAME_PRINT), RES_PRINT,              CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},                                        \
+    { SW_PROP_NMID(UNO_NAME_RELATIVE_HEIGHT), RES_FRM_SIZE,         CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },            \
+    { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), RES_FRM_SIZE,          CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },         \
+    { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW,             CPPU_E2T(CPPUTYPE_SHADOWFMT),   PROPERTY_NONE, CONVERT_TWIPS},             \
+    { SW_PROP_NMID(UNO_NAME_SHADOW_TRANSPARENCE), RES_SHADOW,       CPPU_E2T(CPPUTYPE_INT16),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},             \
+    { SW_PROP_NMID(UNO_NAME_IMAGE_MAP), RES_URL,                    CPPU_E2T(CPPUTYPE_REFIDXCNTNR), PROPERTY_NONE, MID_URL_CLIENTMAP}, \
+    { SW_PROP_NMID(UNO_NAME_SERVER_MAP), RES_URL,                CPPU_E2T(CPPUTYPE_BOOLEAN),            PROPERTY_NONE ,MID_URL_SERVERMAP   },                      \
+    { SW_PROP_NMID(UNO_NAME_SIZE), RES_FRM_SIZE,            CPPU_E2T(CPPUTYPE_AWTSIZE),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},        \
+    { SW_PROP_NMID(UNO_NAME_SIZE_PROTECTED), RES_PROTECT,           CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_PROTECT_SIZE    },                      \
+    { SW_PROP_NMID(UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT), RES_FRM_SIZE,         CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },  \
+    { SW_PROP_NMID(UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH), RES_FRM_SIZE,         CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },     \
+    { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), RES_SURROUND,           CPPU_E2T(CPPUTYPE_WRAPTXTMODE),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },        \
+    { SW_PROP_NMID(UNO_NAME_SURROUND), RES_SURROUND,          CPPU_E2T(CPPUTYPE_WRAPTXTMODE),            PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },        \
+    { SW_PROP_NMID(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND,             CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },                 \
+    { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},          \
+    { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE,           CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},          \
+    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },                    \
+    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },             \
+    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_POSITION), RES_VERT_ORIENT,     CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    }, \
+    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_RELATION), RES_VERT_ORIENT,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },               \
+    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX,              CPPU_E2T(CPPUTYPE_BORDERLINE),  0, LEFT_BORDER  |CONVERT_TWIPS },             \
+    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX,             CPPU_E2T(CPPUTYPE_BORDERLINE),  0, RIGHT_BORDER |CONVERT_TWIPS },                 \
+    { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX,               CPPU_E2T(CPPUTYPE_BORDERLINE),  0, TOP_BORDER   |CONVERT_TWIPS },             \
+    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),  0, BOTTOM_BORDER|CONVERT_TWIPS },                 \
+    { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, BORDER_DISTANCE|CONVERT_TWIPS },                       \
+    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX,             CPPU_E2T(CPPUTYPE_INT32),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },                \
+    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },                \
+    { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },            \
+    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX,               CPPU_E2T(CPPUTYPE_INT32),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },            \
+    { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},                \
+    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },\
+    { SW_PROP_NMID(UNO_NAME_Z_ORDER), FN_UNO_Z_ORDER,           CPPU_E2T(CPPUTYPE_INT32),       PROPERTY_NONE, 0}, \
+    { SW_PROP_NMID(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
+    { SW_PROP_NMID(UNO_NAME_WRAP_INFLUENCE_ON_POSITION), RES_WRAP_INFLUENCE_ON_OBJPOS, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_WRAP_INFLUENCE}, \
+    { SW_PROP_NMID(UNO_NAME_TITLE), FN_UNO_TITLE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, \
+    { SW_PROP_NMID(UNO_NAME_DESCRIPTION), FN_UNO_DESCRIPTION, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, \
+    { SW_PROP_NMID(UNO_NAME_LAYOUT_SIZE), WID_LAYOUT_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, \
+    { SW_PROP_NMID(UNO_NAME_LINE_STYLE), RES_BOX, CPPU_E2T(CPPUTYPE_LINESTYLE),  0, LINE_STYLE }, \
+    { SW_PROP_NMID(UNO_NAME_LINE_WIDTH), RES_BOX, CPPU_E2T(CPPUTYPE_INT32),  0, LINE_WIDTH |CONVERT_TWIPS },
 
 
 
 #define COMMON_TEXT_CONTENT_PROPERTIES \
-        { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_TYPE)), FN_UNO_ANCHOR_TYPE, cppu::UnoType<css::text::TextContentAnchorType>::get(),              PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},\
+        { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), FN_UNO_ANCHOR_TYPE, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR),              PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},\
         ANCHOR_TYPES_PROPERTY\
-        { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_WRAP)), FN_UNO_TEXT_WRAP,   cppu::UnoType<css::text::WrapTextMode>::get(),                 PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE  },
+        { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), FN_UNO_TEXT_WRAP,   CPPU_E2T(CPPUTYPE_WRAPTXTMODE),                 PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE  },
 
 
 #define     _PROP_DIFF_FONTHEIGHT \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_PROP_HEIGHT)), RES_CHRATR_FONTSIZE ,            cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_DIFF_HEIGHT)), RES_CHRATR_FONTSIZE ,            cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_PROP_HEIGHT_ASIAN)), RES_CHRATR_CJK_FONTSIZE ,          cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_DIFF_HEIGHT_ASIAN)), RES_CHRATR_CJK_FONTSIZE ,          cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX)), RES_CHRATR_CTL_FONTSIZE ,            cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX)), RES_CHRATR_CTL_FONTSIZE ,            cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT), RES_CHRATR_FONTSIZE ,            CPPU_E2T(CPPUTYPE_FLOAT),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_DIFF_HEIGHT), RES_CHRATR_FONTSIZE ,            CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE ,          CPPU_E2T(CPPUTYPE_FLOAT),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_DIFF_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE ,          CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE ,            CPPU_E2T(CPPUTYPE_FLOAT),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE ,            CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},
 
 
 #define COMMON_PARA_STYLE_PROPERTIES \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BREAK_TYPE)), RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),       PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_DESC_NAME)), RES_PAGEDESC,          cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_NUMBER_OFFSET)), RES_PAGEDESC,              cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_AUTO_KERNING)), RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_TRANSPARENT)), RES_CHRATR_BACKGROUND, cppu::UnoType<bool>::get(),          PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_COLOR)), RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIGHLIGHT)), RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BACK_COLOR)), RES_BACKGROUND,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BACK_TRANSPARENT)), RES_BACKGROUND,         cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CASE_MAP)), RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COLOR)), RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STRIKEOUT)), RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CROSSED_OUT)), RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT)), RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT)), RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FLASH)), RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIDDEN)), RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_BREAK_TYPE), RES_BREAK,                 CPPU_E2T(CPPUTYPE_BREAK),       PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_PAGE_DESC_NAME), RES_PAGEDESC,          CPPU_E2T(CPPUTYPE_OUSTRING),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },\
+                    { SW_PROP_NMID(UNO_NAME_PAGE_NUMBER_OFFSET), RES_PAGEDESC,              CPPU_E2T(CPPUTYPE_INT16),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_KERNING), RES_CHRATR_AUTOKERN  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BACK_TRANSPARENT), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN),          PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND,    CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_HIGHLIGHT), RES_CHRATR_HIGHLIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_BACK_COLOR), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_BACK_TRANSPARENT), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_CASE_MAP), RES_CHRATR_CASEMAP,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR,      CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE, 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)  ,        PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT,  CPPU_E2T(CPPUTYPE_INT16),             PROPERTY_NONE, MID_ESC          },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT,     CPPU_E2T(CPPUTYPE_INT8)  ,          PROPERTY_NONE, MID_ESC_HEIGHT},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},\
                     _STANDARD_FONT_PROPERTIES\
                     _CJK_FONT_PROPERTIES\
                     _CTL_FONT_PROPERTIES\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_COLOR)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE)), RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_COLOR)), RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_HAS_COLOR)), RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LEFT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_TXT_LMARGIN|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_RIGHT_MARGIN)), RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LEFT_MARGIN_RELATIVE)), RES_LR_SPACE,          cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,        MID_L_REL_MARGIN},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_RIGHT_MARGIN_RELATIVE)), RES_LR_SPACE,         cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,        MID_R_REL_MARGIN},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT)), RES_LR_SPACE,          cppu::UnoType<bool>::get(),      PROPERTY_NONE, MID_FIRST_AUTO},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_FIRST_LINE_INDENT)), RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_FIRST_LINE_INDENT_RELATIVE)), RES_LR_SPACE,         cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_FIRST_LINE_REL_INDENT|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_KERNING)), RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_NO_HYPHENATION)), RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOWED)), RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CONTOURED)), RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DROP_CAP_FORMAT)), RES_PARATR_DROP,        cppu::UnoType<css::style::DropCapFormat>::get()  , PROPERTY_NONE, MID_DROPCAP_FORMAT|CONVERT_TWIPS     },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DROP_CAP_WHOLE_WORD)), RES_PARATR_DROP,        cppu::UnoType<bool>::get()  ,         PROPERTY_NONE, MID_DROPCAP_WHOLE_WORD },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DROP_CAP_CHAR_STYLE_NAME)), RES_PARATR_DROP,        cppu::UnoType<OUString>::get()  ,       PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_KEEP_TOGETHER)), RES_KEEP,              cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_SPLIT)), RES_PARATR_SPLIT,      cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_WIDOWS)), RES_PARATR_WIDOWS,        cppu::UnoType<sal_Int8>::get(),PropertyAttribute::MAYBEVOID,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_ORPHANS)), RES_PARATR_ORPHANS,      cppu::UnoType<sal_Int8>::get(),PropertyAttribute::MAYBEVOID,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_EXPAND_SINGLE_WORD)), RES_PARATR_ADJUST,      cppu::UnoType<bool>::get()  ,         PROPERTY_NONE, MID_EXPAND_SINGLE   },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LAST_LINE_ADJUST)), RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_LAST_LINE_ADJUST},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LINE_NUMBER_COUNT)), RES_LINENUMBER,        cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_LINENUMBER_COUNT     },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LINE_NUMBER_START_VALUE)), RES_LINENUMBER,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_LINENUMBER_STARTVALUE},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LINE_SPACING)), RES_PARATR_LINESPACING, cppu::UnoType<css::style::LineSpacing>::get(),PROPERTY_NONE,     CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_ADJUST)), RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),         PROPERTY_NONE, MID_PARA_ADJUST},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_REGISTER_MODE_ACTIVE)), RES_PARATR_REGISTER,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_TOP_MARGIN)), RES_UL_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BOTTOM_MARGIN)), RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_CONTEXT_MARGIN)), RES_UL_SPACE,          cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_CTX_MARGIN},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_TOP_MARGIN_RELATIVE)), RES_UL_SPACE,        cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_UP_REL_MARGIN},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE)), RES_UL_SPACE,         cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_LO_REL_MARGIN},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT16),      PROPERTY_NONE, MID_TL_STYLE},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PROPERTY_NONE, MID_TL_COLOR},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),              PROPERTY_NONE, MID_TL_HASCOLOR},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT16),      PROPERTY_NONE, MID_TL_STYLE},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PROPERTY_NONE, MID_TL_COLOR},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_HAS_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),              PROPERTY_NONE, MID_TL_HASCOLOR},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_LEFT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_TXT_LMARGIN|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE,           CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_LEFT_MARGIN_RELATIVE), RES_LR_SPACE,          CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,        MID_L_REL_MARGIN},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_RIGHT_MARGIN_RELATIVE), RES_LR_SPACE,         CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,        MID_R_REL_MARGIN},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT), RES_LR_SPACE,          CPPU_E2T(CPPUTYPE_BOOLEAN),      PROPERTY_NONE, MID_FIRST_AUTO},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_FIRST_LINE_INDENT), RES_LR_SPACE,           CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_FIRST_LINE_INDENT_RELATIVE), RES_LR_SPACE,         CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_FIRST_LINE_REL_INDENT|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_KERNING), RES_CHRATR_KERNING    ,  CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,  CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_NO_HYPHENATION), RES_CHRATR_NOHYPHEN   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR,    CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_DROP_CAP_FORMAT), RES_PARATR_DROP,        CPPU_E2T(CPPUTYPE_DROPCAPFMT)  , PROPERTY_NONE, MID_DROPCAP_FORMAT|CONVERT_TWIPS     },\
+                    { SW_PROP_NMID(UNO_NAME_DROP_CAP_WHOLE_WORD), RES_PARATR_DROP,        CPPU_E2T(CPPUTYPE_BOOLEAN)  ,         PROPERTY_NONE, 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)  ,       PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_SPLIT), RES_PARATR_SPLIT,      CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     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_PARA_EXPAND_SINGLE_WORD), RES_PARATR_ADJUST,      CPPU_E2T(CPPUTYPE_BOOLEAN)  ,         PROPERTY_NONE, MID_EXPAND_SINGLE   },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_LAST_LINE_ADJUST), RES_PARATR_ADJUST,      CPPU_E2T(CPPUTYPE_INT16),       PROPERTY_NONE, MID_LAST_LINE_ADJUST},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_LINE_NUMBER_COUNT), RES_LINENUMBER,        CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_LINENUMBER_COUNT     },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_LINE_NUMBER_START_VALUE), RES_LINENUMBER,      CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_LINENUMBER_STARTVALUE},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_LINE_SPACING), RES_PARATR_LINESPACING, CPPU_E2T(CPPUTYPE_LINESPACE),PROPERTY_NONE,     CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_ADJUST), RES_PARATR_ADJUST,      CPPU_E2T(CPPUTYPE_INT16),         PROPERTY_NONE, MID_PARA_ADJUST},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_REGISTER_MODE_ACTIVE), RES_PARATR_REGISTER,    CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_TOP_MARGIN), RES_UL_SPACE,             CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_BOTTOM_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_CONTEXT_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_CTX_MARGIN},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_TOP_MARGIN_RELATIVE), RES_UL_SPACE,        CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_UP_REL_MARGIN},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE), RES_UL_SPACE,         CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_LO_REL_MARGIN},\
                     TABSTOPS_MAP_ENTRY\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WORD_MODE)), RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOW_FORMAT)), RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER)), RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER)), RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER)), RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER)), RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BORDER_DISTANCE)), RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BORDER_DISTANCE|CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER_DISTANCE)), RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER_DISTANCE)), RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER_DISTANCE)), RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER_DISTANCE)), RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_HYPHENATION)), RES_PARATR_HYPHENZONE,      cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN         },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS)), RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD   },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS)), RES_PARATR_HYPHENZONE,        cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL  },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS)), RES_PARATR_HYPHENZONE,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_STYLE_NAME)), RES_PARATR_NUMRULE,  cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,   0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_SHADOW_FORMAT)), RES_SHADOW,    cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_IS_ON)), RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_PREFIX)), RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_SUFFIX)), RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_EMPHASIS)), RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_HANGING_PUNCTUATION)), RES_PARATR_HANGINGPUNCTUATION,  cppu::UnoType<bool>::get(),   PROPERTY_NONE ,0     },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_CHARACTER_DISTANCE)), RES_PARATR_SCRIPTSPACE,         cppu::UnoType<bool>::get(),    PROPERTY_NONE ,0     },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_FORBIDDEN_RULES)), RES_PARATR_FORBIDDEN_RULES,     cppu::UnoType<bool>::get(),    PROPERTY_NONE ,0    },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_VERT_ALIGNMENT)), RES_PARATR_VERTALIGN,             cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , 0  },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION)), RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE)), RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SCALE_WIDTH)), RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RELIEF)), RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_WORD_MODE), RES_CHRATR_WORDLINEMODE,CPPU_E2T(CPPUTYPE_BOOLEAN)  ,    PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SHADOW_FORMAT), RES_CHRATR_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},\
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX,              CPPU_E2T(CPPUTYPE_BORDERLINE),  0, LEFT_BORDER  |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX,             CPPU_E2T(CPPUTYPE_BORDERLINE),  0, RIGHT_BORDER |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX,               CPPU_E2T(CPPUTYPE_BORDERLINE),  0, TOP_BORDER   |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),  0, BOTTOM_BORDER|CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, BORDER_DISTANCE|CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX,             CPPU_E2T(CPPUTYPE_INT32),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },\
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX,               CPPU_E2T(CPPUTYPE_INT32),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
+                    { 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_NUMBERING_STYLE_NAME), RES_PARATR_NUMRULE,  CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,   0},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_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),     PROPERTY_NONE, MID_TWOLINES},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_PREFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, MID_START_BRACKET},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, MID_END_BRACKET},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK,           CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE, MID_EMPHASIS},\
+                    { SW_PROP_NMID(UNO_NAME_PARA_IS_HANGING_PUNCTUATION), RES_PARATR_HANGINGPUNCTUATION,  CPPU_E2T(CPPUTYPE_BOOLEAN),   PROPERTY_NONE ,0     },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_IS_CHARACTER_DISTANCE), RES_PARATR_SCRIPTSPACE,         CPPU_E2T(CPPUTYPE_BOOLEAN),    PROPERTY_NONE ,0     },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_IS_FORBIDDEN_RULES), RES_PARATR_FORBIDDEN_RULES,     CPPU_E2T(CPPUTYPE_BOOLEAN),    PROPERTY_NONE ,0    },\
+                    { SW_PROP_NMID(UNO_NAME_PARA_VERT_ALIGNMENT), RES_PARATR_VERTALIGN,             CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE , 0  },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION), RES_CHRATR_ROTATE,      CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,    MID_ROTATE      },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE,       CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE,        MID_FITTOLINE  },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW,       CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,         0 },\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF,      CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE,      MID_RELIEF },\
                     _PROP_DIFF_FONTHEIGHT\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOLLOW_STYLE)), FN_UNO_FOLLOW_STYLE,     cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PHYSICAL)), FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTO_UPDATE)), FN_UNO_IS_AUTO_UPDATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DISPLAY_NAME)), FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CATEGORY)), FN_UNO_CATEGORY, cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE , 0 },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_CONNECT_BORDER)), RES_PARATR_CONNECT_BORDER, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SNAP_TO_GRID)), RES_PARATR_SNAPTOGRID, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_OUTLINE_LEVEL)), RES_PARATR_OUTLINELEVEL,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HIDDEN)), FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_STYLE_INTEROP_GRAB_BAG)), FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_FOLLOW_STYLE), FN_UNO_FOLLOW_STYLE,     CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL,     CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},\
+                    { SW_PROP_NMID(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},\
+                    { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},\
+                    { SW_PROP_NMID(UNO_NAME_CATEGORY), FN_UNO_CATEGORY, CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE , 0 },\
+                    { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 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_SNAP_TO_GRID), RES_PARATR_SNAPTOGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0 }, \
+                    { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL,CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, \
+                    { SW_PROP_NMID(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
+                    { SW_PROP_NMID(UNO_NAME_STYLE_INTEROP_GRAB_BAG), FN_UNO_STYLE_INTEROP_GRAB_BAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0},
 
 
 #define COMMON_FLDTYP_PROPERTIES \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIELD_USED)),      FIELD_PROP_IS_FIELD_USED,      cppu::UnoType<float>::get(), PropertyAttribute::READONLY, 0},\
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIELD_DISPLAYED)), FIELD_PROP_IS_FIELD_DISPLAYED, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::READONLY, 0},\
+                    { SW_PROP_NMID(UNO_NAME_IS_FIELD_USED),      FIELD_PROP_IS_FIELD_USED,      CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::READONLY, 0},\
+                    { SW_PROP_NMID(UNO_NAME_IS_FIELD_DISPLAYED), FIELD_PROP_IS_FIELD_DISPLAYED, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::READONLY, 0},\
 
 #define COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_COLOR)), RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        }, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COLOR)), RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},  \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CONTOURED)), RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},  \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_EMPHASIS)), RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},   \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT)), RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },  \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_NAME)), RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HEIGHT)), RES_CHRATR_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},    \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_POSTURE)), RES_CHRATR_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOWED)), RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},  \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STRIKEOUT)), RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},   \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_COLOR)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PropertyAttribute::MAYBEVOID, MID_TL_COLOR},    \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WEIGHT)), RES_CHRATR_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},  \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_LEVEL)), RES_PARATR_LIST_LEVEL,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),              PropertyAttribute::MAYBEVOID, MID_TL_STYLE},    \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_RULES)), RES_PARATR_NUMRULE,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},    \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_ADJUST)), RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_BOTTOM_MARGIN)), RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_LO_MARGIN|CONVERT_TWIPS}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_FIRST_LINE_INDENT)), RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),      PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT|CONVERT_TWIPS}, \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LEFT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN|CONVERT_TWIPS},   \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_LINE_SPACING)), RES_PARATR_LINESPACING, cppu::UnoType<css::style::LineSpacing>::get(),       PropertyAttribute::MAYBEVOID,     CONVERT_TWIPS},   \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_RIGHT_MARGIN)), RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},  \
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABSTOPS)), RES_PARATR_TABSTOP,   cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND,    CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        }, \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR,      CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE, 0},  \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR,    CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},  \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK,           CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE, MID_EMPHASIS},   \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT,  CPPU_E2T(CPPUTYPE_INT16),             PROPERTY_NONE, MID_ESC          },  \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT,       CPPU_E2T(CPPUTYPE_OUSTRING),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT), RES_CHRATR_FONTSIZE  ,  CPPU_E2T(CPPUTYPE_FLOAT),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},    \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE), RES_CHRATR_POSTURE   ,  CPPU_E2T(CPPUTYPE_FONTSLANT),        PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 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_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PropertyAttribute::MAYBEVOID, MID_TL_COLOR},    \
+                    { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT), RES_CHRATR_WEIGHT    ,  CPPU_E2T(CPPUTYPE_FLOAT),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},  \
+                    { SW_PROP_NMID(UNO_NAME_NUMBERING_LEVEL), RES_PARATR_LIST_LEVEL,CPPU_E2T(CPPUTYPE_INT16), 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_NUMBERING_RULES), RES_PARATR_NUMRULE,CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},    \
+                    { 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_BOTTOM_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_LO_MARGIN|CONVERT_TWIPS}, \
+                    { 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_PARA_LEFT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN|CONVERT_TWIPS},   \
+                    { 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_RIGHT_MARGIN), RES_LR_SPACE,           CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},  \
+                    { SW_PROP_NMID(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP,   CPPU_E2T(CPPUTYPE_SEQTABSTOP),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
 
 
 const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId)
@@ -578,120 +533,120 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
         {
             case PROPERTY_MAP_TEXT_CURSOR:
             {
-                static SfxItemPropertyMapEntry const aCharAndParaMap_Impl[] =
+                static SfxItemPropertyMapEntry aCharAndParaMap_Impl[] =
                 {
                     COMPLETE_TEXT_CURSOR_MAP
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aCharAndParaMap_Impl;
             }
             break;
             case PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE:
             {
-                static SfxItemPropertyMapEntry const aAccessibilityTextAttrMap_Impl[] =
+                static SfxItemPropertyMapEntry aAccessibilityTextAttrMap_Impl[] =
                 {
                     COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aAccessibilityTextAttrMap_Impl;
             }
             break;
             case PROPERTY_MAP_PARAGRAPH:
             {
-                static SfxItemPropertyMapEntry const aParagraphMap_Impl[] =
+                static SfxItemPropertyMapEntry aParagraphMap_Impl[] =
                 {
                     COMMON_CRSR_PARA_PROPERTIES_2
                     TABSTOPS_MAP_ENTRY
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAME)), RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAMES)), FN_UNO_CHARFMT_SEQUENCE,  cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),     PropertyAttribute::MAYBEVOID,     0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT,     CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,     0},\
+                    { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAMES), FN_UNO_CHARFMT_SEQUENCE,  CPPU_E2T(CPPUTYPE_OUSTRINGS),     PropertyAttribute::MAYBEVOID,     0},\
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aParagraphMap_Impl;
             }
             break;
             case PROPERTY_MAP_PARA_AUTO_STYLE :
             {
-                static SfxItemPropertyMapEntry const aAutoParaStyleMap [] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLE_NAME)), RES_FRMATR_STYLE_NAME,        cppu::UnoType<OUString>::get(),                PropertyAttribute::MAYBEVOID,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_STYLE_NAME)), FN_UNO_PAGE_STYLE,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_IS_NUMBER)), FN_UNO_IS_NUMBER,     cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_LEVEL)), FN_UNO_NUM_LEVEL,     cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_START_VALUE)), FN_UNO_NUM_START_VALUE, cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_INDEX)), FN_UNO_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_TABLE)), FN_UNO_TEXT_TABLE,     cppu::UnoType<css::text::XTextTable>::get(),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CELL)), FN_UNO_CELL,         cppu::UnoType<css::table::XCell>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_FRAME)), FN_UNO_TEXT_FRAME,     cppu::UnoType<css::text::XTextFrame>::get(),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_SECTION)), FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL)), FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME)), RES_FRMATR_CONDITIONAL_STYLE_NAME,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_IS_NUMBERING_RESTART)), FN_NUMBER_NEWSTART,     cppu::UnoType<bool>::get(),     PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_OUTLINE_LEVEL)), RES_PARATR_OUTLINELEVEL,        cppu::UnoType<sal_Int16>::get(),                PropertyAttribute::MAYBEVOID,     0},
+                static SfxItemPropertyMapEntry aAutoParaStyleMap [] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLE_NAME), RES_FRMATR_STYLE_NAME,        CPPU_E2T(CPPUTYPE_OUSTRING),                PropertyAttribute::MAYBEVOID,     0},                                                       \
+                    { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), FN_UNO_PAGE_STYLE,        CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},                       \
+                    { SW_PROP_NMID(UNO_NAME_NUMBERING_IS_NUMBER), FN_UNO_IS_NUMBER,     CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
+                    { SW_PROP_NMID(UNO_NAME_NUMBERING_LEVEL), FN_UNO_NUM_LEVEL,     CPPU_E2T(CPPUTYPE_INT16),           PropertyAttribute::MAYBEVOID, 0},                                                            \
+                    { SW_PROP_NMID(UNO_NAME_NUMBERING_START_VALUE), FN_UNO_NUM_START_VALUE, CPPU_E2T(CPPUTYPE_INT16),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                                                \
+                    { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX), FN_UNO_DOCUMENT_INDEX, CPPU_E2T(CPPUTYPE_REFDOCINDEX), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },            \
+                    { SW_PROP_NMID(UNO_NAME_TEXT_TABLE), FN_UNO_TEXT_TABLE,     CPPU_E2T(CPPUTYPE_REFTXTTABLE),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },               \
+                    { SW_PROP_NMID(UNO_NAME_CELL), FN_UNO_CELL,         CPPU_E2T(CPPUTYPE_REFCELL),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
+                    { SW_PROP_NMID(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME,     CPPU_E2T(CPPUTYPE_REFTEXTFRAME),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
+                    { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                    \
+                    { SW_PROP_NMID(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL), FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},                                                     \
+                    { SW_PROP_NMID(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME), RES_FRMATR_CONDITIONAL_STYLE_NAME,        CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},                       \
+                    { SW_PROP_NMID(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART,     CPPU_E2T(CPPUTYPE_BOOLEAN),     PropertyAttribute::MAYBEVOID, 0 },                       \
+                    { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL,        CPPU_E2T(CPPUTYPE_INT16),                PropertyAttribute::MAYBEVOID,     0},
                     COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN
                     TABSTOPS_MAP_ENTRY
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_AUTO_STYLE_NAME)), RES_AUTO_STYLE,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_PARA_AUTO_STYLE_NAME), RES_AUTO_STYLE,     CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,     0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aAutoParaStyleMap;
             }
             break;
             case PROPERTY_MAP_CHAR_STYLE :
             {
-                static SfxItemPropertyMapEntry const aCharStyleMap   [] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_AUTO_KERNING)), RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_TRANSPARENT)), RES_CHRATR_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_COLOR)), RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIGHLIGHT)), RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_BACK_COLOR },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CASE_MAP)), RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COLOR)), RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STRIKEOUT)), RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CROSSED_OUT)), RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT)), RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT)), RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FLASH)), RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIDDEN)), RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                static SfxItemPropertyMapEntry aCharStyleMap   [] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_KERNING), RES_CHRATR_AUTOKERN  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BACK_TRANSPARENT), RES_CHRATR_BACKGROUND,  CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND,    CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_HIGHLIGHT), RES_CHRATR_HIGHLIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_BACK_COLOR },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_CASE_MAP), RES_CHRATR_CASEMAP,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR,      CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE, 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)  ,        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT,  CPPU_E2T(CPPUTYPE_INT16),             PROPERTY_NONE, MID_ESC          },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT,     CPPU_E2T(CPPUTYPE_INT8)  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
                     _STANDARD_FONT_PROPERTIES
                     _CJK_FONT_PROPERTIES
                     _CTL_FONT_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_COLOR)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE)), RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE, MID_TL_STYLE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_COLOR)), RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),              PROPERTY_NONE, MID_TL_COLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_HAS_COLOR)), RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),            PROPERTY_NONE, MID_TL_HASCOLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_KERNING)), RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_NO_HYPHENATION)), RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOWED)), RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CONTOURED)), RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WORD_MODE)), RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PHYSICAL)), FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HIDDEN)), FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_STYLE_INTEROP_GRAB_BAG)), FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DISPLAY_NAME)), FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_IS_ON)), RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_PREFIX)), RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_SUFFIX)), RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_EMPHASIS)), RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT16),      PROPERTY_NONE, MID_TL_STYLE},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PROPERTY_NONE, MID_TL_COLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),              PROPERTY_NONE, MID_TL_HASCOLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE, MID_TL_STYLE},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT32),              PROPERTY_NONE, MID_TL_COLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_HAS_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),            PROPERTY_NONE, MID_TL_HASCOLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_KERNING), RES_CHRATR_KERNING    ,  CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,  CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_NO_HYPHENATION), RES_CHRATR_NOHYPHEN   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR,    CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_WORD_MODE), RES_CHRATR_WORDLINEMODE,CPPU_E2T(CPPUTYPE_BOOLEAN)  ,    PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL,     CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_STYLE_INTEROP_GRAB_BAG), FN_UNO_STYLE_INTEROP_GRAB_BAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_IS_ON), RES_CHRATR_TWO_LINES,          CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, MID_TWOLINES},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_PREFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, MID_START_BRACKET},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, MID_END_BRACKET},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK,           CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE, MID_EMPHASIS},
                     _PROP_DIFF_FONTHEIGHT
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION)), RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE)), RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SCALE_WIDTH)), RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RELIEF)), RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOW_FORMAT)), RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION), RES_CHRATR_ROTATE,      CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,    MID_ROTATE      },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE,       CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE,        MID_FITTOLINE  },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW,       CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,         0 },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF,      CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE,      MID_RELIEF },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SHADOW_FORMAT), RES_CHRATR_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aCharStyleMap;
             }
@@ -699,368 +654,368 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             case PROPERTY_MAP_CHAR_AUTO_STYLE :
             {
                 // same as PROPERTY_MAP_TEXTPORTION_EXTENSIONS
-                static SfxItemPropertyMapEntry const aAutoCharStyleMap   [] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_AUTO_KERNING)), RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_TRANSPARENT)), RES_CHRATR_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BACK_COLOR)), RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIGHLIGHT)), RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_BACK_COLOR },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CASE_MAP)), RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COLOR)), RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STRIKEOUT)), RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CROSSED_OUT)), RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT)), RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT)), RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FLASH)), RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_HIDDEN)), RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                static SfxItemPropertyMapEntry aAutoCharStyleMap   [] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_KERNING), RES_CHRATR_AUTOKERN  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BACK_TRANSPARENT), RES_CHRATR_BACKGROUND,  CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND,    CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_HIGHLIGHT), RES_CHRATR_HIGHLIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_BACK_COLOR },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_CASE_MAP), RES_CHRATR_CASEMAP,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR,      CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE, 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)  ,        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT,  CPPU_E2T(CPPUTYPE_INT16),             PROPERTY_NONE, MID_ESC          },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT,     CPPU_E2T(CPPUTYPE_INT8)  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
                     _STANDARD_FONT_PROPERTIES
                     _CJK_FONT_PROPERTIES
                     _CTL_FONT_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_COLOR)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR)), RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE)), RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_COLOR)), RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_OVERLINE_HAS_COLOR)), RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_KERNING)), RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_NO_HYPHENATION)), RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOWED)), RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_CONTOURED)), RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_WORD_MODE)), RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES)), RES_TXTATR_UNKNOWN_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PHYSICAL)), FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DISPLAY_NAME)), FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_IS_ON)), RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_PREFIX)), RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_COMBINE_SUFFIX)), RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_EMPHASIS)), RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION)), RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE)), RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SCALE_WIDTH)), RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RELIEF)), RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_AUTO_STYLE_NAME)), RES_TXTATR_AUTOFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADING_VALUE)), RES_CHRATR_BACKGROUND,      cppu::UnoType<sal_Int32>::get(),    PROPERTY_NONE,      MID_SHADING_VALUE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER)), RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_TOP_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE)), RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_SHADOW_FORMAT)), RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT16),      PROPERTY_NONE, MID_TL_STYLE},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PROPERTY_NONE, MID_TL_COLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),              PROPERTY_NONE, MID_TL_HASCOLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT16),      PROPERTY_NONE, MID_TL_STYLE},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PROPERTY_NONE, MID_TL_COLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_HAS_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),              PROPERTY_NONE, MID_TL_HASCOLOR},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_KERNING), RES_CHRATR_KERNING    ,  CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,  CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_NO_HYPHENATION), RES_CHRATR_NOHYPHEN   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR,    CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_WORD_MODE), RES_CHRATR_WORDLINEMODE,CPPU_E2T(CPPUTYPE_BOOLEAN)  ,    PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_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_IS_PHYSICAL), FN_UNO_IS_PHYSICAL,     CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_IS_ON), RES_CHRATR_TWO_LINES,          CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, MID_TWOLINES},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_PREFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, MID_START_BRACKET},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, MID_END_BRACKET},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK,           CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE, MID_EMPHASIS},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION), RES_CHRATR_ROTATE,      CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,    MID_ROTATE      },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE,       CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE,        MID_FITTOLINE  },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW,       CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,         0 },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF,      CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE,      MID_RELIEF },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_STYLE_NAME), RES_TXTATR_AUTOFMT,     CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,     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_CHAR_LEFT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_SHADOW_FORMAT), RES_CHRATR_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aAutoCharStyleMap;
             }
             break;
             case PROPERTY_MAP_RUBY_AUTO_STYLE :
             {
-                static SfxItemPropertyMapEntry const aAutoRubyStyleMap [] =
+                static SfxItemPropertyMapEntry aAutoRubyStyleMap [] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RUBY_ADJUST)), RES_TXTATR_CJK_RUBY,  cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID,          MID_RUBY_ADJUST },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RUBY_IS_ABOVE)), RES_TXTATR_CJK_RUBY,    cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID,     MID_RUBY_ABOVE },
-                    {}
+                    { 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_IS_ABOVE), RES_TXTATR_CJK_RUBY,    CPPU_E2T(CPPUTYPE_BOOLEAN),  PropertyAttribute::MAYBEVOID,     MID_RUBY_ABOVE },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aAutoRubyStyleMap;
             }
             break;
             case PROPERTY_MAP_PARA_STYLE :
             {
-                static SfxItemPropertyMapEntry const aParaStyleMap [] =
+                static SfxItemPropertyMapEntry aParaStyleMap [] =
                 {
                     COMMON_PARA_STYLE_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aParaStyleMap;
             }
             break;
             case PROPERTY_MAP_CONDITIONAL_PARA_STYLE :
             {
-                static SfxItemPropertyMapEntry const aParaStyleMap [] =
+                static SfxItemPropertyMapEntry aParaStyleMap [] =
                 {
                     COMMON_PARA_STYLE_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLE_CONDITIONS)), FN_UNO_PARA_STYLE_CONDITIONS, cppu::UnoType< cppu::UnoSequenceType<css::beans::NamedValue> >::get(), PropertyAttribute::MAYBEVOID, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLE_CONDITIONS), FN_UNO_PARA_STYLE_CONDITIONS, CPPU_E2T(CPPUTYPE_SEQNAMEDVALUE), PropertyAttribute::MAYBEVOID, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aParaStyleMap;
             }
             break;
             case PROPERTY_MAP_FRAME_STYLE:
             {
-                static SfxItemPropertyMapEntry const aFrameStyleMap   [] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_PAGE_NO)), RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_TYPE)), RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR_R_G_B)), RES_BACKGROUND,      cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR_TRANSPARENCY)), RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILL_STYLE)), RES_FILL_STYLE,      cppu::UnoType<css::drawing::FillStyle>::get(), PROPERTY_NONE ,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILL_GRADIENT)), RES_FILL_GRADIENT,      cppu::UnoType<css::awt::Gradient>::get(), PROPERTY_NONE ,MID_FILLGRADIENT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILL_GRADIENT_NAME)), RES_FILL_GRADIENT, cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_NAME},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_INTEROP_GRAB_BAG)), RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
-                //  { OUString::createFromAscii(GetPropName(UNO_NAME_CHAIN_NEXT_NAME)), RES_CHAIN,                cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_CHAIN_NEXTNAME},
-                //  { OUString::createFromAscii(GetPropName(UNO_NAME_CHAIN_PREV_NAME)), RES_CHAIN,                cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_CHAIN_PREVNAME},
-                /*not impl*/    { OUString::createFromAscii(GetPropName(UNO_NAME_CLIENT_MAP)), RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT_PROTECTED)), RES_PROTECT,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_CONTENT   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_EDIT_IN_READONLY)), RES_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                //  { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC)), RES_BACKGROUND,       &,                              PROPERTY_NONE, MID_GRAPHIC
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                static SfxItemPropertyMapEntry aFrameStyleMap   [] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR,            CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },
+                    { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR,           CPPU_E2T(CPPUTYPE_TXTCNTANCHOR),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR_R_G_B), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR_TRANSPARENCY), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},    \
+                    { SW_PROP_NMID(UNO_NAME_FILL_STYLE), RES_FILL_STYLE,      CPPU_E2T(CPPUTYPE_FILLSTYLE), PROPERTY_NONE ,0},
+                    { SW_PROP_NMID(UNO_NAME_FILL_GRADIENT), RES_FILL_GRADIENT,      CPPU_E2T(CPPUTYPE_GRADIENT), PROPERTY_NONE ,MID_FILLGRADIENT},
+                    { SW_PROP_NMID(UNO_NAME_FILL_GRADIENT_NAME), RES_FILL_GRADIENT, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_NAME},
+                    { SW_PROP_NMID(UNO_NAME_FRAME_INTEROP_GRAB_BAG), RES_FRMATR_GRABBAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0},
+                //  { SW_PROP_NMID(UNO_NAME_CHAIN_NEXT_NAME), RES_CHAIN,                CPPU_E2T(CPPUTYPE_OUSTRING),            PROPERTY_NONE ,MID_CHAIN_NEXTNAME},
+                //  { SW_PROP_NMID(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN,                CPPU_E2T(CPPUTYPE_OUSTRING),            PROPERTY_NONE ,MID_CHAIN_PREVNAME},
+                /*not impl*/    { SW_PROP_NMID(UNO_NAME_CLIENT_MAP), RES_URL,               CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
+                    { SW_PROP_NMID(UNO_NAME_CONTENT_PROTECTED), RES_PROTECT,            CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_PROTECT_CONTENT   },
+                    { SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), RES_EDIT_IN_READONLY,    CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                //  { SW_PROP_NMID(UNO_NAME_GRAPHIC), RES_BACKGROUND,       &,                              PROPERTY_NONE, MID_GRAPHIC
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
                     // #i50322# - add missing map entry for transparency of graphic background
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_TRANSPARENCY)), RES_BACKGROUND, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_MARGIN)), RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT)), RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT_POSITION)), RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT_RELATION)), RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_U_R_L)), RES_URL,                 cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_URL_URL},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_TARGET)), RES_URL,                cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_URL_TARGET},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HYPER_LINK_NAME)), RES_URL,              cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_OPAQUE)), RES_OPAQUE,            cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_TOGGLE)), RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_POSITION_PROTECTED)), RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PRINT)), RES_PRINT,              cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH)), RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEIGHT)), RES_FRM_SIZE,          cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RELATIVE_HEIGHT)), RES_FRM_SIZE,         cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RELATIVE_WIDTH)), RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE_TYPE)), RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH_TYPE)), RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE)), RES_FRM_SIZE,            cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT)), RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH)), RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },
-                //  { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH)), RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH            },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_FORMAT)), RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_TRANSPARENCE)), RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SERVER_MAP)), RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_SERVERMAP         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE_PROTECTED)), RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_SIZE    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_TRANSPARENCY), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},
+                    { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE,             CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
+                    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_POSITION), RES_HORI_ORIENT,     CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    },
+                    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_RELATION), RES_HORI_ORIENT,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },
+                    { SW_PROP_NMID(UNO_NAME_HYPER_LINK_U_R_L), RES_URL,                 CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_URL},
+                    { SW_PROP_NMID(UNO_NAME_HYPER_LINK_TARGET), RES_URL,                CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_TARGET},
+                    { SW_PROP_NMID(UNO_NAME_HYPER_LINK_NAME), RES_URL,              CPPU_E2T(CPPUTYPE_OUSTRING),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },
+                    { SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE,            CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_PAGE_TOGGLE), RES_HORI_ORIENT,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
+                    { SW_PROP_NMID(UNO_NAME_POSITION_PROTECTED), RES_PROTECT,           CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_PROTECT_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_PRINT), RES_PRINT,              CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_WIDTH), RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
+                    { SW_PROP_NMID(UNO_NAME_HEIGHT), RES_FRM_SIZE,          CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
+                    { SW_PROP_NMID(UNO_NAME_RELATIVE_HEIGHT), RES_FRM_SIZE,         CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },
+                    { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), RES_FRM_SIZE,          CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },
+                    { SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
+                    { SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE,          CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
+                    { SW_PROP_NMID(UNO_NAME_SIZE), RES_FRM_SIZE,            CPPU_E2T(CPPUTYPE_AWTSIZE),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT), RES_FRM_SIZE,         CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },
+                    { SW_PROP_NMID(UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH), RES_FRM_SIZE,         CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },
+                //  { SW_PROP_NMID(UNO_NAME_WIDTH), RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH            },
+                    { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW,             CPPU_E2T(CPPUTYPE_SHADOWFMT),   PROPERTY_NONE, CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_SHADOW_TRANSPARENCE), RES_SHADOW,       CPPU_E2T(CPPUTYPE_INT16),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
+                    { SW_PROP_NMID(UNO_NAME_SERVER_MAP), RES_URL,               CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_URL_SERVERMAP         },
+                    { SW_PROP_NMID(UNO_NAME_SIZE_PROTECTED), RES_PROTECT,           CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_PROTECT_SIZE    },
                     //Surround bleibt, weil es mit der 5.1 ausgeliefert wurde, obwohl es mit text::WrapTextMode identisch ist
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND)), RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),    PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_WRAP)), RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND_ANCHORONLY)), RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND_CONTOUR)), RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTOUR_OUTSIDE)), RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_MARGIN)), RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_MARGIN)), RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT)), RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT_POSITION)), RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT_RELATION)), RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER)), RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER)), RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER)), RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER)), RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BORDER_DISTANCE)), RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER_DISTANCE)), RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER_DISTANCE)), RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER_DISTANCE)), RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER_DISTANCE)), RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PHYSICAL)), FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTO_UPDATE)), FN_UNO_IS_AUTO_UPDATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DISPLAY_NAME)), FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_SURROUND), RES_SURROUND,          CPPU_E2T(CPPUTYPE_WRAPTXTMODE),    PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), RES_SURROUND,           CPPU_E2T(CPPUTYPE_WRAPTXTMODE),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
+                    { SW_PROP_NMID(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND,             CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },
+                    { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND,            CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
+                    { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND,             CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE,           CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_POSITION), RES_VERT_ORIENT,     CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    },
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_RELATION), RES_VERT_ORIENT,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX,              CPPU_E2T(CPPUTYPE_BORDERLINE),  0, LEFT_BORDER  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX,             CPPU_E2T(CPPUTYPE_BORDERLINE),  0, RIGHT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX,               CPPU_E2T(CPPUTYPE_BORDERLINE),  0, TOP_BORDER   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX,    CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX,             CPPU_E2T(CPPUTYPE_INT32),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX,               CPPU_E2T(CPPUTYPE_INT32),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL,     CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
                     // #i18732#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_FOLLOWING_TEXT_FLOW)), RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
                     // #i28701#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRAP_INFLUENCE_ON_POSITION)), RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HIDDEN)), FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_WRAP_INFLUENCE_ON_POSITION), RES_WRAP_INFLUENCE_ON_OBJPOS, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_WRAP_INFLUENCE},
+                    { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aFrameStyleMap;
             }
             break;
             case PROPERTY_MAP_PAGE_STYLE :
             {
-                static SfxItemPropertyMapEntry const aPageStyleMap   [] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                //  { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC)), RES_BACKGROUND,       &,                              PROPERTY_NONE, MID_GRAPHIC
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_MARGIN)), RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER)), RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER)), RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER)), RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER)), RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BORDER_DISTANCE)), RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER_DISTANCE)), RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER_DISTANCE)), RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER_DISTANCE)), RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER_DISTANCE)), RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_FORMAT)), RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_TRANSPARENCE)), RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
+                static SfxItemPropertyMapEntry aPageStyleMap   [] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                //  { SW_PROP_NMID(UNO_NAME_GRAPHIC), RES_BACKGROUND,       &,                              PROPERTY_NONE, MID_GRAPHIC
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE,             CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX,              CPPU_E2T(CPPUTYPE_BORDERLINE),  0, LEFT_BORDER  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX,             CPPU_E2T(CPPUTYPE_BORDERLINE),  0, RIGHT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX,               CPPU_E2T(CPPUTYPE_BORDERLINE),  0, TOP_BORDER   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX,    CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX,             CPPU_E2T(CPPUTYPE_INT32),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX,               CPPU_E2T(CPPUTYPE_INT32),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW,             CPPU_E2T(CPPUTYPE_SHADOWFMT),   PROPERTY_NONE, CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_SHADOW_TRANSPARENCE), RES_SHADOW,       CPPU_E2T(CPPUTYPE_INT16),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
 
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_BACK_COLOR)), FN_UNO_HEADER_BACKGROUND,   cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                //  { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_GRAPHIC)), FN_UNO_HEADER_BACKGROUND,  &,                              PROPERTY_NONE, MID_GRAPHIC
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_GRAPHIC_URL)), FN_UNO_HEADER_BACKGROUND,          cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_GRAPHIC_FILTER)), FN_UNO_HEADER_BACKGROUND,           cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_GRAPHIC_LOCATION)), FN_UNO_HEADER_BACKGROUND,     cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_LEFT_MARGIN)), FN_UNO_HEADER_LR_SPACE,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_RIGHT_MARGIN)), FN_UNO_HEADER_LR_SPACE,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_BACK_TRANSPARENT)), FN_UNO_HEADER_BACKGROUND,     cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_LEFT_BORDER)), FN_UNO_HEADER_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_RIGHT_BORDER)), FN_UNO_HEADER_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_TOP_BORDER)), FN_UNO_HEADER_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_BOTTOM_BORDER)), FN_UNO_HEADER_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_BORDER_DISTANCE)), FN_UNO_HEADER_BOX,    cppu::UnoType<sal_Int32>::get(),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_LEFT_BORDER_DISTANCE)), FN_UNO_HEADER_BOX,                cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE)), FN_UNO_HEADER_BOX,               cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_TOP_BORDER_DISTANCE)), FN_UNO_HEADER_BOX,             cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE)), FN_UNO_HEADER_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_SHADOW_FORMAT)), FN_UNO_HEADER_SHADOW,        cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_BODY_DISTANCE)), FN_UNO_HEADER_BODY_DISTANCE,cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE ,MID_LO_MARGIN|CONVERT_TWIPS       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT)), FN_UNO_HEADER_IS_DYNAMIC_DISTANCE,cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_IS_SHARED)), FN_UNO_HEADER_SHARE_CONTENT,cppu::UnoType<bool>::get(),          PROPERTY_NONE ,0         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_HEIGHT)), FN_UNO_HEADER_HEIGHT,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_IS_ON)), FN_UNO_HEADER_ON,            cppu::UnoType<bool>::get(),         PROPERTY_NONE ,0         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_DYNAMIC_SPACING)), FN_UNO_HEADER_EAT_SPACING,            cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID ,0         },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_BACK_COLOR), FN_UNO_HEADER_BACKGROUND,   CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                //  { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC), FN_UNO_HEADER_BACKGROUND,  &,                              PROPERTY_NONE, MID_GRAPHIC
+                    { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_URL), FN_UNO_HEADER_BACKGROUND,          CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_FILTER), FN_UNO_HEADER_BACKGROUND,           CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_LOCATION), FN_UNO_HEADER_BACKGROUND,     CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_MARGIN), FN_UNO_HEADER_LR_SPACE,    CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_MARGIN), FN_UNO_HEADER_LR_SPACE,   CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_BACK_TRANSPARENT), FN_UNO_HEADER_BACKGROUND,     CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_BORDER), FN_UNO_HEADER_BOX,             CPPU_E2T(CPPUTYPE_BORDERLINE),  0, LEFT_BORDER  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_BORDER), FN_UNO_HEADER_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),  0, RIGHT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_TOP_BORDER), FN_UNO_HEADER_BOX,              CPPU_E2T(CPPUTYPE_BORDERLINE),  0, TOP_BORDER   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_BOTTOM_BORDER), FN_UNO_HEADER_BOX,               CPPU_E2T(CPPUTYPE_BORDERLINE),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_BORDER_DISTANCE), FN_UNO_HEADER_BOX,    CPPU_E2T(CPPUTYPE_INT32),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_BORDER_DISTANCE), FN_UNO_HEADER_BOX,                CPPU_E2T(CPPUTYPE_INT32),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE), FN_UNO_HEADER_BOX,               CPPU_E2T(CPPUTYPE_INT32),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_TOP_BORDER_DISTANCE), FN_UNO_HEADER_BOX,             CPPU_E2T(CPPUTYPE_INT32),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE), FN_UNO_HEADER_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_SHADOW_FORMAT), FN_UNO_HEADER_SHADOW,        CPPU_E2T(CPPUTYPE_SHADOWFMT),   PROPERTY_NONE, CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_BODY_DISTANCE), FN_UNO_HEADER_BODY_DISTANCE,CPPU_E2T(CPPUTYPE_INT32),            PROPERTY_NONE ,MID_LO_MARGIN|CONVERT_TWIPS       },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT), FN_UNO_HEADER_IS_DYNAMIC_DISTANCE,CPPU_E2T(CPPUTYPE_BOOLEAN),            PROPERTY_NONE ,0         },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_IS_SHARED), FN_UNO_HEADER_SHARE_CONTENT,CPPU_E2T(CPPUTYPE_BOOLEAN),          PROPERTY_NONE ,0         },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_HEIGHT), FN_UNO_HEADER_HEIGHT,       CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_IS_ON), FN_UNO_HEADER_ON,            CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,0         },
+                    { SW_PROP_NMID(UNO_NAME_HEADER_DYNAMIC_SPACING), FN_UNO_HEADER_EAT_SPACING,            CPPU_E2T(CPPUTYPE_BOOLEAN),         PropertyAttribute::MAYBEVOID ,0         },
 
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FIRST_IS_SHARED)), FN_UNO_FIRST_SHARE_CONTENT,cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_FIRST_IS_SHARED), FN_UNO_FIRST_SHARE_CONTENT,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
 
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_BACK_COLOR)), FN_UNO_FOOTER_BACKGROUND,   cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                //  { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_GRAPHIC)), FN_UNO_FOOTER_BACKGROUND,      &,                              PROPERTY_NONE, MID_GRAPHIC
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_GRAPHIC_URL)), FN_UNO_FOOTER_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_GRAPHIC_FILTER)), FN_UNO_FOOTER_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_GRAPHIC_LOCATION)), FN_UNO_FOOTER_BACKGROUND,     cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_LEFT_MARGIN)), FN_UNO_FOOTER_LR_SPACE,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_RIGHT_MARGIN)), FN_UNO_FOOTER_LR_SPACE,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_BACK_TRANSPARENT)), FN_UNO_FOOTER_BACKGROUND,     cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_LEFT_BORDER)), FN_UNO_FOOTER_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_RIGHT_BORDER)), FN_UNO_FOOTER_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_TOP_BORDER)), FN_UNO_FOOTER_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_BOTTOM_BORDER)), FN_UNO_FOOTER_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_BORDER_DISTANCE)), FN_UNO_FOOTER_BOX,    cppu::UnoType<sal_Int32>::get(),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE)), FN_UNO_FOOTER_BOX,                cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE)), FN_UNO_FOOTER_BOX,               cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_TOP_BORDER_DISTANCE)), FN_UNO_FOOTER_BOX,             cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE)), FN_UNO_FOOTER_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_SHADOW_FORMAT)), FN_UNO_FOOTER_SHADOW,        cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_BODY_DISTANCE)), FN_UNO_FOOTER_BODY_DISTANCE,cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE ,MID_UP_MARGIN|CONVERT_TWIPS       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT)), FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE,cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_IS_SHARED)), FN_UNO_FOOTER_SHARE_CONTENT,cppu::UnoType<bool>::get(),          PROPERTY_NONE ,0         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_HEIGHT)), FN_UNO_FOOTER_HEIGHT,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_IS_ON)), FN_UNO_FOOTER_ON,            cppu::UnoType<bool>::get(),         PROPERTY_NONE ,0         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_DYNAMIC_SPACING)), FN_UNO_FOOTER_EAT_SPACING,            cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID ,0         },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_BACK_COLOR), FN_UNO_FOOTER_BACKGROUND,   CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                //  { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC), FN_UNO_FOOTER_BACKGROUND,      &,                              PROPERTY_NONE, MID_GRAPHIC
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_URL), FN_UNO_FOOTER_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_FILTER), FN_UNO_FOOTER_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_LOCATION), FN_UNO_FOOTER_BACKGROUND,     CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_MARGIN), FN_UNO_FOOTER_LR_SPACE,    CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_MARGIN), FN_UNO_FOOTER_LR_SPACE,   CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_BACK_TRANSPARENT), FN_UNO_FOOTER_BACKGROUND,     CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_BORDER), FN_UNO_FOOTER_BOX,             CPPU_E2T(CPPUTYPE_BORDERLINE),  0, LEFT_BORDER  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_BORDER), FN_UNO_FOOTER_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),  0, RIGHT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_TOP_BORDER), FN_UNO_FOOTER_BOX,              CPPU_E2T(CPPUTYPE_BORDERLINE),  0, TOP_BORDER   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_BOTTOM_BORDER), FN_UNO_FOOTER_BOX,               CPPU_E2T(CPPUTYPE_BORDERLINE),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_BORDER_DISTANCE), FN_UNO_FOOTER_BOX,    CPPU_E2T(CPPUTYPE_INT32),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX,                CPPU_E2T(CPPUTYPE_INT32),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX,               CPPU_E2T(CPPUTYPE_INT32),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_TOP_BORDER_DISTANCE), FN_UNO_FOOTER_BOX,             CPPU_E2T(CPPUTYPE_INT32),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE), FN_UNO_FOOTER_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_SHADOW_FORMAT), FN_UNO_FOOTER_SHADOW,        CPPU_E2T(CPPUTYPE_SHADOWFMT),   PROPERTY_NONE, CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_BODY_DISTANCE), FN_UNO_FOOTER_BODY_DISTANCE,CPPU_E2T(CPPUTYPE_INT32),            PROPERTY_NONE ,MID_UP_MARGIN|CONVERT_TWIPS       },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT), FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE,CPPU_E2T(CPPUTYPE_BOOLEAN),            PROPERTY_NONE ,0         },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_IS_SHARED), FN_UNO_FOOTER_SHARE_CONTENT,CPPU_E2T(CPPUTYPE_BOOLEAN),          PROPERTY_NONE ,0         },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_HEIGHT), FN_UNO_FOOTER_HEIGHT,       CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_IS_ON), FN_UNO_FOOTER_ON,            CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,0         },
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_DYNAMIC_SPACING), FN_UNO_FOOTER_EAT_SPACING,            CPPU_E2T(CPPUTYPE_BOOLEAN),         PropertyAttribute::MAYBEVOID ,0         },
 
 
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_LANDSCAPE)), SID_ATTR_PAGE,           cppu::UnoType<bool>::get(),             PROPERTY_NONE ,MID_PAGE_ORIENTATION   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)), SID_ATTR_PAGE,             cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE , MID_PAGE_NUMTYPE       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_STYLE_LAYOUT)), SID_ATTR_PAGE,          cppu::UnoType<css::style::PageStyleLayout>::get(),    PROPERTY_NONE ,MID_PAGE_LAYOUT     },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PRINTER_PAPER_TRAY)), RES_PAPER_BIN,             cppu::UnoType<OUString>::get(),            PROPERTY_NONE , 0 },
-//                  { OUString::createFromAscii(GetPropName(UNO_NAME_REGISTER_MODE_ACTIVE)), SID_SWREGISTER_MODE,     cppu::UnoType<bool>::get(),             PROPERTY_NONE , 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_REGISTER_PARAGRAPH_STYLE)), SID_SWREGISTER_COLLECTION,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE , 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE)), SID_ATTR_PAGE_SIZE,  cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE,   MID_SIZE_SIZE|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH)), SID_ATTR_PAGE_SIZE,     cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_SIZE_WIDTH|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEIGHT)), SID_ATTR_PAGE_SIZE,    cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_SIZE_HEIGHT|CONVERT_TWIPS            },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_MARGIN)), RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_MARGIN)), RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_TEXT)), FN_UNO_HEADER,        cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_TEXT_LEFT)), FN_UNO_HEADER_LEFT,     cppu::UnoType<css::text::XText>::get(),          PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_TEXT_RIGHT)), FN_UNO_HEADER_RIGHT,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_TEXT_FIRST)), FN_UNO_HEADER_FIRST,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_TEXT)), FN_UNO_FOOTER,        cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_TEXT_LEFT)), FN_UNO_FOOTER_LEFT,  cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_TEXT_RIGHT)), FN_UNO_FOOTER_RIGHT,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTER_TEXT_FIRST)), FN_UNO_FOOTER_FIRST,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOLLOW_STYLE)), FN_UNO_FOLLOW_STYLE,     cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PHYSICAL)), FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DISPLAY_NAME)), FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_HEIGHT)), FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,       MID_FTN_HEIGHT|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_LINE_WEIGHT)), FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE ,     MID_LINE_WEIGHT|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_LINE_COLOR)), FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_COLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_LINE_STYLE)), FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int8>::get(),    PROPERTY_NONE , MID_FTN_LINE_STYLE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH)), FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE ,     MID_LINE_RELWIDTH    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_LINE_ADJUST)), FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE ,     MID_LINE_ADJUST     },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE)), FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_TEXT_DIST   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_LINE_DISTANCE)), FN_PARAM_FTN_INFO,         cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_FOOTNOTE_DIST|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_LANDSCAPE), SID_ATTR_PAGE,           CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE ,MID_PAGE_ORIENTATION   },
+                    { SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), SID_ATTR_PAGE,             CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE , MID_PAGE_NUMTYPE       },
+                    { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_LAYOUT), SID_ATTR_PAGE,          CPPU_E2T(CPPUTYPE_PAGESTYLELAY),    PROPERTY_NONE ,MID_PAGE_LAYOUT     },
+                    { SW_PROP_NMID(UNO_NAME_PRINTER_PAPER_TRAY), RES_PAPER_BIN,             CPPU_E2T(CPPUTYPE_OUSTRING),            PROPERTY_NONE , 0 },
+//                  { SW_PROP_NMID(UNO_NAME_REGISTER_MODE_ACTIVE), SID_SWREGISTER_MODE,     CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE , 0 },
+                    { SW_PROP_NMID(UNO_NAME_REGISTER_PARAGRAPH_STYLE), SID_SWREGISTER_COLLECTION,   CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE , 0 },
+                    { SW_PROP_NMID(UNO_NAME_SIZE), SID_ATTR_PAGE_SIZE,  CPPU_E2T(CPPUTYPE_AWTSIZE),             PROPERTY_NONE,   MID_SIZE_SIZE|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_WIDTH), SID_ATTR_PAGE_SIZE,     CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, MID_SIZE_WIDTH|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_HEIGHT), SID_ATTR_PAGE_SIZE,    CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, MID_SIZE_HEIGHT|CONVERT_TWIPS            },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE,           CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_TEXT), FN_UNO_HEADER,        CPPU_E2T(CPPUTYPE_REFTEXT),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_TEXT_LEFT), FN_UNO_HEADER_LEFT,     CPPU_E2T(CPPUTYPE_REFTEXT),          PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_TEXT_RIGHT), FN_UNO_HEADER_RIGHT,    CPPU_E2T(CPPUTYPE_REFTEXT),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_TEXT_FIRST), FN_UNO_HEADER_FIRST,    CPPU_E2T(CPPUTYPE_REFTEXT),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT), FN_UNO_FOOTER,        CPPU_E2T(CPPUTYPE_REFTEXT),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT_LEFT), FN_UNO_FOOTER_LEFT,  CPPU_E2T(CPPUTYPE_REFTEXT),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT_RIGHT), FN_UNO_FOOTER_RIGHT,    CPPU_E2T(CPPUTYPE_REFTEXT),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT_FIRST), FN_UNO_FOOTER_FIRST,    CPPU_E2T(CPPUTYPE_REFTEXT),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_FOLLOW_STYLE), FN_UNO_FOLLOW_STYLE,     CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL,     CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_HEIGHT), FN_PARAM_FTN_INFO,        CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,       MID_FTN_HEIGHT|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_WEIGHT), FN_PARAM_FTN_INFO,       CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE ,     MID_LINE_WEIGHT|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_COLOR), FN_PARAM_FTN_INFO,        CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE ,     MID_LINE_COLOR},
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_STYLE), FN_PARAM_FTN_INFO,        CPPU_E2T(CPPUTYPE_INT8),    PROPERTY_NONE , MID_FTN_LINE_STYLE},
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH), FN_PARAM_FTN_INFO,       CPPU_E2T(CPPUTYPE_INT8),        PROPERTY_NONE ,     MID_LINE_RELWIDTH    },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_ADJUST), FN_PARAM_FTN_INFO,       CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE ,     MID_LINE_ADJUST     },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE), FN_PARAM_FTN_INFO,        CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE ,     MID_LINE_TEXT_DIST   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_DISTANCE), FN_PARAM_FTN_INFO,         CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE ,     MID_LINE_FOOTNOTE_DIST|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
                         // writing grid
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_COLOR)), RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_COLOR},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_LINES)), RES_TEXTGRID, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_GRID_LINES},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_BASE_HEIGHT)), RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_BASEHEIGHT|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_RUBY_HEIGHT)), RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_RUBYHEIGHT|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_MODE)), RES_TEXTGRID, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_GRID_TYPE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_RUBY_BELOW)), RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_RUBY_BELOW},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_PRINT)), RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_PRINT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_DISPLAY)), RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_DISPLAY},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_BASE_WIDTH)), RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_BASEWIDTH|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_SNAP_TO_CHARS)), RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_SNAPTOCHARS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_STANDARD_PAGE_MODE)), RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HIDDEN)), FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_GRID_COLOR), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_GRID_COLOR},
+                    { SW_PROP_NMID(UNO_NAME_GRID_LINES), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_GRID_LINES},
+                    { SW_PROP_NMID(UNO_NAME_GRID_BASE_HEIGHT), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_GRID_BASEHEIGHT|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_GRID_RUBY_HEIGHT), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_GRID_RUBYHEIGHT|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_GRID_MODE), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_GRID_TYPE},
+                    { SW_PROP_NMID(UNO_NAME_GRID_RUBY_BELOW), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_RUBY_BELOW},
+                    { SW_PROP_NMID(UNO_NAME_GRID_PRINT), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_PRINT},
+                    { SW_PROP_NMID(UNO_NAME_GRID_DISPLAY), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_DISPLAY},
+                    { SW_PROP_NMID(UNO_NAME_GRID_BASE_WIDTH), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_GRID_BASEWIDTH|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_GRID_SNAP_TO_CHARS), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_SNAPTOCHARS},
+                    { SW_PROP_NMID(UNO_NAME_GRID_STANDARD_PAGE_MODE), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
+                    { SW_PROP_NMID(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aPageStyleMap;
             }
             break;
             case PROPERTY_MAP_NUM_STYLE  :
             {
-                static SfxItemPropertyMapEntry const aNumStyleMap        [] =
+                static SfxItemPropertyMapEntry aNumStyleMap        [] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_RULES)), FN_UNO_NUM_RULES, cppu::UnoType<css::container::XIndexReplace>::get(), PROPERTY_NONE, CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PHYSICAL)), FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DISPLAY_NAME)), FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HIDDEN)), FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_STYLE_INTEROP_GRAB_BAG)), FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES, CPPU_E2T(CPPUTYPE_REFIDXREPL), PROPERTY_NONE, CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL,     CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_STYLE_INTEROP_GRAB_BAG), FN_UNO_STYLE_INTEROP_GRAB_BAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aNumStyleMap;
             }
             break;
             case PROPERTY_MAP_TEXT_TABLE :
             {
-                static SfxItemPropertyMapEntry const aTablePropertyMap_Impl[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,        cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE,MID_BACK_COLOR         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BREAK_TYPE)), RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_MARGIN)), RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT)), RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_KEEP_TOGETHER)), RES_KEEP,               cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SPLIT)), RES_LAYOUT_SPLIT,       cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_NUMBER_OFFSET)), RES_PAGEDESC,              cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_DESC_NAME)), RES_PAGEDESC,           cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RELATIVE_WIDTH)), FN_TABLE_RELATIVE_WIDTH,cppu::UnoType<sal_Int16>::get()  ,        PROPERTY_NONE, 0xff },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_REPEAT_HEADLINE)), FN_TABLE_HEADLINE_REPEAT,cppu::UnoType<bool>::get(),      PROPERTY_NONE, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEADER_ROW_COUNT)), FN_TABLE_HEADLINE_COUNT,  cppu::UnoType<sal_Int32>::get(),      PROPERTY_NONE, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_FORMAT)), RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SHADOW_TRANSPARENCE)), RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_MARGIN)), RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_MARGIN)), RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH)), FN_TABLE_WIDTH,         cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_WIDTH_RELATIVE)), FN_TABLE_IS_RELATIVE_WIDTH,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHART_ROW_AS_LABEL)), FN_UNO_RANGE_ROW_LABEL,            cppu::UnoType<bool>::get(),         PROPERTY_NONE,  0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHART_COLUMN_AS_LABEL)), FN_UNO_RANGE_COL_LABEL,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABLE_BORDER)), FN_UNO_TABLE_BORDER,         cppu::UnoType<css::table::TableBorder>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABLE_BORDER2)), FN_UNO_TABLE_BORDER2,         cppu::UnoType<css::table::TableBorder2>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABLE_BORDER_DISTANCES)), FN_UNO_TABLE_BORDER_DISTANCES,         cppu::UnoType<css::table::TableBorderDistances>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABLE_COLUMN_SEPARATORS)), FN_UNO_TABLE_COLUMN_SEPARATORS,   cppu::UnoType< cppu::UnoSequenceType<css::text::TableColumnSeparator> >::get(),   PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABLE_COLUMN_RELATIVE_SUM)), FN_UNO_TABLE_COLUMN_RELATIVE_SUM,       cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::READONLY, 0 },
+                static SfxItemPropertyMapEntry aTablePropertyMap_Impl[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,        CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE,MID_BACK_COLOR         },
+                    { SW_PROP_NMID(UNO_NAME_BREAK_TYPE), RES_BREAK,                 CPPU_E2T(CPPUTYPE_BREAK),       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE,             CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
+                    { SW_PROP_NMID(UNO_NAME_KEEP_TOGETHER), RES_KEEP,               CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SPLIT), RES_LAYOUT_SPLIT,       CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 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_PAGE_DESC_NAME), RES_PAGEDESC,           CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID, 0xff},
+                    { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), FN_TABLE_RELATIVE_WIDTH,CPPU_E2T(CPPUTYPE_INT16)  ,        PROPERTY_NONE, 0xff },
+                    { SW_PROP_NMID(UNO_NAME_REPEAT_HEADLINE), FN_TABLE_HEADLINE_REPEAT,CPPU_E2T(CPPUTYPE_BOOLEAN),      PROPERTY_NONE, 0xff},
+                    { SW_PROP_NMID(UNO_NAME_HEADER_ROW_COUNT), FN_TABLE_HEADLINE_COUNT,  CPPU_E2T(CPPUTYPE_INT32),      PROPERTY_NONE, 0xff},
+                    { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW,             CPPU_E2T(CPPUTYPE_SHADOWFMT),   PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SHADOW_TRANSPARENCE), RES_SHADOW,       CPPU_E2T(CPPUTYPE_INT16),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
+                    { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE,           CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,  CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_WIDTH), FN_TABLE_WIDTH,         CPPU_E2T(CPPUTYPE_INT32)  ,         PROPERTY_NONE, 0xff},
+                    { SW_PROP_NMID(UNO_NAME_IS_WIDTH_RELATIVE), FN_TABLE_IS_RELATIVE_WIDTH,         CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE, 0xff},
+                    { SW_PROP_NMID(UNO_NAME_CHART_ROW_AS_LABEL), FN_UNO_RANGE_ROW_LABEL,            CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE,  0},
+                    { SW_PROP_NMID(UNO_NAME_CHART_COLUMN_AS_LABEL), FN_UNO_RANGE_COL_LABEL,         CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_TABLE_BORDER), FN_UNO_TABLE_BORDER,         CPPU_E2T(CPPUTYPE_TABLEBORDER), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TABLE_BORDER2), FN_UNO_TABLE_BORDER2,         CPPU_E2T(CPPUTYPE_TABLEBORDER2), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TABLE_BORDER_DISTANCES), FN_UNO_TABLE_BORDER_DISTANCES,         CPPU_E2T(CPPUTYPE_TABLEBORDERDISTANCES), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_SEPARATORS), FN_UNO_TABLE_COLUMN_SEPARATORS,   CPPU_E2T(CPPUTYPE_TBLCOLSEP),   PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_RELATIVE_SUM), FN_UNO_TABLE_COLUMN_RELATIVE_SUM,       CPPU_E2T(CPPUTYPE_INT16),       PropertyAttribute::READONLY, 0 },
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_LINK_DISPLAY_NAME)), FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_SECTION)), FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABLE_NAME)),   FN_UNO_TABLE_NAME,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0 },
-                     { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_STYLE_NAME)), RES_PAGEDESC, cppu::UnoType<OUString>::get(),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
+                    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+                    { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_TABLE_NAME),   FN_UNO_TABLE_NAME,   CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0 },
+                     { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), RES_PAGEDESC, CPPU_E2T(CPPUTYPE_OUSTRING),         PROPERTY_NONE, 0},
                     // #i29550#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_COLLAPSING_BORDERS)), RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_COLLAPSING_BORDERS), RES_COLLAPSING_BORDERS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
                     _REDLINE_NODE_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
 
                 aMapEntriesArr[nPropertyId] = aTablePropertyMap_Impl;
@@ -1068,517 +1023,518 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             break;
             case PROPERTY_MAP_TABLE_CELL :
             {
-                static SfxItemPropertyMapEntry const aCellMap_Impl[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE , MID_BACK_COLOR       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)), RES_BOXATR_FORMAT,  cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER)), RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),    0, LEFT_BORDER  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER)), RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),   0, RIGHT_BORDER |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER)), RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(), 0, TOP_BORDER   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER)), RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BORDER_DISTANCE)), RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_BORDER_DISTANCE)), RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_BORDER_DISTANCE)), RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_BORDER_DISTANCE)), RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_BORDER_DISTANCE)), RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_SECTION)), FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), RES_PROTECT,            cppu::UnoType<bool>::get(), 0, MID_PROTECT_CONTENT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CELL_NAME)), FN_UNO_CELL_NAME,            cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT)), RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ROW_SPAN)),     FN_UNO_CELL_ROW_SPAN, cppu::UnoType<sal_Int32>::get(),  0, 0 },
+                static SfxItemPropertyMapEntry aCellMap_Impl[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,    CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE , MID_BACK_COLOR       },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,  CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
+                    { SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT,  CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID ,0             },
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX,    CPPU_E2T(CPPUTYPE_BORDERLINE),    0, LEFT_BORDER  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX,    CPPU_E2T(CPPUTYPE_BORDERLINE),   0, RIGHT_BORDER |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX,    CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX,    CPPU_E2T(CPPUTYPE_BORDERLINE),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX,    CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX,             CPPU_E2T(CPPUTYPE_INT32),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX,               CPPU_E2T(CPPUTYPE_INT32),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), RES_PROTECT,            CPPU_E2T(CPPUTYPE_BOOLEAN), 0, MID_PROTECT_CONTENT},
+                    { SW_PROP_NMID(UNO_NAME_CELL_NAME), FN_UNO_CELL_NAME,            CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY,0},
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+                    { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_ROW_SPAN),     FN_UNO_CELL_ROW_SPAN, CPPU_E2T(CPPUTYPE_INT32),  0, 0 },
                     _REDLINE_NODE_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aCellMap_Impl;
             }
             break;
             case PROPERTY_MAP_TABLE_RANGE:
             {
-                static SfxItemPropertyMapEntry const aRangePropertyMap_Impl[] =
+                static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] =
                 {
                     COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01
                     TABSTOPS_MAP_ENTRY
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), FN_UNO_TABLE_CELL_BACKGROUND,  cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::MAYBEVOID, MID_BACK_COLOR  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), FN_UNO_TABLE_CELL_BACKGROUND,   cppu::UnoType<css::style::GraphicLocation>::get(), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), FN_UNO_TABLE_CELL_BACKGROUND,    cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)), RES_BOXATR_FORMAT,         cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT)), RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHART_ROW_AS_LABEL)), FN_UNO_RANGE_ROW_LABEL,    cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID,  0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHART_COLUMN_AS_LABEL)), FN_UNO_RANGE_COL_LABEL, cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), FN_UNO_TABLE_CELL_BACKGROUND,  CPPU_E2T(CPPUTYPE_INT32),   PropertyAttribute::MAYBEVOID, MID_BACK_COLOR  },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), FN_UNO_TABLE_CELL_BACKGROUND,   CPPU_E2T(CPPUTYPE_GRAPHICLOC), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), FN_UNO_TABLE_CELL_BACKGROUND,    CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT      },
+                    { SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT,         CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID ,0             },
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+                    { SW_PROP_NMID(UNO_NAME_CHART_ROW_AS_LABEL), FN_UNO_RANGE_ROW_LABEL,    CPPU_E2T(CPPUTYPE_BOOLEAN),         PropertyAttribute::MAYBEVOID,  0},
+                    { SW_PROP_NMID(UNO_NAME_CHART_COLUMN_AS_LABEL), FN_UNO_RANGE_COL_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},
+
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aRangePropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_SECTION:
             {
-                static SfxItemPropertyMapEntry const aSectionPropertyMap_Impl[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONDITION)), WID_SECT_CONDITION, cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DDE_COMMAND_FILE)), WID_SECT_DDE_TYPE, cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DDE_COMMAND_TYPE)), WID_SECT_DDE_FILE, cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DDE_COMMAND_ELEMENT)), WID_SECT_DDE_ELEMENT, cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTOMATIC_UPDATE)), WID_SECT_DDE_AUTOUPDATE, cppu::UnoType<bool>::get(),              PROPERTY_NONE,  0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILE_LINK)), WID_SECT_LINK     , cppu::UnoType<css::text::SectionFileLink>::get(),     PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_VISIBLE)), WID_SECT_VISIBLE   , cppu::UnoType<bool>::get(),           PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_SECT_PROTECTED, cppu::UnoType<bool>::get(),              PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_EDIT_IN_READONLY)), WID_SECT_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LINK_REGION)), WID_SECT_REGION   , cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_LINK_DISPLAY_NAME)), FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END)), RES_FTN_AT_TXTEND,        cppu::UnoType<bool>::get(),                PROPERTY_NONE ,MID_COLLECT                   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING)), RES_FTN_AT_TXTEND,      cppu::UnoType<bool>::get(),                PROPERTY_NONE , MID_RESTART_NUM },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT)), RES_FTN_AT_TXTEND,      cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE , MID_NUM_START_AT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING)), RES_FTN_AT_TXTEND,  cppu::UnoType<bool>::get(),                                                 PROPERTY_NONE ,  MID_OWN_NUM     },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_NUMBERING_TYPE)), RES_FTN_AT_TXTEND,        cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE , MID_NUM_TYPE    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_NUMBERING_PREFIX)), RES_FTN_AT_TXTEND,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,      MID_PREFIX      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX)), RES_FTN_AT_TXTEND,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,      MID_SUFFIX      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END)), RES_END_AT_TXTEND,        cppu::UnoType<bool>::get(),                 PROPERTY_NONE , MID_COLLECT                      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING)), RES_END_AT_TXTEND,        cppu::UnoType<bool>::get(),                   PROPERTY_NONE , MID_RESTART_NUM  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT)), RES_END_AT_TXTEND,     cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE ,  MID_NUM_START_AT },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE_IS_OWN_NUMBERING)), RES_END_AT_TXTEND,     cppu::UnoType<bool>::get(),                                                   PROPERTY_NONE ,  MID_OWN_NUM      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE_NUMBERING_TYPE)), RES_END_AT_TXTEND,       cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE ,MID_NUM_TYPE     },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE_NUMBERING_PREFIX)), RES_END_AT_TXTEND,     cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,   MID_PREFIX       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDNOTE_NUMBERING_SUFFIX)), RES_END_AT_TXTEND,     cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,   MID_SUFFIX       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_INDEX)), WID_SECT_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION)), WID_SECT_IS_GLOBAL_DOC_SECTION, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PROTECTION_KEY)), WID_SECT_PASSWORD,      cppu::UnoType< cppu::UnoSequenceType<sal_Int8> >::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DONT_BALANCE_TEXT_COLUMNS)), RES_COLUMNBALANCE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+                static SfxItemPropertyMapEntry aSectionPropertyMap_Impl[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_CONDITION), WID_SECT_CONDITION, CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_FILE), WID_SECT_DDE_TYPE, CPPU_E2T(CPPUTYPE_OUSTRING)  ,        PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_TYPE), WID_SECT_DDE_FILE, CPPU_E2T(CPPUTYPE_OUSTRING)  ,        PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_ELEMENT), WID_SECT_DDE_ELEMENT, CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_UPDATE), WID_SECT_DDE_AUTOUPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN),              PROPERTY_NONE,  0},
+                    { SW_PROP_NMID(UNO_NAME_FILE_LINK), WID_SECT_LINK     , CPPU_E2T(CPPUTYPE_SECTFILELNK),     PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_VISIBLE), WID_SECT_VISIBLE   , CPPU_E2T(CPPUTYPE_BOOLEAN),           PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_SECT_PROTECTED, CPPU_E2T(CPPUTYPE_BOOLEAN),              PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), WID_SECT_EDIT_IN_READONLY,    CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_LINK_REGION), WID_SECT_REGION   , CPPU_E2T(CPPUTYPE_OUSTRING)  ,        PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
+                    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END), RES_FTN_AT_TXTEND,        CPPU_E2T(CPPUTYPE_BOOLEAN),                PROPERTY_NONE ,MID_COLLECT                   },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING), RES_FTN_AT_TXTEND,      CPPU_E2T(CPPUTYPE_BOOLEAN),                PROPERTY_NONE , MID_RESTART_NUM },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT), RES_FTN_AT_TXTEND,      CPPU_E2T(CPPUTYPE_INT16),               PROPERTY_NONE , MID_NUM_START_AT},
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING), RES_FTN_AT_TXTEND,  CPPU_E2T(CPPUTYPE_BOOLEAN),                                                 PROPERTY_NONE ,  MID_OWN_NUM     },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_TYPE), RES_FTN_AT_TXTEND,        CPPU_E2T(CPPUTYPE_INT16),               PROPERTY_NONE , MID_NUM_TYPE    },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_PREFIX), RES_FTN_AT_TXTEND,  CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,      MID_PREFIX      },
+                    { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX), RES_FTN_AT_TXTEND,  CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,      MID_SUFFIX      },
+                    { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END), RES_END_AT_TXTEND,        CPPU_E2T(CPPUTYPE_BOOLEAN),                 PROPERTY_NONE , MID_COLLECT                      },
+                    { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING), RES_END_AT_TXTEND,        CPPU_E2T(CPPUTYPE_BOOLEAN),                   PROPERTY_NONE , MID_RESTART_NUM  },
+                    { SW_PROP_NMID(UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT), RES_END_AT_TXTEND,     CPPU_E2T(CPPUTYPE_INT16),             PROPERTY_NONE ,  MID_NUM_START_AT },
+                    { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_OWN_NUMBERING), RES_END_AT_TXTEND,     CPPU_E2T(CPPUTYPE_BOOLEAN),                                                   PROPERTY_NONE ,  MID_OWN_NUM      },
+                    { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_TYPE), RES_END_AT_TXTEND,       CPPU_E2T(CPPUTYPE_INT16),             PROPERTY_NONE ,MID_NUM_TYPE     },
+                    { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_PREFIX), RES_END_AT_TXTEND,     CPPU_E2T(CPPUTYPE_OUSTRING)  ,        PROPERTY_NONE,   MID_PREFIX       },
+                    { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_SUFFIX), RES_END_AT_TXTEND,     CPPU_E2T(CPPUTYPE_OUSTRING)  ,        PROPERTY_NONE,   MID_SUFFIX       },
+                    { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX), WID_SECT_DOCUMENT_INDEX, CPPU_E2T(CPPUTYPE_REFDOCINDEX), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION), WID_SECT_IS_GLOBAL_DOC_SECTION, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0 },
+                    { SW_PROP_NMID(UNO_NAME_PROTECTION_KEY), WID_SECT_PASSWORD,      CPPU_E2T(CPPUTYPE_SEQINT8), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_DONT_BALANCE_TEXT_COLUMNS), RES_COLUMNBALANCE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
                     COMMON_TEXT_CONTENT_PROPERTIES
                     _REDLINE_NODE_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_CURRENTLY_VISIBLE)), WID_SECT_CURRENTLY_VISIBLE, cppu::UnoType<bool>::get(),          PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SECT_LEFT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SECT_RIGHT_MARGIN)), RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_IS_CURRENTLY_VISIBLE), WID_SECT_CURRENTLY_VISIBLE, CPPU_E2T(CPPUTYPE_BOOLEAN),          PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_SECT_LEFT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},                                   \
+                    { SW_PROP_NMID(UNO_NAME_SECT_RIGHT_MARGIN), RES_LR_SPACE,           CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},                                  \
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aSectionPropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXT_SEARCH:
             {
-                static SfxItemPropertyMapEntry const aSearchPropertyMap_Impl[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_ALL)), WID_SEARCH_ALL,        cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_BACKWARDS)), WID_BACKWARDS,           cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_CASE_SENSITIVE)), WID_CASE_SENSITIVE,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_REGULAR_EXPRESSION)), WID_REGULAR_EXPRESSION, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_SIMILARITY)), WID_SIMILARITY,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_SIMILARITY_ADD)), WID_SIMILARITY_ADD,     cppu::UnoType<sal_Int16>::get()  ,     PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_SIMILARITY_EXCHANGE)), WID_SIMILARITY_EXCHANGE,cppu::UnoType<sal_Int16>::get()  ,    PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_SIMILARITY_RELAX)), WID_SIMILARITY_RELAX,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_SIMILARITY_REMOVE)), WID_SIMILARITY_REMOVE,   cppu::UnoType<sal_Int16>::get()  ,     PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_STYLES)), WID_STYLES,             cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEARCH_WORDS)), WID_WORDS,               cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    {}
+                static SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_ALL), WID_SEARCH_ALL,        CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_BACKWARDS), WID_BACKWARDS,           CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_CASE_SENSITIVE), WID_CASE_SENSITIVE,     CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_REGULAR_EXPRESSION), WID_REGULAR_EXPRESSION, CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY), WID_SIMILARITY,         CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_ADD), WID_SIMILARITY_ADD,     CPPU_E2T(CPPUTYPE_INT16)  ,     PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_EXCHANGE), WID_SIMILARITY_EXCHANGE,CPPU_E2T(CPPUTYPE_INT16)  ,    PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_RELAX), WID_SIMILARITY_RELAX,     CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_REMOVE), WID_SIMILARITY_REMOVE,   CPPU_E2T(CPPUTYPE_INT16)  ,     PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_STYLES), WID_STYLES,             CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SEARCH_WORDS), WID_WORDS,               CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aSearchPropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXT_FRAME:
             {
-                static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
+                static SfxItemPropertyMapEntry aFramePropertyMap_Impl[] =
                 {
                     COMMON_FRAME_PROPERTIES
                     _REDLINE_NODE_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAIN_NEXT_NAME)), RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAIN_PREV_NAME)), RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
-                /*not impl*/    { OUString::createFromAscii(GetPropName(UNO_NAME_CLIENT_MAP)), RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_EDIT_IN_READONLY)), RES_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_CHAIN_NEXT_NAME), RES_CHAIN,                CPPU_E2T(CPPUTYPE_OUSTRING),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
+                    { SW_PROP_NMID(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN,                CPPU_E2T(CPPUTYPE_OUSTRING),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
+                /*not impl*/    { SW_PROP_NMID(UNO_NAME_CLIENT_MAP), RES_URL,               CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
+                    { SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), RES_EDIT_IN_READONLY,    CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
                     //next elements are part of the service description
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_HEIGHT_ABSOLUTE)),         RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_HEIGHT_PERCENT)),              RES_FRM_SIZE,           cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT)),         RES_FRM_SIZE,        cppu::UnoType<bool>::get(),         PROPERTY_NONE, MID_FRMSIZE_IS_AUTO_HEIGHT   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_WIDTH_ABSOLUTE)),          RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FRAME_WIDTH_PERCENT)),               RES_FRM_SIZE,           cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE_TYPE)), RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH_TYPE)), RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRITING_MODE)), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_FRAME_HEIGHT_ABSOLUTE),         RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT32),       PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
+                    { SW_PROP_NMID(UNO_NAME_FRAME_HEIGHT_PERCENT),              RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT8),        PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT   },
+                    { SW_PROP_NMID(UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT),         RES_FRM_SIZE,        CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, MID_FRMSIZE_IS_AUTO_HEIGHT   },
+                    { SW_PROP_NMID(UNO_NAME_FRAME_WIDTH_ABSOLUTE),          RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT32),       PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
+                    { SW_PROP_NMID(UNO_NAME_FRAME_WIDTH_PERCENT),               RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT8),        PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH    },
+                    { SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
+                    { SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE,          CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
+                    { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aFramePropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXT_GRAPHIC:
             {
-                static SfxItemPropertyMapEntry const aGraphicPropertyMap_Impl[] =
+                static SfxItemPropertyMapEntry aGraphicPropertyMap_Impl[] =
                 {
                     COMMON_FRAME_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND_CONTOUR)), RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTOUR_OUTSIDE)), RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC_CROP)), RES_GRFATR_CROPGRF,     cppu::UnoType<css::text::GraphicCrop>::get(),  PROPERTY_NONE, CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES)), RES_GRFATR_MIRRORGRF, cppu::UnoType<bool>::get(),             PROPERTY_NONE,      MID_MIRROR_HORZ_EVEN_PAGES            },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES)), RES_GRFATR_MIRRORGRF,  cppu::UnoType<bool>::get(),             PROPERTY_NONE,      MID_MIRROR_HORZ_ODD_PAGES                 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_MIRRORED)), RES_GRFATR_MIRRORGRF,   cppu::UnoType<bool>::get(),             PROPERTY_NONE,     MID_MIRROR_VERT            },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC_URL)), FN_UNO_GRAPHIC_U_R_L, cppu::UnoType<OUString>::get(), 0, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_REPLACEMENT_GRAPHIC_URL)), FN_UNO_REPLACEMENT_GRAPHIC_U_R_L, cppu::UnoType<OUString>::get(), 0, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC_FILTER)), FN_UNO_GRAPHIC_FILTER,      cppu::UnoType<OUString>::get(), 0, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC)), FN_UNO_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ACTUAL_SIZE)), FN_UNO_ACTUAL_SIZE,    cppu::UnoType<css::awt::Size>::get(),  PropertyAttribute::READONLY, CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTOUR_POLY_POLYGON)), FN_PARAM_COUNTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PIXEL_CONTOUR)), FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTOMATIC_CONTOUR)), FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC_ROTATION)), RES_GRFATR_ROTATION,      cppu::UnoType<sal_Int16>::get(),  0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ADJUST_LUMINANCE)), RES_GRFATR_LUMINANCE,     cppu::UnoType<sal_Int16>::get(),  0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ADJUST_CONTRAST)), RES_GRFATR_CONTRAST,   cppu::UnoType<sal_Int16>::get(),  0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ADJUST_RED)), RES_GRFATR_CHANNELR,    cppu::UnoType<sal_Int16>::get(),  0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ADJUST_GREEN)), RES_GRFATR_CHANNELG,      cppu::UnoType<sal_Int16>::get(),  0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ADJUST_BLUE)), RES_GRFATR_CHANNELB,   cppu::UnoType<sal_Int16>::get(),  0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GAMMA)), RES_GRFATR_GAMMA,        cppu::UnoType<double>::get(),     0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC_IS_INVERTED)), RES_GRFATR_INVERT,         cppu::UnoType<bool>::get(),    0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TRANSPARENCY)), RES_GRFATR_TRANSPARENCY, cppu::UnoType<sal_Int16>::get(),   0,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC_COLOR_MODE)), RES_GRFATR_DRAWMODE,    cppu::UnoType<css::drawing::ColorMode>::get(),      0,   0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND,            CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
+                    { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND,             CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC_CROP), RES_GRFATR_CROPGRF,     CPPU_E2T(CPPUTYPE_GRFCROP),  PROPERTY_NONE, CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES), RES_GRFATR_MIRRORGRF, CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE,      MID_MIRROR_HORZ_EVEN_PAGES            },
+                    { SW_PROP_NMID(UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES), RES_GRFATR_MIRRORGRF,  CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE,      MID_MIRROR_HORZ_ODD_PAGES                 },
+                    { SW_PROP_NMID(UNO_NAME_VERT_MIRRORED), RES_GRFATR_MIRRORGRF,   CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE,     MID_MIRROR_VERT            },
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC_URL), FN_UNO_GRAPHIC_U_R_L, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0 },
+                    { SW_PROP_NMID(UNO_NAME_REPLACEMENT_GRAPHIC_URL), FN_UNO_REPLACEMENT_GRAPHIC_U_R_L, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0 },
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC_FILTER), FN_UNO_GRAPHIC_FILTER,      CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0 },
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC), FN_UNO_GRAPHIC, CPPU_E2T(CPPUTYPE_REFXGRAPHIC), 0, 0 },
+                    { SW_PROP_NMID(UNO_NAME_ACTUAL_SIZE), FN_UNO_ACTUAL_SIZE,    CPPU_E2T(CPPUTYPE_AWTSIZE),  PropertyAttribute::READONLY, CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, CPPU_E2T(CPPUTYPE_PNTSEQSEQ), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC_ROTATION), RES_GRFATR_ROTATION,      CPPU_E2T(CPPUTYPE_INT16),  0,   0},
+                    { SW_PROP_NMID(UNO_NAME_ADJUST_LUMINANCE), RES_GRFATR_LUMINANCE,     CPPU_E2T(CPPUTYPE_INT16),  0,   0},
+                    { SW_PROP_NMID(UNO_NAME_ADJUST_CONTRAST), RES_GRFATR_CONTRAST,   CPPU_E2T(CPPUTYPE_INT16),  0,   0},
+                    { SW_PROP_NMID(UNO_NAME_ADJUST_RED), RES_GRFATR_CHANNELR,    CPPU_E2T(CPPUTYPE_INT16),  0,   0},
+                    { SW_PROP_NMID(UNO_NAME_ADJUST_GREEN), RES_GRFATR_CHANNELG,      CPPU_E2T(CPPUTYPE_INT16),  0,   0},
+                    { SW_PROP_NMID(UNO_NAME_ADJUST_BLUE), RES_GRFATR_CHANNELB,   CPPU_E2T(CPPUTYPE_INT16),  0,   0},
+                    { SW_PROP_NMID(UNO_NAME_GAMMA), RES_GRFATR_GAMMA,        CPPU_E2T(CPPUTYPE_DOUBLE),     0,   0},
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC_IS_INVERTED), RES_GRFATR_INVERT,         CPPU_E2T(CPPUTYPE_BOOLEAN),    0,   0},
+                    { SW_PROP_NMID(UNO_NAME_TRANSPARENCY), RES_GRFATR_TRANSPARENCY, CPPU_E2T(CPPUTYPE_INT16),   0,   0},
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC_COLOR_MODE), RES_GRFATR_DRAWMODE,    CPPU_E2T(CPPUTYPE_COLORMODE),      0,   0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aGraphicPropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_EMBEDDED_OBJECT:
             {
-                static SfxItemPropertyMapEntry const aEmbeddedPropertyMap_Impl[] =
+                static SfxItemPropertyMapEntry aEmbeddedPropertyMap_Impl[] =
                 {
                     COMMON_FRAME_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND_CONTOUR)), RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUR },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTOUR_OUTSIDE)), RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTOUR_POLY_POLYGON)), FN_PARAM_COUNTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PIXEL_CONTOUR)), FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTOMATIC_CONTOUR)), FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CLSID)),                FN_UNO_CLSID, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_STREAM_NAME)),           FN_UNO_STREAM_NAME, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_MODEL)), FN_UNO_MODEL, cppu::UnoType<css::frame::XModel>::get(), PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC_URL)), FN_UNO_REPLACEMENT_GRAPHIC_URL, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRAPHIC)), FN_UNO_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_COMPONENT)),FN_UNO_COMPONENT, cppu::UnoType<css::lang::XComponent>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_EMBEDDED_OBJECT)),FN_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), PROPERTY_NONE, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUR },
+                    { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE},
+                    { SW_PROP_NMID(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, CPPU_E2T(CPPUTYPE_PNTSEQSEQ), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_CLSID),                FN_UNO_CLSID, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_STREAM_NAME),           FN_UNO_STREAM_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_MODEL), FN_UNO_MODEL, CPPU_E2T(CPPUTYPE_REFMODEL), PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC_URL), FN_UNO_REPLACEMENT_GRAPHIC_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_GRAPHIC), FN_UNO_REPLACEMENT_GRAPHIC, CPPU_E2T(CPPUTYPE_REFXGRAPHIC), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_COMPONENT),FN_UNO_COMPONENT, CPPU_E2T(CPPUTYPE_REFCOMPONENT), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_EMBEDDED_OBJECT),FN_EMBEDDED_OBJECT, CPPU_E2T(CPPUTPYE_REFEMBEDDEDOBJECT), PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aEmbeddedPropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXT_SHAPE:
             {
-                static SfxItemPropertyMapEntry const aShapeMap_Impl[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_PAGE_NO)), RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_PAGENUM      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_TYPE)), RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORTYPE},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_FRAME)), RES_ANCHOR,             cppu::UnoType<css::text::XTextFrame>::get(),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT)), RES_HORI_ORIENT,        cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_ORIENT },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT_POSITION)), RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_POSITION|CONVERT_TWIPS   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HORI_ORIENT_RELATION)), RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_RELATION },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEFT_MARGIN)), RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RIGHT_MARGIN)), RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND)), RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),    PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_SURROUNDTYPE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_WRAP)), RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND_ANCHORONLY)), RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_ANCHORONLY     },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SURROUND_CONTOUR)), RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONTOUR_OUTSIDE)), RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TOP_MARGIN)), RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BOTTOM_MARGIN)), RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT)), RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_ORIENT   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT_POSITION)), RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_POSITION|CONVERT_TWIPS   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT_RELATION)), RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_RELATION },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_RANGE)), FN_TEXT_RANGE,         cppu::UnoType<css::text::XTextRange>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_OPAQUE)), RES_OPAQUE,             cppu::UnoType<bool>::get(),            PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_POSITION)), FN_ANCHOR_POSITION,    cppu::UnoType<css::awt::Point>::get(),    PropertyAttribute::READONLY, 0},
+                static SfxItemPropertyMapEntry aShapeMap_Impl[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR,            CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_PAGENUM      },
+                    { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR,           CPPU_E2T(CPPUTYPE_TXTCNTANCHOR),            PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORTYPE},
+                    { SW_PROP_NMID(UNO_NAME_ANCHOR_FRAME), RES_ANCHOR,             CPPU_E2T(CPPUTYPE_REFTEXTFRAME),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},
+                    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT,        CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_ORIENT },
+                    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_POSITION), RES_HORI_ORIENT,     CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_POSITION|CONVERT_TWIPS   },
+                    { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_RELATION), RES_HORI_ORIENT,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_RELATION },
+                    { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE,             CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_SURROUND), RES_SURROUND,          CPPU_E2T(CPPUTYPE_WRAPTXTMODE),    PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_SURROUNDTYPE },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), RES_SURROUND,           CPPU_E2T(CPPUTYPE_WRAPTXTMODE),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
+                    { SW_PROP_NMID(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND,             CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_ANCHORONLY     },
+                    { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND,            CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
+                    { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND,             CPPU_E2T(CPPUTYPE_BOOLEAN),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
+                    { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE,           CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_ORIENT   },
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_POSITION), RES_VERT_ORIENT,     CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_POSITION|CONVERT_TWIPS   },
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_RELATION), RES_VERT_ORIENT,     CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_RELATION },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_RANGE), FN_TEXT_RANGE,         CPPU_E2T(CPPUTYPE_REFTXTRANGE),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE,             CPPU_E2T(CPPUTYPE_BOOLEAN),            PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_ANCHOR_POSITION), FN_ANCHOR_POSITION,    CPPU_E2T(CPPUTYPE_AWTPOINT),    PropertyAttribute::READONLY, 0},
                     // #i26791#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_FOLLOWING_TEXT_FLOW)), RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
                     // #i28701#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WRAP_INFLUENCE_ON_POSITION)), RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE},
+                    { SW_PROP_NMID(UNO_NAME_WRAP_INFLUENCE_ON_POSITION), RES_WRAP_INFLUENCE_ON_OBJPOS, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_WRAP_INFLUENCE},
                     // #i28749#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TRANSFORMATION_IN_HORI_L2R)),
+                    { SW_PROP_NMID( UNO_NAME_TRANSFORMATION_IN_HORI_L2R),
                                     FN_SHAPE_TRANSFORMATION_IN_HORI_L2R,
-                                    cppu::UnoType<css::drawing::HomogenMatrix3>::get(),
+                                    CPPU_E2T(CPPUTYPE_TRANSFORMATIONINHORIL2R),
                                     PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_POSITION_LAYOUT_DIR)),
+                    { SW_PROP_NMID( UNO_NAME_POSITION_LAYOUT_DIR),
                                     FN_SHAPE_POSITION_LAYOUT_DIR,
-                                    cppu::UnoType<sal_Int16>::get(),
+                                    CPPU_E2T(CPPUTYPE_INT16),
                                     PROPERTY_NONE, 0},
                     // #i36248#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_STARTPOSITION_IN_HORI_L2R)),
+                    { SW_PROP_NMID( UNO_NAME_STARTPOSITION_IN_HORI_L2R),
                                     FN_SHAPE_STARTPOSITION_IN_HORI_L2R,
-                                    cppu::UnoType<css::awt::Point>::get(),
+                                    CPPU_E2T(CPPUTYPE_AWTPOINT),
                                     PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ENDPOSITION_IN_HORI_L2R)),
+                    { SW_PROP_NMID( UNO_NAME_ENDPOSITION_IN_HORI_L2R),
                                     FN_SHAPE_ENDPOSITION_IN_HORI_L2R,
-                                    cppu::UnoType<css::awt::Point>::get(),
+                                    CPPU_E2T(CPPUTYPE_AWTPOINT),
                                     PropertyAttribute::READONLY, 0},
                     // #i71182#
                     // missing map entry for property <PageToogle>
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_TOGGLE)), RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RELATIVE_HEIGHT)), RES_FRM_SIZE,     cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RELATIVE_WIDTH)), RES_FRM_SIZE,      cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH  },
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_PAGE_TOGGLE), RES_HORI_ORIENT,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
+                    { SW_PROP_NMID(UNO_NAME_RELATIVE_HEIGHT), RES_FRM_SIZE,     CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT },
+                    { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), RES_FRM_SIZE,      CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH  },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aShapeMap_Impl;
             }
             break;
             case PROPERTY_MAP_INDEX_MARK:
             {
-                static SfxItemPropertyMapEntry const aIdxMarkMap_Impl[] =
+                static SfxItemPropertyMapEntry aIdxMarkMap_Impl[] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ALTERNATIVE_TEXT)), WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PRIMARY_KEY)), WID_PRIMARY_KEY,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SECONDARY_KEY)), WID_SECONDARY_KEY,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_READING)), WID_TEXT_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PRIMARY_KEY_READING)), WID_PRIMARY_KEY_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SECONDARY_KEY_READING)), WID_SECONDARY_KEY_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_MAIN_ENTRY)), WID_MAIN_ENTRY,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT,        CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_PRIMARY_KEY), WID_PRIMARY_KEY,  CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SECONDARY_KEY), WID_SECONDARY_KEY,  CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_READING), WID_TEXT_READING, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_PRIMARY_KEY_READING), WID_PRIMARY_KEY_READING, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_SECONDARY_KEY_READING), WID_SECONDARY_KEY_READING, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_MAIN_ENTRY), WID_MAIN_ENTRY,     CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PROPERTY_NONE,     0},
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aIdxMarkMap_Impl;
             }
             break;
             case PROPERTY_MAP_CNTIDX_MARK:
             {
-                static SfxItemPropertyMapEntry const aCntntMarkMap_Impl[] =
+                static SfxItemPropertyMapEntry aCntntMarkMap_Impl[] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ALTERNATIVE_TEXT)), WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL)), WID_LEVEL        ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT,        CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL), WID_LEVEL        ,  CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,     0},
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aCntntMarkMap_Impl;
             }
             break;
             case PROPERTY_MAP_USER_MARK:
             {
-                static SfxItemPropertyMapEntry const aUserMarkMap_Impl[] =
+                static SfxItemPropertyMapEntry aUserMarkMap_Impl[] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ALTERNATIVE_TEXT)), WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL)),   WID_LEVEL        ,    cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_INDEX_NAME)), WID_USER_IDX_NAME,    cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT,        CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL        ),   WID_LEVEL        ,    CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USER_INDEX_NAME), WID_USER_IDX_NAME,    CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aUserMarkMap_Impl;
             }
             break;
             case PROPERTY_MAP_INDEX_IDX:
             {
-                static SfxItemPropertyMapEntry const aTOXIndexMap_Impl[] =
+                static SfxItemPropertyMapEntry aTOXIndexMap_Impl[] =
                 {
                     _BASE_INDEX_PROPERTIES_
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_CHAPTER)), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_ALPHABETICAL_SEPARATORS)), WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_KEY_AS_ENTRY)), WID_USE_KEY_AS_ENTRY                    ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_COMBINED_ENTRIES)), WID_USE_COMBINED_ENTRIES                ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_CASE_SENSITIVE)), WID_IS_CASE_SENSITIVE                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_P_P)), WID_USE_P_P                             ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_DASH)), WID_USE_DASH                            ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_UPPER_CASE)), WID_USE_UPPER_CASE                      ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_FORMAT)), WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME)), WID_MAIN_ENTRY_CHARACTER_STYLE_NAME     ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLEHEADING)),                 WID_PARA_HEAD,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLESEPARATOR)),           WID_PARA_SEP,           cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL1)),              WID_PARA_LEV1,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL2)),              WID_PARA_LEV2,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL3)),              WID_PARA_LEV3,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_COMMA_SEPARATED)), WID_IS_COMMA_SEPARATED, cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_INDEX_MARKS)), WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_RELATIVE_TABSTOPS)), WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LOCALE)),            WID_IDX_LOCALE,         cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SORT_ALGORITHM)),    WID_IDX_SORT_ALGORITHM,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_ALPHABETICAL_SEPARATORS), WID_USE_ALPHABETICAL_SEPARATORS         ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_KEY_AS_ENTRY), WID_USE_KEY_AS_ENTRY                    ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_COMBINED_ENTRIES), WID_USE_COMBINED_ENTRIES                ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_CASE_SENSITIVE), WID_IS_CASE_SENSITIVE                   ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_P_P), WID_USE_P_P                             ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_DASH), WID_USE_DASH                            ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_UPPER_CASE), WID_USE_UPPER_CASE                      ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT                        ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME), WID_MAIN_ENTRY_CHARACTER_STYLE_NAME     ,  CPPU_E2T(CPPUTYPE_OUSTRING)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING),                 WID_PARA_HEAD,          CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLESEPARATOR),           WID_PARA_SEP,           CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1),              WID_PARA_LEV1,          CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2),              WID_PARA_LEV2,          CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3),              WID_PARA_LEV3,          CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_COMMA_SEPARATED), WID_IS_COMMA_SEPARATED, CPPU_E2T(CPPUTYPE_BOOLEAN),            PROPERTY_NONE ,0         },
+                    { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK),           PropertyAttribute::READONLY ,0       },
+                    { SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_LOCALE),            WID_IDX_LOCALE,         CPPU_E2T(CPPUTYPE_LOCALE), PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM),    WID_IDX_SORT_ALGORITHM,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE,     0},\
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTOXIndexMap_Impl;
             }
             break;
             case PROPERTY_MAP_INDEX_CNTNT:
             {
-                static SfxItemPropertyMapEntry const aTOXContentMap_Impl[] =
+                static SfxItemPropertyMapEntry aTOXContentMap_Impl[] =
                 {
                     _BASE_INDEX_PROPERTIES_
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL)), WID_LEVEL                               ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_MARKS)), WID_CREATE_FROM_MARKS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_OUTLINE)), WID_CREATE_FROM_OUTLINE                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_CHAPTER)), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_FORMAT)), WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_PARAGRAPH_STYLES)), WID_LEVEL_PARAGRAPH_STYLES              ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PropertyAttribute::READONLY,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES)), WID_CREATE_FROM_PARAGRAPH_STYLES, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLEHEADING)),     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL1)),  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL2)),  WID_PARA_LEV2,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL3)),  WID_PARA_LEV3,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL4)),  WID_PARA_LEV4,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL5)),  WID_PARA_LEV5,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL6)),  WID_PARA_LEV6,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL7)),  WID_PARA_LEV7,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL8)),  WID_PARA_LEV8,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL9)),  WID_PARA_LEV9,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL10)),     WID_PARA_LEV10,     cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_RELATIVE_TABSTOPS)), WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_INDEX_MARKS)), WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_LEVEL), WID_LEVEL                               ,  CPPU_E2T(CPPUTYPE_INT16)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS                   ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_OUTLINE), WID_CREATE_FROM_OUTLINE                 ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT                        ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_PARAGRAPH_STYLES), WID_LEVEL_PARAGRAPH_STYLES              ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PropertyAttribute::READONLY,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), WID_CREATE_FROM_PARAGRAPH_STYLES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING),     WID_PARA_HEAD,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1),  WID_PARA_LEV1,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2),  WID_PARA_LEV2,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3),  WID_PARA_LEV3,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL4),  WID_PARA_LEV4,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL5),  WID_PARA_LEV5,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL6),  WID_PARA_LEV6,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL7),  WID_PARA_LEV7,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL8),  WID_PARA_LEV8,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL9),  WID_PARA_LEV9,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL10),     WID_PARA_LEV10,     CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK),           PropertyAttribute::READONLY ,0       },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTOXContentMap_Impl;
             }
             break;
             case PROPERTY_MAP_INDEX_USER:
             {
-                static SfxItemPropertyMapEntry const aTOXUserMap_Impl[] =
+                static SfxItemPropertyMapEntry aTOXUserMap_Impl[] =
                 {
                     _BASE_INDEX_PROPERTIES_
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_MARKS)), WID_CREATE_FROM_MARKS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_CHAPTER)), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_LEVEL_FROM_SOURCE)), WID_USE_LEVEL_FROM_SOURCE               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_FORMAT)), WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_PARAGRAPH_STYLES)), WID_LEVEL_PARAGRAPH_STYLES              ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PropertyAttribute::READONLY,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES)), WID_CREATE_FROM_PARAGRAPH_STYLES, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_TABLES)), WID_CREATE_FROM_TABLES                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_TEXT_FRAMES)), WID_CREATE_FROM_TEXT_FRAMES             ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS)), WID_CREATE_FROM_GRAPHIC_OBJECTS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS)), WID_CREATE_FROM_EMBEDDED_OBJECTS        ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLEHEADING)),     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL1)),  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL2)),  WID_PARA_LEV2,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL3)),  WID_PARA_LEV3,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL4)),  WID_PARA_LEV4,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL5)),  WID_PARA_LEV5,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL6)),  WID_PARA_LEV6,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL7)),  WID_PARA_LEV7,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL8)),  WID_PARA_LEV8,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL9)),  WID_PARA_LEV9,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL10)),     WID_PARA_LEV10,     cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_INDEX_MARKS)), WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_RELATIVE_TABSTOPS)), WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_INDEX_NAME)), WID_USER_IDX_NAME,    cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS                   ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_LEVEL_FROM_SOURCE), WID_USE_LEVEL_FROM_SOURCE               ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT                        ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PROPERTY_NONE,0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_PARAGRAPH_STYLES), WID_LEVEL_PARAGRAPH_STYLES              ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PropertyAttribute::READONLY,0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), WID_CREATE_FROM_PARAGRAPH_STYLES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_TABLES), WID_CREATE_FROM_TABLES                  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_TEXT_FRAMES), WID_CREATE_FROM_TEXT_FRAMES             ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS), WID_CREATE_FROM_GRAPHIC_OBJECTS         ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS), WID_CREATE_FROM_EMBEDDED_OBJECTS        ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING),     WID_PARA_HEAD,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1),  WID_PARA_LEV1,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2),  WID_PARA_LEV2,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3),  WID_PARA_LEV3,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL4),  WID_PARA_LEV4,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL5),  WID_PARA_LEV5,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL6),  WID_PARA_LEV6,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL7),  WID_PARA_LEV7,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL8),  WID_PARA_LEV8,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL9),  WID_PARA_LEV9,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL10),     WID_PARA_LEV10,     CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK),           PropertyAttribute::READONLY ,0       },
+                    { SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_USER_INDEX_NAME), WID_USER_IDX_NAME,    CPPU_E2T(CPPUTYPE_OUSTRING)  ,      PROPERTY_NONE,     0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTOXUserMap_Impl;
             }
             break;
             case PROPERTY_MAP_INDEX_TABLES:
             {
-                static SfxItemPropertyMapEntry const aTOXTablesMap_Impl[] =
+                static SfxItemPropertyMapEntry aTOXTablesMap_Impl[] =
                 {
                     _BASE_INDEX_PROPERTIES_
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_CHAPTER)), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_LABELS)), WID_CREATE_FROM_LABELS                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LABEL_CATEGORY)), WID_LABEL_CATEGORY                      ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LABEL_DISPLAY_TYPE)), WID_LABEL_DISPLAY_TYPE                  ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_FORMAT)), WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLEHEADING)),     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL1)),  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_RELATIVE_TABSTOPS)), WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_LABELS), WID_CREATE_FROM_LABELS                  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LABEL_CATEGORY), WID_LABEL_CATEGORY                      ,  CPPU_E2T(CPPUTYPE_OUSTRING)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LABEL_DISPLAY_TYPE), WID_LABEL_DISPLAY_TYPE                  ,  CPPU_E2T(CPPUTYPE_INT16)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT                        ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PROPERTY_NONE,0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING),     WID_PARA_HEAD,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1),  WID_PARA_LEV1,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTOXTablesMap_Impl;
             }
             break;
             case PROPERTY_MAP_INDEX_OBJECTS:
             {
-                static SfxItemPropertyMapEntry const aTOXObjectsMap_Impl[] =
+                static SfxItemPropertyMapEntry aTOXObjectsMap_Impl[] =
                 {
                     _BASE_INDEX_PROPERTIES_
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_CHAPTER)), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_ALPHABETICAL_SEPARATORS)), WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_FORMAT)), WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_STAR_MATH)), WID_CREATE_FROM_STAR_MATH               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_STAR_CHART)), WID_CREATE_FROM_STAR_CHART              ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_STAR_CALC)), WID_CREATE_FROM_STAR_CALC               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_STAR_DRAW)), WID_CREATE_FROM_STAR_DRAW               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS)), WID_CREATE_FROM_OTHER_EMBEDDED_OBJECTS  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLEHEADING)),     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL1)),  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_RELATIVE_TABSTOPS)), WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_ALPHABETICAL_SEPARATORS), WID_USE_ALPHABETICAL_SEPARATORS         ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT                        ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PROPERTY_NONE,0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_STAR_MATH), WID_CREATE_FROM_STAR_MATH               ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_STAR_CHART), WID_CREATE_FROM_STAR_CHART              ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_STAR_CALC), WID_CREATE_FROM_STAR_CALC               ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_STAR_DRAW), WID_CREATE_FROM_STAR_DRAW               ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS), WID_CREATE_FROM_OTHER_EMBEDDED_OBJECTS  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING),     WID_PARA_HEAD,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1),  WID_PARA_LEV1,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTOXObjectsMap_Impl;
             }
             break;
             case PROPERTY_MAP_INDEX_ILLUSTRATIONS:
             {
-                static SfxItemPropertyMapEntry const aTOXIllustrationsMap_Impl[] =
+                static SfxItemPropertyMapEntry aTOXIllustrationsMap_Impl[] =
                 {
                     _BASE_INDEX_PROPERTIES_
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_CHAPTER)), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CREATE_FROM_LABELS)), WID_CREATE_FROM_LABELS                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USE_ALPHABETICAL_SEPARATORS)), WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LABEL_CATEGORY)), WID_LABEL_CATEGORY                      ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LABEL_DISPLAY_TYPE)), WID_LABEL_DISPLAY_TYPE                  ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_FORMAT)), WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLEHEADING)),     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL1)),  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_RELATIVE_TABSTOPS)), WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_CREATE_FROM_LABELS), WID_CREATE_FROM_LABELS                  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_USE_ALPHABETICAL_SEPARATORS), WID_USE_ALPHABETICAL_SEPARATORS         ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LABEL_CATEGORY), WID_LABEL_CATEGORY                      ,  CPPU_E2T(CPPUTYPE_OUSTRING)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LABEL_DISPLAY_TYPE), WID_LABEL_DISPLAY_TYPE                  ,  CPPU_E2T(CPPUTYPE_INT16)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT                        ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PROPERTY_NONE,0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING),     WID_PARA_HEAD,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1),  WID_PARA_LEV1,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTOXIllustrationsMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXT_TABLE_ROW:
             {
-                static SfxItemPropertyMapEntry const aTableRowPropertyMap_Impl[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR         },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TABLE_COLUMN_SEPARATORS)), FN_UNO_TABLE_COLUMN_SEPARATORS,   cppu::UnoType< cppu::UnoSequenceType<css::text::TableColumnSeparator> >::get(),   PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HEIGHT)), FN_UNO_ROW_HEIGHT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,CONVERT_TWIPS },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTO_HEIGHT)), FN_UNO_ROW_AUTO_HEIGHT,    cppu::UnoType<bool>::get(),         PROPERTY_NONE , 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SIZE_TYPE)), RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WIDTH_TYPE)), RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SPLIT_ALLOWED)), RES_ROW_SPLIT,       cppu::UnoType<bool>::get()  , PropertyAttribute::MAYBEVOID, 0},
-                    {}
+                static SfxItemPropertyMapEntry aTableRowPropertyMap_Impl[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR         },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_SEPARATORS), FN_UNO_TABLE_COLUMN_SEPARATORS,   CPPU_E2T(CPPUTYPE_TBLCOLSEP),   PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_HEIGHT), FN_UNO_ROW_HEIGHT,     CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,CONVERT_TWIPS },
+                    { SW_PROP_NMID(UNO_NAME_IS_AUTO_HEIGHT), FN_UNO_ROW_AUTO_HEIGHT,    CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE , 0 },
+                    { SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE,           CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
+                    { SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE,          CPPU_E2T(CPPUTYPE_INT16)  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
+                    { SW_PROP_NMID(UNO_NAME_IS_SPLIT_ALLOWED), RES_ROW_SPLIT,       CPPU_E2T(CPPUTYPE_BOOLEAN)  , PropertyAttribute::MAYBEVOID, 0},
+                    {0,0,0,0,0,0}
                 };
 
                 aMapEntriesArr[nPropertyId] = (SfxItemPropertyMapEntry*)aTableRowPropertyMap_Impl;
@@ -1587,44 +1543,44 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             case PROPERTY_MAP_TEXT_TABLE_CURSOR:
             {
                 // das PropertySet entspricht dem Range ohne Chart-Properties
-                static SfxItemPropertyMapEntry const aTableCursorPropertyMap_Impl [] =
+                static SfxItemPropertyMapEntry aTableCursorPropertyMap_Impl [] =
                 {
                     COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01
                     TABSTOPS_MAP_ENTRY
 
                     // attributes from PROPERTY_MAP_TABLE_CELL:
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE , MID_BACK_COLOR       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)), RES_BOXATR_FORMAT,  cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_USER_DEFINED_ATTRIBUTES)), RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_SECTION)), FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), RES_PROTECT,            cppu::UnoType<bool>::get(), 0, MID_PROTECT_CONTENT},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VERT_ORIENT)), RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,    CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE , MID_BACK_COLOR       },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT,  CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID ,0             },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,  CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
+                    { SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
+                    { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), RES_PROTECT,            CPPU_E2T(CPPUTYPE_BOOLEAN), 0, MID_PROTECT_CONTENT},
+                    { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,      CPPU_E2T(CPPUTYPE_INT16),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTableCursorPropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_BOOKMARK:
             {
-                static SfxItemPropertyMapEntry const aBookmarkPropertyMap_Impl [] =
+                static SfxItemPropertyMapEntry aBookmarkPropertyMap_Impl [] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_LINK_DISPLAY_NAME)), FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xff},
+                    { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aBookmarkPropertyMap_Impl;
             }
             break;
             case PROPERTY_MAP_PARAGRAPH_EXTENSIONS:
             {
-                static SfxItemPropertyMapEntry const aParagraphExtensionsMap_Impl[] =
+                static SfxItemPropertyMapEntry aParagraphExtensionsMap_Impl[] =
                 {
                     COMMON_TEXT_CONTENT_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
 
                 aMapEntriesArr[nPropertyId] = aParagraphExtensionsMap_Impl;
@@ -1632,152 +1588,152 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             break;
             case PROPERTY_MAP_BIBLIOGRAPHY :
             {
-                static SfxItemPropertyMapEntry const aBibliographyMap_Impl[] =
+                static SfxItemPropertyMapEntry aBibliographyMap_Impl[] =
                 {
                     _BASE_INDEX_PROPERTIES_
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_PROTECTED)), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_COLUMNS)), RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_URL)), RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_FILTER)), RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_GRAPHIC_LOCATION)), RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_COLOR)), RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BACK_TRANSPARENT)), RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLEHEADING)),     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLELEVEL1)),  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL_FORMAT)), WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LOCALE)),            WID_IDX_LOCALE,         cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SORT_ALGORITHM)),    WID_IDX_SORT_ALGORITHM,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,     0},
+                    { SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL,                CPPU_E2T(CPPUTYPE_REFTEXTCOL),    PROPERTY_NONE, MID_COLUMNS},
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND,            CPPU_E2T(CPPUTYPE_INT32),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING),     WID_PARA_HEAD,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1),  WID_PARA_LEV1,  CPPU_E2T(CPPUTYPE_OUSTRING)  , 0,     0},
+                    { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT                        ,  CPPU_E2T(CPPUTYPE_REFIDXREPL)  , PROPERTY_NONE,0},
+                    { SW_PROP_NMID(UNO_NAME_LOCALE),            WID_IDX_LOCALE,         CPPU_E2T(CPPUTYPE_LOCALE), PROPERTY_NONE,     0},\
+                    { SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM),    WID_IDX_SORT_ALGORITHM,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE,     0},\
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aBibliographyMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXT_DOCUMENT:
             {
-                static SfxItemPropertyMapEntry const aDocMap_Impl[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BASIC_LIBRARIES)), WID_DOC_BASIC_LIBRARIES,  cppu::UnoType<css::script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_NAME)), RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_STYLE_NAME)), RES_CHRATR_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_FAMILY)), RES_CHRATR_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_CHAR_SET)), RES_CHRATR_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_PITCH)), RES_CHRATR_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_NAME_ASIAN)), RES_CHRATR_CJK_FONT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN)), RES_CHRATR_CJK_FONT,   cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_FAMILY_ASIAN)), RES_CHRATR_CJK_FONT,   cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN)), RES_CHRATR_CJK_FONT, cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_PITCH_ASIAN)), RES_CHRATR_CJK_FONT,    cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_NAME_COMPLEX)), RES_CHRATR_CTL_FONT,   cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX)), RES_CHRATR_CTL_FONT, cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX)), RES_CHRATR_CTL_FONT, cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX)), RES_CHRATR_CTL_FONT,   cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_FONT_PITCH_COMPLEX)), RES_CHRATR_CTL_FONT,  cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_LOCALE)), RES_CHRATR_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get(), PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHARACTER_COUNT)), WID_DOC_CHAR_COUNT,           cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DIALOG_LIBRARIES)), WID_DOC_DIALOG_LIBRARIES,  cppu::UnoType<css::script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_VBA_DOCOBJ)), WID_DOC_VBA_DOCOBJ,  cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L)), WID_DOC_AUTO_MARK_URL, cppu::UnoType<OUString>::get(),    PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PARAGRAPH_COUNT)), WID_DOC_PARA_COUNT,           cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RECORD_CHANGES)), WID_DOC_CHANGES_RECORD,        cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SHOW_CHANGES)), WID_DOC_CHANGES_SHOW,        cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WORD_COUNT)), WID_DOC_WORD_COUNT,            cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_TEMPLATE)), WID_DOC_ISTEMPLATEID,         cppu::UnoType<bool>::get(), PropertyAttribute::READONLY,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_WORD_SEPARATOR)), WID_DOC_WORD_SEPARATOR,        cppu::UnoType<OUString>::get(),    PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HIDE_FIELD_TIPS)), WID_DOC_HIDE_TIPS,            cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_DISPLAY_TYPE)), WID_DOC_REDLINE_DISPLAY,     cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_PROTECTION_KEY)), WID_DOC_CHANGES_PASSWORD,      cppu::UnoType< cppu::UnoSequenceType<sal_Int8> >::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FORBIDDEN_CHARACTERS)), WID_DOC_FORBIDDEN_CHARS,    cppu::UnoType<css::i18n::XForbiddenCharacters>::get(), PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TWO_DIGIT_YEAR)), WID_DOC_TWO_DIGIT_YEAR,    cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_AUTOMATIC_CONTROL_FOCUS)),       WID_DOC_AUTOMATIC_CONTROL_FOCUS,    cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_APPLY_FORM_DESIGN_MODE)),        WID_DOC_APPLY_FORM_DESIGN_MODE,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RUNTIME_UID)), WID_DOC_RUNTIME_UID,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_LOCK_UPDATES)),        WID_DOC_LOCK_UPDATES,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_HAS_VALID_SIGNATURES)),  WID_DOC_HAS_VALID_SIGNATURES, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY,   0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BUILDID)), WID_DOC_BUILDID, cppu::UnoType<OUString>::get(), 0, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DOC_INTEROP_GRAB_BAG)), WID_DOC_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DEFAULT_PAGE_MODE)),  WID_DOC_DEFAULT_PAGE_MODE,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {}
+                static SfxItemPropertyMapEntry aDocMap_Impl[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_BASIC_LIBRARIES), WID_DOC_BASIC_LIBRARIES,  CPPU_E2T(CPPUTYPE_REFLIBCONTAINER), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT,       CPPU_E2T(CPPUTYPE_OUSTRING),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME), RES_CHRATR_FONT,     CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY), RES_CHRATR_FONT,     CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET), RES_CHRATR_FONT,       CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH), RES_CHRATR_FONT,      CPPU_E2T(CPPUTYPE_INT16),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_ASIAN), RES_CHRATR_CJK_FONT,     CPPU_E2T(CPPUTYPE_OUSTRING),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN), RES_CHRATR_CJK_FONT,   CPPU_E2T(CPPUTYPE_OUSTRING),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_ASIAN), RES_CHRATR_CJK_FONT,   CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_ASIAN), RES_CHRATR_CJK_FONT,    CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_COMPLEX), RES_CHRATR_CTL_FONT,   CPPU_E2T(CPPUTYPE_OUSTRING),    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX), RES_CHRATR_CTL_FONT,   CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_COMPLEX), RES_CHRATR_CTL_FONT,  CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
+                    { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE ,   CPPU_E2T(CPPUTYPE_LOCALE), PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+                    { SW_PROP_NMID(UNO_NAME_CHARACTER_COUNT), WID_DOC_CHAR_COUNT,           CPPU_E2T(CPPUTYPE_INT32),   PropertyAttribute::READONLY,   0},
+                    { SW_PROP_NMID(UNO_NAME_DIALOG_LIBRARIES), WID_DOC_DIALOG_LIBRARIES,  CPPU_E2T(CPPUTYPE_REFLIBCONTAINER), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_VBA_DOCOBJ), WID_DOC_VBA_DOCOBJ,  CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L), WID_DOC_AUTO_MARK_URL, CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_PARAGRAPH_COUNT), WID_DOC_PARA_COUNT,           CPPU_E2T(CPPUTYPE_INT32),   PropertyAttribute::READONLY,   0},
+                    { SW_PROP_NMID(UNO_NAME_RECORD_CHANGES), WID_DOC_CHANGES_RECORD,        CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_SHOW_CHANGES), WID_DOC_CHANGES_SHOW,        CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_WORD_COUNT), WID_DOC_WORD_COUNT,            CPPU_E2T(CPPUTYPE_INT32),   PropertyAttribute::READONLY,   0},
+                    { SW_PROP_NMID(UNO_NAME_IS_TEMPLATE), WID_DOC_ISTEMPLATEID,         CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY,   0},
+                    { SW_PROP_NMID(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR,        CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS,            CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY,     CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_REDLINE_PROTECTION_KEY), WID_DOC_CHANGES_PASSWORD,      CPPU_E2T(CPPUTYPE_SEQINT8), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_FORBIDDEN_CHARACTERS), WID_DOC_FORBIDDEN_CHARS,    CPPU_E2T(CPPUTYPE_REFFORBCHARS), PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_TWO_DIGIT_YEAR), WID_DOC_TWO_DIGIT_YEAR,    CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_AUTOMATIC_CONTROL_FOCUS),       WID_DOC_AUTOMATIC_CONTROL_FOCUS,    CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_APPLY_FORM_DESIGN_MODE),        WID_DOC_APPLY_FORM_DESIGN_MODE,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_RUNTIME_UID), WID_DOC_RUNTIME_UID,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_LOCK_UPDATES),        WID_DOC_LOCK_UPDATES,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
+                    { SW_PROP_NMID(UNO_NAME_HAS_VALID_SIGNATURES),  WID_DOC_HAS_VALID_SIGNATURES, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY,   0},
+                    { SW_PROP_NMID(UNO_NAME_BUILDID), WID_DOC_BUILDID, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0},
+                    { SW_PROP_NMID(UNO_NAME_DOC_INTEROP_GRAB_BAG), WID_DOC_INTEROP_GRAB_BAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0 }, \
+                    { SW_PROP_NMID(UNO_NAME_DEFAULT_PAGE_MODE),  WID_DOC_DEFAULT_PAGE_MODE,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,  0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocMap_Impl;
             }
             break;
             case PROPERTY_MAP_LINK_TARGET:
             {
-                static SfxItemPropertyMapEntry const aLinkTargetMap_Impl[] =
+                static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_LINK_DISPLAY_BITMAP)), 0,     cppu::UnoType<css::awt::XBitmap>::get(), PropertyAttribute::READONLY, 0xff},
-                    { OUString::createFromAscii(GetPropName(UNO_LINK_DISPLAY_NAME)), 0,   cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xff},
-                    {}
+                    { SW_PROP_NMID(UNO_LINK_DISPLAY_BITMAP), 0,     CPPU_E2T(CPPUTYPE_REFBITMAP), PropertyAttribute::READONLY, 0xff},
+                    { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), 0,   CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aLinkTargetMap_Impl;
             }
             break;
             case PROPERTY_MAP_AUTO_TEXT_GROUP :
             {
-                static SfxItemPropertyMapEntry const aAutoTextGroupMap_Impl[] =
+                static SfxItemPropertyMapEntry aAutoTextGroupMap_Impl[] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILE_PATH)), WID_GROUP_PATH,     cppu::UnoType<OUString>::get(),    PROPERTY_NONE,   PropertyAttribute::READONLY},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TITLE)), WID_GROUP_TITLE, cppu::UnoType<OUString>::get(),   PROPERTY_NONE,   0},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_FILE_PATH), WID_GROUP_PATH,     CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE,   PropertyAttribute::READONLY},
+                    { SW_PROP_NMID(UNO_NAME_TITLE), WID_GROUP_TITLE, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE,   0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aAutoTextGroupMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXTPORTION_EXTENSIONS:
             {
-                static SfxItemPropertyMapEntry const aTextPortionExtensionMap_Impl[] =
+                static SfxItemPropertyMapEntry aTextPortionExtensionMap_Impl[] =
                 {
                     COMPLETE_TEXT_CURSOR_MAP
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_BOOKMARK)), FN_UNO_BOOKMARK, cppu::UnoType<css::text::XTextContent>::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTROL_CHARACTER)), FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_COLLAPSED)), FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_START)), FN_UNO_IS_START, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+                    {SW_PROP_NMID(UNO_NAME_BOOKMARK), FN_UNO_BOOKMARK, CPPU_E2T(CPPUTYPE_REFTEXTCNTNT),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+                    {SW_PROP_NMID(UNO_NAME_CONTROL_CHARACTER), FN_UNO_CONTROL_CHARACTER, CPPU_E2T(CPPUTYPE_INT16),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
+                    {SW_PROP_NMID(UNO_NAME_IS_COLLAPSED), FN_UNO_IS_COLLAPSED, CPPU_E2T(CPPUTYPE_BOOLEAN),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+                    {SW_PROP_NMID(UNO_NAME_IS_START), FN_UNO_IS_START, CPPU_E2T(CPPUTYPE_BOOLEAN),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
                     //_REDLINE_PROPERTIES
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_PORTION_TYPE)), FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(),                        PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_META)), FN_UNO_META, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_TEXT_PORTION_TYPE), FN_UNO_TEXT_PORTION_TYPE, CPPU_E2T(CPPUTYPE_OUSTRING),                        PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_META), FN_UNO_META, CPPU_E2T(CPPUTYPE_REFTEXTCNTNT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTextPortionExtensionMap_Impl;
             }
             break;
             case PROPERTY_MAP_FOOTNOTE:
             {
-                static SfxItemPropertyMapEntry const aFootnoteMap_Impl[] =
+                static SfxItemPropertyMapEntry aFootnoteMap_Impl[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_REFERENCE_ID)), 0, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
+                    {SW_PROP_NMID(UNO_NAME_REFERENCE_ID), 0, CPPU_E2T(CPPUTYPE_INT16),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
                     COMMON_TEXT_CONTENT_PROPERTIES
                     _REDLINE_NODE_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aFootnoteMap_Impl;
             }
             break;
             case PROPERTY_MAP_TEXT_COLUMS :
             {
-                static SfxItemPropertyMapEntry const aTextColumns_Impl[] =
+                static SfxItemPropertyMapEntry aTextColumns_Impl[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTOMATIC)), WID_TXTCOL_IS_AUTOMATIC, cppu::UnoType<bool>::get(),PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_AUTOMATIC_DISTANCE)), WID_TXTCOL_AUTO_DISTANCE, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_LINE_WIDTH)), WID_TXTCOL_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_LINE_COLOR)), WID_TXTCOL_LINE_COLOR, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT)), WID_TXTCOL_LINE_REL_HGT, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT)), WID_TXTCOL_LINE_ALIGN, cppu::UnoType<css::style::VerticalAlignment>::get(),PROPERTY_NONE,   0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_LINE_IS_ON)), WID_TXTCOL_LINE_IS_ON, cppu::UnoType<bool>::get(),PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_LINE_STYLE)), WID_TXTCOL_LINE_STYLE, cppu::UnoType<sal_Int8>::get(),PROPERTY_NONE, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC), WID_TXTCOL_IS_AUTOMATIC, CPPU_E2T(CPPUTYPE_BOOLEAN),PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_AUTOMATIC_DISTANCE), WID_TXTCOL_AUTO_DISTANCE, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_WIDTH), WID_TXTCOL_LINE_WIDTH, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_COLOR), WID_TXTCOL_LINE_COLOR, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT), WID_TXTCOL_LINE_REL_HGT, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT), WID_TXTCOL_LINE_ALIGN, CPPU_E2T(CPPUTYPE_VERTALIGN),PROPERTY_NONE,   0},
+                    {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_IS_ON), WID_TXTCOL_LINE_IS_ON, CPPU_E2T(CPPUTYPE_BOOLEAN),PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_STYLE), WID_TXTCOL_LINE_STYLE, CPPU_E2T(CPPUTYPE_INT8),PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTextColumns_Impl;
             }
             break;
             case PROPERTY_MAP_REDLINE :
             {
-                static SfxItemPropertyMapEntry const aRedlineMap_Impl[] =
+                static SfxItemPropertyMapEntry aRedlineMap_Impl[] =
                 {
                     _REDLINE_PROPERTIES
                     _REDLINE_NODE_PROPERTIES
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_START)), 0, cppu::UnoType<css::uno::XInterface>::get(),  PropertyAttribute::READONLY,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_REDLINE_END)), 0, cppu::UnoType<css::uno::XInterface>::get(),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_REDLINE_START), 0, CPPU_E2T(CPPUTYPE_REFINTERFACE),  PropertyAttribute::READONLY,    0},
+                    {SW_PROP_NMID(UNO_NAME_REDLINE_END), 0, CPPU_E2T(CPPUTYPE_REFINTERFACE),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aRedlineMap_Impl;
             }
@@ -1786,24 +1742,24 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry aTextDefaultMap_Impl[] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_TAB_STOP_DISTANCE)), RES_PARATR_TABSTOP,     cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, MID_STD_TAB | CONVERT_TWIPS},
+                    { SW_PROP_NMID(UNO_NAME_TAB_STOP_DISTANCE), RES_PARATR_TABSTOP,     CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE, MID_STD_TAB | CONVERT_TWIPS},
                     COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN
                     COMMON_HYPERLINK_PROPERTIES
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAME)), RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID,     0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SPLIT_ALLOWED)), RES_ROW_SPLIT,       cppu::UnoType<bool>::get()  , PropertyAttribute::MAYBEVOID, 0},
+                    { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT,     CPPU_E2T(CPPUTYPE_OUSTRING),  PropertyAttribute::MAYBEVOID,     0},
+                    { SW_PROP_NMID(UNO_NAME_IS_SPLIT_ALLOWED), RES_ROW_SPLIT,       CPPU_E2T(CPPUTYPE_BOOLEAN)  , PropertyAttribute::MAYBEVOID, 0},
                     // #i29550#
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_COLLAPSING_BORDERS)), RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_COLLAPSING_BORDERS), RES_COLLAPSING_BORDERS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
 
             //text grid enhancement for better CJK support.  2007-04-01
             //just export the default page mode property, other properties are not handled in this version
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_GRID_STANDARD_PAGE_MODE)), RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_GRID_STANDARD_PAGE_MODE), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTextDefaultMap_Impl;
                 for( SfxItemPropertyMapEntry * pMap = aTextDefaultMap_Impl;
-                     !pMap->aName.isEmpty(); ++pMap )
+                        pMap->pName; ++pMap )
                 {
-                    // OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_DESC_NAME)) should keep its MAYBEVOID flag
+                    // UNO_NAME_PAGE_DESC_NAME should keep its MAYBEVOID flag
                     if (!(RES_PAGEDESC == pMap->nWID && MID_PAGEDESC_PAGEDESCNAME == pMap->nMemberId))
                         pMap->nFlags &= ~PropertyAttribute::MAYBEVOID;
                 }
@@ -1811,46 +1767,46 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             break;
             case PROPERTY_MAP_REDLINE_PORTION :
             {
-                static SfxItemPropertyMapEntry const aRedlinePortionMap_Impl[] =
+                static SfxItemPropertyMapEntry aRedlinePortionMap_Impl[] =
                 {
                     COMPLETE_TEXT_CURSOR_MAP
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_BOOKMARK)), FN_UNO_BOOKMARK, cppu::UnoType<css::text::XTextContent>::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTROL_CHARACTER)), FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_COLLAPSED)), FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_START)), FN_UNO_IS_START, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+                    {SW_PROP_NMID(UNO_NAME_BOOKMARK), FN_UNO_BOOKMARK, CPPU_E2T(CPPUTYPE_REFTEXTCNTNT),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+                    {SW_PROP_NMID(UNO_NAME_CONTROL_CHARACTER), FN_UNO_CONTROL_CHARACTER, CPPU_E2T(CPPUTYPE_INT16),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
+                    {SW_PROP_NMID(UNO_NAME_IS_COLLAPSED), FN_UNO_IS_COLLAPSED, CPPU_E2T(CPPUTYPE_BOOLEAN),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+                    {SW_PROP_NMID(UNO_NAME_IS_START), FN_UNO_IS_START, CPPU_E2T(CPPUTYPE_BOOLEAN),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
                     _REDLINE_PROPERTIES
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_PORTION_TYPE)), FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(),                        PropertyAttribute::READONLY, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_TEXT_PORTION_TYPE), FN_UNO_TEXT_PORTION_TYPE, CPPU_E2T(CPPUTYPE_OUSTRING),                        PropertyAttribute::READONLY, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aRedlinePortionMap_Impl;
             }
             break;
             case  PROPERTY_MAP_FLDTYP_DATETIME:
             {
-                static SfxItemPropertyMapEntry const aDateTimeFieldPropMap[] =
+                static SfxItemPropertyMapEntry aDateTimeFieldPropMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_ADJUST)), FIELD_PROP_SUBTYPE,     cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATE_TIME_VALUE)), FIELD_PROP_DATE_TIME,  cppu::UnoType<css::util::DateTime>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_DATE)),    FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)), FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_ADJUST), FIELD_PROP_SUBTYPE,     CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DATE_TIME,  CPPU_E2T(CPPUTYPE_DATETIME), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),       FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_IS_DATE),    FIELD_PROP_BOOL2,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT,   CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDateTimeFieldPropMap;
             }
             break;
             case  PROPERTY_MAP_FLDTYP_USER     :
             {
-                static SfxItemPropertyMapEntry const aUserFieldPropMap[] =
+                static SfxItemPropertyMapEntry aUserFieldPropMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_SHOW_FORMULA)), FIELD_PROP_BOOL2,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_VISIBLE)),     FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)),  FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL2,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_IS_VISIBLE),     FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),  FIELD_PROP_FORMAT,  CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
 
                 aMapEntriesArr[nPropertyId] = aUserFieldPropMap;
@@ -1858,694 +1814,694 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             break;
             case  PROPERTY_MAP_FLDTYP_SET_EXP  :
             {
-                static SfxItemPropertyMapEntry const aSetExpFieldPropMap     [] =
-                {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),            FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_HINT)),               FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)),      FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),     FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_INPUT)),       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    // #i69733# wrong name - OUString::createFromAscii(GetPropName(UNO_NAME_IS_INPUT)) expanded to "Input" instead of "IsInput"
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INPUT)),          FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_SHOW_FORMULA)), FIELD_PROP_BOOL3,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_VISIBLE)),       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEQUENCE_VALUE)), FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SUB_TYPE)),           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_VALUE)),          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(),  PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_VARIABLE_NAME)),  FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                static SfxItemPropertyMapEntry aSetExpFieldPropMap     [] =
+                {
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),            FIELD_PROP_PAR2,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_HINT),               FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),      FIELD_PROP_FORMAT,  CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE),     FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_INPUT),       FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    // #i69733# wrong name - UNO_NAME_IS_INPUT expanded to "Input" instead of "IsInput"
+                    {SW_PROP_NMID(UNO_NAME_INPUT),          FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL3,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_IS_VISIBLE),       FIELD_PROP_BOOL2,   CPPU_E2T(CPPUTYPE_BOOLEAN),    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SEQUENCE_VALUE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_SUB_TYPE),           FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_VALUE),          FIELD_PROP_DOUBLE,  CPPU_E2T(CPPUTYPE_DOUBLE),  PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_VARIABLE_NAME),  FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING),   PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aSetExpFieldPropMap;
             }
             break;
             case  PROPERTY_MAP_FLDTYP_GET_EXP  :
             {
-                static SfxItemPropertyMapEntry const aGetExpFieldPropMap     [] =
+                static SfxItemPropertyMapEntry aGetExpFieldPropMap     [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_SHOW_FORMULA)), FIELD_PROP_BOOL2,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)),  FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SUB_TYPE)),           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_VALUE)),          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_VARIABLE_SUBTYPE)),   FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),            FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL2,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),  FIELD_PROP_FORMAT,  CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_SUB_TYPE),           FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_VALUE),          FIELD_PROP_DOUBLE,  CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_VARIABLE_SUBTYPE),   FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aGetExpFieldPropMap;
             }
             break;
             case  PROPERTY_MAP_FLDTYP_FILE_NAME:
             {
-                static SfxItemPropertyMapEntry const aFileNameFieldPropMap   [] =
+                static SfxItemPropertyMapEntry aFileNameFieldPropMap   [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_FILE_FORMAT)), FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),   FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),   FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN),       PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aFileNameFieldPropMap;
             }
             break;
             case  PROPERTY_MAP_FLDTYP_PAGE_NUM :
             {
-                static SfxItemPropertyMapEntry const aPageNumFieldPropMap        [] =
+                static SfxItemPropertyMapEntry aPageNumFieldPropMap        [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),     FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_OFFSET)),             FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),  PROPERTY_NONE,   0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SUB_TYPE)),           FIELD_PROP_SUBTYPE, cppu::UnoType<css::text::PageNumberType>::get(), PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_USERTEXT)),           FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE),     FIELD_PROP_FORMAT,  CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_OFFSET),             FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16),  PROPERTY_NONE,   0},
+                    {SW_PROP_NMID(UNO_NAME_SUB_TYPE),           FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_PAGENUMTYPE), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_USERTEXT),           FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aPageNumFieldPropMap;
             }
             break;
             case  PROPERTY_MAP_FLDTYP_AUTHOR   :
             {
-                static SfxItemPropertyMapEntry const aAuthorFieldPropMap     [] =
+                static SfxItemPropertyMapEntry aAuthorFieldPropMap     [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),   FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_FULL_NAME)),FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),    FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),   FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN),       PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_FULL_NAME),FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aAuthorFieldPropMap;
             }
             break;
             case  PROPERTY_MAP_FLDTYP_CHAPTER  :
             {
-                static SfxItemPropertyMapEntry const aChapterFieldPropMap        [] =
+                static SfxItemPropertyMapEntry aChapterFieldPropMap        [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CHAPTER_FORMAT)),FIELD_PROP_USHORT1,  cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_LEVEL)),FIELD_PROP_BYTE1,         cppu::UnoType<sal_Int8>::get(),    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CHAPTER_FORMAT),FIELD_PROP_USHORT1,  CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_LEVEL        ),FIELD_PROP_BYTE1,         CPPU_E2T(CPPUTYPE_INT8),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aChapterFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_GET_REFERENCE          :
             {
-                static SfxItemPropertyMapEntry const aGetRefFieldPropMap     [] =
+                static SfxItemPropertyMapEntry aGetRefFieldPropMap     [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_REFERENCE_FIELD_PART)),FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),  PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_REFERENCE_FIELD_SOURCE)),FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SEQUENCE_NUMBER)),    FIELD_PROP_SHORT1,  cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SOURCE_NAME)),        FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_REFERENCE_FIELD_PART),FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16),  PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_REFERENCE_FIELD_SOURCE),FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16),    PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_SEQUENCE_NUMBER),    FIELD_PROP_SHORT1,  CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SOURCE_NAME),        FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aGetRefFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_CONDITIONED_TEXT      :
             {
-                static SfxItemPropertyMapEntry const aConditionedTxtFieldPropMap [] =
+                static SfxItemPropertyMapEntry aConditionedTxtFieldPropMap [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONDITION)),      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_FALSE_CONTENT)),  FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_CONDITION_TRUE)) ,  FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_TRUE_CONTENT)) ,  FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONDITION),      FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_FALSE_CONTENT),  FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_CONDITION_TRUE) ,  FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_TRUE_CONTENT) ,  FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aConditionedTxtFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_HIDDEN_TEXT :
             {
-                static SfxItemPropertyMapEntry const aHiddenTxtFieldPropMap  [] =
+                static SfxItemPropertyMapEntry aHiddenTxtFieldPropMap  [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONDITION)),      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)) ,       FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_HIDDEN)) ,     FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONDITION),      FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT) ,       FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_HIDDEN) ,     FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aHiddenTxtFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_ANNOTATION            :
             {
-                static SfxItemPropertyMapEntry const aAnnotationFieldPropMap [] =
+                static SfxItemPropertyMapEntry aAnnotationFieldPropMap [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_AUTHOR)), FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),    FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INITIALS)),   FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),       FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATE_TIME_VALUE)),    FIELD_PROP_DATE_TIME,   cppu::UnoType<css::util::DateTime>::get(),    PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATE)),    FIELD_PROP_DATE,   cppu::UnoType<css::util::Date>::get(),    PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_TEXT_RANGE)), FIELD_PROP_TEXT, cppu::UnoType<css::uno::XInterface>::get(),  PropertyAttribute::READONLY,    0},
+                    {SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),    FIELD_PROP_PAR2,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_INITIALS),   FIELD_PROP_PAR3,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NAME),       FIELD_PROP_PAR4,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE),    FIELD_PROP_DATE_TIME,   CPPU_E2T(CPPUTYPE_DATETIME),    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATE),    FIELD_PROP_DATE,   CPPU_E2T(CPPUTYPE_DATE),    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_TEXT_RANGE), FIELD_PROP_TEXT, CPPU_E2T(CPPUTYPE_REFINTERFACE),  PropertyAttribute::READONLY,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aAnnotationFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_INPUT:
             {
-                static SfxItemPropertyMapEntry const aInputFieldPropMap      [] =
+                static SfxItemPropertyMapEntry aInputFieldPropMap      [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_HINT)),       FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_HELP)),       FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_TOOLTIP)),        FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),    FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_HINT),       FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_HELP),       FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_TOOLTIP),        FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aInputFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_MACRO                 :
             {
-                static SfxItemPropertyMapEntry const aMacroFieldPropMap      [] =
+                static SfxItemPropertyMapEntry aMacroFieldPropMap      [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_HINT)), FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_MACRO_NAME)),FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_MACRO_LIBRARY)),FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SCRIPT_URL)),FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_MACRO_NAME),FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_MACRO_LIBRARY),FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SCRIPT_URL),FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING),PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aMacroFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DDE                   :
             {
-                static SfxItemPropertyMapEntry const aDDEFieldPropMap            [] =
+                static SfxItemPropertyMapEntry aDDEFieldPropMap            [] =
                 {
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDDEFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DROPDOWN :
             {
-                static SfxItemPropertyMapEntry const aDropDownMap            [] =
+                static SfxItemPropertyMapEntry aDropDownMap            [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_ITEMS)), FIELD_PROP_STRINGS, cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SELITEM)), FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)), FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_HELP)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_TOOLTIP)), FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_ITEMS), FIELD_PROP_STRINGS, CPPU_E2T(CPPUTYPE_OUSTRINGS), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SELITEM), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_HELP), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_TOOLTIP), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDropDownMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_HIDDEN_PARA           :
             {
-                static SfxItemPropertyMapEntry const aHiddenParaFieldPropMap [] =
+                static SfxItemPropertyMapEntry aHiddenParaFieldPropMap [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONDITION)),FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_HIDDEN)) ,  FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONDITION),FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_HIDDEN) ,  FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aHiddenParaFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOC_INFO              :
             {
-                static SfxItemPropertyMapEntry const aDocInfoFieldPropMap        [] =
+                static SfxItemPropertyMapEntry aDocInfoFieldPropMap        [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INFO_FORMAT)),    FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INFO_TYPE)),  FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),       FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_INFO_FORMAT),    FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_INFO_TYPE),  FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocInfoFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_TEMPLATE_NAME         :
             {
-                static SfxItemPropertyMapEntry const aTmplNameFieldPropMap   [] =
+                static SfxItemPropertyMapEntry aTmplNameFieldPropMap   [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_FILE_FORMAT)), FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTmplNameFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_USER_EXT              :
             {
-                static SfxItemPropertyMapEntry const aUsrExtFieldPropMap     [] =
+                static SfxItemPropertyMapEntry aUsrExtFieldPropMap     [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),           FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_USER_DATA_TYPE)), FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),            FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),           FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_USER_DATA_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId]= aUsrExtFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_REF_PAGE_SET          :
             {
-                static SfxItemPropertyMapEntry const aRefPgSetFieldPropMap   [] =
+                static SfxItemPropertyMapEntry aRefPgSetFieldPropMap   [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_OFFSET)),     FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_ON)),     FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_OFFSET),     FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_ON),     FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aRefPgSetFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_REF_PAGE_GET          :
             {
-                static SfxItemPropertyMapEntry const aRefPgGetFieldPropMap   [] =
+                static SfxItemPropertyMapEntry aRefPgGetFieldPropMap   [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),     FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE),     FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aRefPgGetFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_JUMP_EDIT             :
             {
-                static SfxItemPropertyMapEntry const aJumpEdtFieldPropMap        [] =
+                static SfxItemPropertyMapEntry aJumpEdtFieldPropMap        [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_HINT)),               FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_PLACEHOLDER)),        FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_PLACEHOLDER_TYPE)), FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),     PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_HINT),               FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_PLACEHOLDER),        FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_PLACEHOLDER_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16),     PROPERTY_NONE,  0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aJumpEdtFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_SCRIPT                :
             {
-                static SfxItemPropertyMapEntry const aScriptFieldPropMap     [] =
+                static SfxItemPropertyMapEntry aScriptFieldPropMap     [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),        FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SCRIPT_TYPE)),    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_URL_CONTENT)),    FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),        FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SCRIPT_TYPE),    FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_URL_CONTENT),    FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN),       PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aScriptFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DATABASE_NEXT_SET     :
             {
-                static SfxItemPropertyMapEntry const aDBNextSetFieldPropMap  [] =
+                static SfxItemPropertyMapEntry aDBNextSetFieldPropMap  [] =
                 {
                     // Note: DATA_BASE_NAME and DATA_BASE_URL
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_NAME)) , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_TABLE_NAME)) , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONDITION))   ,     FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_URL)) ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_COMMAND_TYPE)), FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_NAME ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONDITION)   ,     FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) ,  FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDBNextSetFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DATABASE_NUM_SET      :
             {
-                static SfxItemPropertyMapEntry const aDBNumSetFieldPropMap   [] =
+                static SfxItemPropertyMapEntry aDBNumSetFieldPropMap   [] =
                 {
                     // Note: DATA_BASE_NAME and DATA_BASE_URL
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_NAME)) ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_TABLE_NAME)), FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONDITION)),         FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_URL)) ,   FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_COMMAND_TYPE)), FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SET_NUMBER)), FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_NAME ) ,  FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME  ), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONDITION),         FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) ,   FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SET_NUMBER       ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,  0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDBNumSetFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DATABASE_SET_NUM      :
             {
-                static SfxItemPropertyMapEntry const aDBSetNumFieldPropMap   [] =
+                static SfxItemPropertyMapEntry aDBSetNumFieldPropMap   [] =
                 {
                     // Note: DATA_BASE_NAME and DATA_BASE_URL
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_NAME)) , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_TABLE_NAME)) , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_URL)) ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_COMMAND_TYPE)), FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),       FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SET_NUMBER)), FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,  0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_VISIBLE)),       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_NAME ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) ,  FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE),       FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_SET_NUMBER       ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_IS_VISIBLE),       FIELD_PROP_BOOL2,   CPPU_E2T(CPPUTYPE_BOOLEAN),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDBSetNumFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DATABASE              :
             {
-                static SfxItemPropertyMapEntry const aDBFieldPropMap         [] =
+                static SfxItemPropertyMapEntry aDBFieldPropMap         [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_FIELD_CODE)),         FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_DATA_BASE_FORMAT)),FIELD_PROP_BOOL1, cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)),      FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_VISIBLE)),       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),            FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_FIELD_CODE),         FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_DATA_BASE_FORMAT),FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),      FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_VISIBLE),       FIELD_PROP_BOOL2,   CPPU_E2T(CPPUTYPE_BOOLEAN),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDBFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DATABASE_NAME         :
             {
-                static SfxItemPropertyMapEntry const aDBNameFieldPropMap     [] =
+                static SfxItemPropertyMapEntry aDBNameFieldPropMap     [] =
                 {
                     // Note: DATA_BASE_NAME and DATA_BASE_URL
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_NAME)) , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_TABLE_NAME)) , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_URL)) ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_COMMAND_TYPE)), FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_VISIBLE)),       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_NAME ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) ,  FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_VISIBLE),       FIELD_PROP_BOOL2,   CPPU_E2T(CPPUTYPE_BOOLEAN),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDBNameFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOCSTAT:
             {
-                static SfxItemPropertyMapEntry const aDocstatFieldPropMap        [] =
+                static SfxItemPropertyMapEntry aDocstatFieldPropMap        [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),     FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                //  {OUString::createFromAscii(GetPropName(UNO_NAME_STATISTIC_TYPE_ID)),FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE),     FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                //  {UNO_NAME_STATISTIC_TYPE_ID,FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16),   PROPERTY_NONE,  0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocstatFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOCINFO_AUTHOR:
             {
-                static SfxItemPropertyMapEntry const aDocInfoAuthorPropMap           [] =
+                static SfxItemPropertyMapEntry aDocInfoAuthorPropMap           [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_AUTHOR)), FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),   FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocInfoAuthorPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOCINFO_DATE_TIME:
             {
-                static SfxItemPropertyMapEntry const aDocInfoDateTimePropMap         [] =
+                static SfxItemPropertyMapEntry aDocInfoDateTimePropMap         [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATE_TIME_VALUE)),        FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_DATE)),    FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)),FIELD_PROP_FORMAT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE),        FIELD_PROP_DOUBLE,  CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_DATE),    FIELD_PROP_BOOL2,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT,    CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),       FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocInfoDateTimePropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOCINFO_EDIT_TIME     :
             {
-                static SfxItemPropertyMapEntry const aDocInfoEditTimePropMap         [] =
+                static SfxItemPropertyMapEntry aDocInfoEditTimePropMap         [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATE_TIME_VALUE)),        FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)),FIELD_PROP_FORMAT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE),        FIELD_PROP_DOUBLE,  CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT,    CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),       FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocInfoEditTimePropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOCINFO_MISC:
             {
-                static SfxItemPropertyMapEntry const aDocInfoStringContentPropMap            [] =
+                static SfxItemPropertyMapEntry aDocInfoStringContentPropMap            [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),    FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),    FIELD_PROP_PAR1,    CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),   FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocInfoStringContentPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOCINFO_CUSTOM:
             {
-                static SfxItemPropertyMapEntry const aDocInfoCustomPropMap           [] =
+                static SfxItemPropertyMapEntry aDocInfoCustomPropMap           [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),   FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)), FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_NAME),   FIELD_PROP_PAR4,    CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),   FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT,   CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocInfoCustomPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DOCINFO_REVISION          :
             {
-                static SfxItemPropertyMapEntry const aDocInfoRevisionPropMap [] =
+                static SfxItemPropertyMapEntry aDocInfoRevisionPropMap [] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_REVISION)),   FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED)),   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_REVISION),   FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED),   FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocInfoRevisionPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_COMBINED_CHARACTERS:
             {
-                static SfxItemPropertyMapEntry const aCombinedCharactersPropMap[] =
+                static SfxItemPropertyMapEntry aCombinedCharactersPropMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)), FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aCombinedCharactersPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_TABLE_FORMULA:
             {
-                static SfxItemPropertyMapEntry const aTableFormulaPropMap[] =
+                static SfxItemPropertyMapEntry aTableFormulaPropMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CURRENT_PRESENTATION)), FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)), FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_SHOW_FORMULA)), FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)), FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL1,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT,   CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTableFormulaPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_DUMMY_0:
             {
-                static SfxItemPropertyMapEntry const aEmptyPropMap           [] =
+                static SfxItemPropertyMapEntry aEmptyPropMap           [] =
                 {
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aEmptyPropMap;
             }
             break;
             case PROPERTY_MAP_FLDMSTR_USER :
             {
-                static SfxItemPropertyMapEntry const aUserFieldTypePropMap[] =
+                static SfxItemPropertyMapEntry aUserFieldTypePropMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DEPENDENT_TEXT_FIELDS)),  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_EXPRESSION)),      FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_VALUE)),          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PROPERTY_NONE,   0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),            FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INSTANCE_NAME)),      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS),  FIELD_PROP_PROP_SEQ,    CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_EXPRESSION),      FIELD_PROP_BOOL1,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
+                    {SW_PROP_NMID(UNO_NAME_NAME),               FIELD_PROP_PAR1,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0},
+                    {SW_PROP_NMID(UNO_NAME_VALUE),          FIELD_PROP_DOUBLE,  CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE,   0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),            FIELD_PROP_PAR2,    CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME),      FIELD_PROP_PAR3,    CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aUserFieldTypePropMap;
             }
             break;
             case PROPERTY_MAP_FLDMSTR_DDE       :
             {
-                static SfxItemPropertyMapEntry const aDDEFieldTypePropMap[] =
+                static SfxItemPropertyMapEntry aDDEFieldTypePropMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DDE_COMMAND_ELEMENT)), FIELD_PROP_PAR2,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DDE_COMMAND_FILE)), FIELD_PROP_PAR4,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DDE_COMMAND_TYPE)), FIELD_PROP_SUBTYPE,   cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DEPENDENT_TEXT_FIELDS)),  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTOMATIC_UPDATE)), FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INSTANCE_NAME)),      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CONTENT)),            FIELD_PROP_PAR5,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_ELEMENT ), FIELD_PROP_PAR2,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_FILE    ), FIELD_PROP_PAR4,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_TYPE    ), FIELD_PROP_SUBTYPE,   CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS),  FIELD_PROP_PROP_SEQ,    CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_UPDATE), FIELD_PROP_BOOL1,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_NAME),               FIELD_PROP_PAR1,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME),      FIELD_PROP_PAR3,    CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_CONTENT),            FIELD_PROP_PAR5,    CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDDEFieldTypePropMap;
             }
             break;
             case PROPERTY_MAP_FLDMSTR_SET_EXP     :
             {
-                static SfxItemPropertyMapEntry const aSetExpFieldTypePropMap[] =
+                static SfxItemPropertyMapEntry aSetExpFieldTypePropMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_CHAPTER_NUMBERING_LEVEL)),FIELD_PROP_SHORT1,  cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DEPENDENT_TEXT_FIELDS)),  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_SEPARATOR)), FIELD_PROP_PAR2,   cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SUB_TYPE)),           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INSTANCE_NAME)),      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_CHAPTER_NUMBERING_LEVEL),FIELD_PROP_SHORT1,  CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS),  FIELD_PROP_PROP_SEQ,    CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_NAME),               FIELD_PROP_PAR1,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBERING_SEPARATOR), FIELD_PROP_PAR2,   CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_SUB_TYPE),           FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME),      FIELD_PROP_PAR3,    CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aSetExpFieldTypePropMap;
             }
             break;
             case PROPERTY_MAP_FLDMSTR_DATABASE    :
             {
-                static SfxItemPropertyMapEntry const aDBFieldTypePropMap         [] =
+                static SfxItemPropertyMapEntry aDBFieldTypePropMap         [] =
                 {
                     // Note: DATA_BASE_NAME and DATA_BASE_URL
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_NAME)) ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),              FIELD_PROP_PAR3,  cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_TABLE_NAME)), FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_COLUMN_NAME)), FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INSTANCE_NAME)),     FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_BASE_URL)) ,   FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DATA_COMMAND_TYPE)), FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DEPENDENT_TEXT_FIELDS)),  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_NAME ) ,  FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_NAME),              FIELD_PROP_PAR3,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME  ), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_COLUMN_NAME ), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME),     FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) ,   FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS),  FIELD_PROP_PROP_SEQ,    CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDBFieldTypePropMap;
             }
             break;
             case PROPERTY_MAP_FLDMSTR_DUMMY0      :
             {
-                static SfxItemPropertyMapEntry const aStandardFieldMasterMap[] =
+                static SfxItemPropertyMapEntry aStandardFieldMasterMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_DEPENDENT_TEXT_FIELDS)),  0,  cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),               0,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INSTANCE_NAME)),      0,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS),  0,  CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_NAME),               0,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME),      0,  CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aStandardFieldMasterMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_BIBLIOGRAPHY:
             {
-                static SfxItemPropertyMapEntry const aBibliographyFieldMap[] =
+                static SfxItemPropertyMapEntry aBibliographyFieldMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_FIELDS))    , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_FIELDS  )    , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUE),PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aBibliographyFieldMap;
             }
             break;
             case PROPERTY_MAP_FLDMSTR_BIBLIOGRAPHY:
             {
-                static SfxItemPropertyMapEntry const aBibliographyFieldMasterMap[] =
+                static SfxItemPropertyMapEntry aBibliographyFieldMasterMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_BRACKET_BEFORE)) , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),               PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_BRACKET_AFTER)) , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),               PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_NUMBER_ENTRIES)) , FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),                    PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_SORT_BY_POSITION)) , FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),                    PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_LOCALE)),            FIELD_PROP_LOCALE,  cppu::UnoType<css::lang::Locale>::get()  , PROPERTY_NONE,     0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SORT_ALGORITHM)),    FIELD_PROP_PAR3,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_SORT_KEYS)) , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValues> >::get(),   PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_INSTANCE_NAME)),      FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_BRACKET_BEFORE     ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING),               PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_BRACKET_AFTER      ) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING),               PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_NUMBER_ENTRIES  ) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN),                    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_SORT_BY_POSITION) , FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN),                    PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_LOCALE),            FIELD_PROP_LOCALE,  CPPU_E2T(CPPUTYPE_LOCALE)  , PROPERTY_NONE,     0},
+                    {SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM),    FIELD_PROP_PAR3,  CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE,     0},
+                    {SW_PROP_NMID(UNO_NAME_SORT_KEYS          ) , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUES),   PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME),      FIELD_PROP_PAR4,    CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aBibliographyFieldMasterMap;
             }
             break;
             case PROPERTY_MAP_TEXT :
             {
-                static SfxItemPropertyMapEntry const aTextMap[] =
+                static SfxItemPropertyMapEntry aTextMap[] =
                 {
                     _REDLINE_NODE_PROPERTIES
-                    {}
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aTextMap;
             }
             break;
             case PROPERTY_MAP_MAILMERGE :
             {
-                static SfxItemPropertyMapEntry const aMailMergeMap[] =
-                {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SELECTION)),             WID_SELECTION,              cppu::UnoType< cppu::UnoSequenceType<css::uno::Any> >::get(),      PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_RESULT_SET)),            WID_RESULT_SET,             cppu::UnoType<css::sdbc::XResultSet>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_CONNECTION)),            WID_CONNECTION,             cppu::UnoType<css::sdbc::XConnection>::get(), PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_MODEL)),                 WID_MODEL,                  cppu::UnoType<css::frame::XModel>::get(),    PropertyAttribute::READONLY, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DATA_SOURCE_NAME)),      WID_DATA_SOURCE_NAME,       cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DAD_COMMAND)),           WID_DATA_COMMAND,           cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILTER)),                WID_FILTER,                 cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DOCUMENT_URL)),          WID_DOCUMENT_URL,           cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_OUTPUT_URL)),            WID_OUTPUT_URL,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_DAD_COMMAND_TYPE)),      WID_DATA_COMMAND_TYPE,      cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_OUTPUT_TYPE)),           WID_OUTPUT_TYPE,            cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ESCAPE_PROCESSING)),     WID_ESCAPE_PROCESSING,      cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SINGLE_PRINT_JOBS)),     WID_SINGLE_PRINT_JOBS,      cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILE_NAME_FROM_COLUMN)), WID_FILE_NAME_FROM_COLUMN,  cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_FILE_NAME_PREFIX)),      WID_FILE_NAME_PREFIX,       cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SUBJECT)),               WID_MAIL_SUBJECT,           cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ADDRESS_FROM_COLUMN)),   WID_ADDRESS_FROM_COLUMN,    cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEND_AS_HTML)),          WID_SEND_AS_HTML,           cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SEND_AS_ATTACHMENT)),    WID_SEND_AS_ATTACHMENT,     cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_MAIL_BODY)),             WID_MAIL_BODY,              cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ATTACHMENT_NAME)),       WID_ATTACHMENT_NAME,        cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_ATTACHMENT_FILTER)),     WID_ATTACHMENT_FILTER,      cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_PRINT_OPTIONS)),         WID_PRINT_OPTIONS,          cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),  PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SAVE_AS_SINGLE_FILE)),   WID_SAVE_AS_SINGLE_FILE,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SAVE_FILTER)),           WID_SAVE_FILTER,            cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SAVE_FILTER_OPTIONS)),   WID_SAVE_FILTER_OPTIONS,    cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_SAVE_FILTER_DATA)),      WID_SAVE_FILTER_DATA,       cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),        PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_COPIES_TO)),             WID_COPIES_TO,              cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_BLIND_COPIES_TO)),       WID_BLIND_COPIES_TO,        cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),       PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IN_SERVER_PASSWORD)),     WID_IN_SERVER_PASSWORD,     cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_OUT_SERVER_PASSWORD)),    WID_OUT_SERVER_PASSWORD,    cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    {}
+                static SfxItemPropertyMapEntry aMailMergeMap[] =
+                {
+                    { SW_PROP_NMID(UNO_NAME_SELECTION),             WID_SELECTION,              CPPU_E2T(CPPUTYPE_SEQANY),      PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_RESULT_SET),            WID_RESULT_SET,             CPPU_E2T(CPPUTYPE_REFRESULTSET), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_CONNECTION),            WID_CONNECTION,             CPPU_E2T(CPPUTYPE_REFCONNECTION), PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_MODEL),                 WID_MODEL,                  CPPU_E2T(CPPUTYPE_REFMODEL),    PropertyAttribute::READONLY, 0},
+                    { SW_PROP_NMID(UNO_NAME_DATA_SOURCE_NAME),      WID_DATA_SOURCE_NAME,       CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_DAD_COMMAND),           WID_DATA_COMMAND,           CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_FILTER),                WID_FILTER,                 CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_DOCUMENT_URL),          WID_DOCUMENT_URL,           CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_OUTPUT_URL),            WID_OUTPUT_URL,             CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_DAD_COMMAND_TYPE),      WID_DATA_COMMAND_TYPE,      CPPU_E2T(CPPUTYPE_INT32),       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_OUTPUT_TYPE),           WID_OUTPUT_TYPE,            CPPU_E2T(CPPUTYPE_INT16),       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_ESCAPE_PROCESSING),     WID_ESCAPE_PROCESSING,      CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SINGLE_PRINT_JOBS),     WID_SINGLE_PRINT_JOBS,      CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_FILE_NAME_FROM_COLUMN), WID_FILE_NAME_FROM_COLUMN,  CPPU_E2T(CPPUTYPE_BOOLEAN),     PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_FILE_NAME_PREFIX),      WID_FILE_NAME_PREFIX,       CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SUBJECT),               WID_MAIL_SUBJECT,           CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_ADDRESS_FROM_COLUMN),   WID_ADDRESS_FROM_COLUMN,    CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SEND_AS_HTML),          WID_SEND_AS_HTML,           CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SEND_AS_ATTACHMENT),    WID_SEND_AS_ATTACHMENT,     CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_MAIL_BODY),             WID_MAIL_BODY,              CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_ATTACHMENT_NAME),       WID_ATTACHMENT_NAME,        CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_ATTACHMENT_FILTER),     WID_ATTACHMENT_FILTER,      CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_PRINT_OPTIONS),         WID_PRINT_OPTIONS,          CPPU_E2T(CPPUTYPE_PROPERTYVALUE),  PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SAVE_AS_SINGLE_FILE),   WID_SAVE_AS_SINGLE_FILE,    CPPU_E2T(CPPUTYPE_BOOLEAN),         PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SAVE_FILTER),           WID_SAVE_FILTER,            CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SAVE_FILTER_OPTIONS),   WID_SAVE_FILTER_OPTIONS,    CPPU_E2T(CPPUTYPE_OUSTRING),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_SAVE_FILTER_DATA),      WID_SAVE_FILTER_DATA,       CPPU_E2T(CPPUTYPE_PROPERTYVALUE),        PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_COPIES_TO),             WID_COPIES_TO,              CPPU_E2T(CPPUTYPE_OUSTRINGS),       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_BLIND_COPIES_TO),       WID_BLIND_COPIES_TO,        CPPU_E2T(CPPUTYPE_OUSTRINGS),       PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_IN_SERVER_PASSWORD),     WID_IN_SERVER_PASSWORD,     CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    { SW_PROP_NMID(UNO_NAME_OUT_SERVER_PASSWORD),    WID_OUT_SERVER_PASSWORD,    CPPU_E2T(CPPUTYPE_OUSTRING),    PROPERTY_NONE, 0},
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aMailMergeMap;
             }
@@ -2554,34 +2510,34 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry pTextViewMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_COUNT)),             WID_PAGE_COUNT,             cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_LINE_COUNT)),             WID_LINE_COUNT,             cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_CONSTANT_SPELLCHECK)), WID_IS_CONSTANT_SPELLCHECK, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_IS_HIDE_SPELL_MARKS)),    WID_IS_HIDE_SPELL_MARKS,    cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},  // deprecated #i91949
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_PAGE_COUNT),             WID_PAGE_COUNT,             CPPU_E2T(CPPUTYPE_INT32),   PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_LINE_COUNT),             WID_LINE_COUNT,             CPPU_E2T(CPPUTYPE_INT32),   PropertyAttribute::READONLY, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_CONSTANT_SPELLCHECK), WID_IS_CONSTANT_SPELLCHECK, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+                    {SW_PROP_NMID(UNO_NAME_IS_HIDE_SPELL_MARKS),    WID_IS_HIDE_SPELL_MARKS,    CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},  // deprecated #i91949
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = pTextViewMap;
             }
             break;
             case PROPERTY_MAP_CHART2_DATA_SEQUENCE :
             {
-                static SfxItemPropertyMapEntry const aChart2DataSequenceMap[] =
+                static SfxItemPropertyMapEntry aChart2DataSequenceMap[] =
                 {
-                    {OUString::createFromAscii(GetPropName(UNO_NAME_ROLE)), 0, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0 },
-                    {}
+                    {SW_PROP_NMID(UNO_NAME_ROLE), 0, CPPU_E2T(CPPUTYPE_OUSTRING),   PROPERTY_NONE, 0 },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aChart2DataSequenceMap;
             }
             break;
             case PROPERTY_MAP_METAFIELD:
             {
-                static SfxItemPropertyMapEntry const aMetaFieldMap[] =
+                static SfxItemPropertyMapEntry aMetaFieldMap[] =
                 {
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_FORMAT)), 0,
-                        cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0 },
-                    { OUString::createFromAscii(GetPropName(UNO_NAME_IS_FIXED_LANGUAGE)), 0,
-                        cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-                    {}
+                    { SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), 0,
+                        CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0 },
+                    { SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), 0,
+                        CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
+                    {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aMetaFieldMap;
             }
@@ -2590,6 +2546,20 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             default:
                 OSL_FAIL( "unexpected property map ID" );
         }
+        //fill the character pointers and types into the arrays
+        SfxItemPropertyMapEntry* p = aMapEntriesArr[nPropertyId];
+        sal_uInt16 i = 0;
+        for( ; p->pName; ++p, ++i )
+        {
+            // set the name
+            const SwPropNameLen& rPropNm = GetPropName( (sal_uInt16)(sal_IntPtr)p->pName );
+            p->pName = rPropNm.pName;
+            p->nNameLen = rPropNm.nNameLen;
+            // get the cppu type from the comphelper
+            CppuTypes nTyp = (CppuTypes) (sal_IntPtr) p->pType;
+            GenerateCppuType( nTyp, p->pType );
+            OSL_ENSURE( nTyp != (CppuTypes) (sal_IntPtr) p->pType, "unknown type" );
+        }
     }
     return aMapEntriesArr[nPropertyId];
 }
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 5f9ad7de7b7a..572e7392a1f1 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2141,11 +2141,11 @@ SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException)
     static uno::Reference< beans::XPropertySetInfo >  xRef;
     if(!xRef.is())
     {
-        static SfxItemPropertyMapEntry const aCrsrExtMap_Impl[] =
+        static SfxItemPropertyMapEntry aCrsrExtMap_Impl[] =
         {
-            { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SKIP_HIDDEN_TEXT)), FN_SKIP_HIDDEN_TEXT, ::getBooleanCppuType(), PROPERTY_NONE,     0},
-            { OUString::createFromAscii(GetPropName(UNO_NAME_IS_SKIP_PROTECTED_TEXT)), FN_SKIP_PROTECTED_TEXT, ::getBooleanCppuType(), PROPERTY_NONE,     0},
-            {}
+            { SW_PROP_NAME(UNO_NAME_IS_SKIP_HIDDEN_TEXT), FN_SKIP_HIDDEN_TEXT, &::getBooleanCppuType(), PROPERTY_NONE,     0},
+            { SW_PROP_NAME(UNO_NAME_IS_SKIP_PROTECTED_TEXT), FN_SKIP_PROTECTED_TEXT, &::getBooleanCppuType(), PROPERTY_NONE,     0},
+            {0,0,0,0,0,0}
         };
         const uno::Reference< beans::XPropertySetInfo >  xInfo =
             m_pImpl->m_rPropSet.getPropertySetInfo();
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index e6252eea674b..32e74d11a550 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -113,19 +113,19 @@ const SfxItemPropertySet* GetFootnoteSet()
 {
     static const SfxItemPropertyMapEntry aFootnoteMap_Impl[] =
     {
-        { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_CHAR_STYLE_NAME)),WID_ANCHOR_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_BEGIN_NOTICE)),          WID_BEGIN_NOTICE,       ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAME)),       WID_CHARACTER_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_END_NOTICE)),            WID_END_NOTICE ,        ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_FOOTNOTE_COUNTING)),     WID_FOOTNOTE_COUNTING,  ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),        WID_NUMBERING_TYPE,     ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_STYLE_NAME)),       WID_PAGE_STYLE,         ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLE_NAME)),       WID_PARAGRAPH_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_POSITION_END_OF_DOC)),   WID_POSITION_END_OF_DOC,::getBooleanCppuType(), PROPERTY_NONE,         0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PREFIX)),                WID_PREFIX,             ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_START_AT)),              WID_START_AT ,          ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_SUFFIX)),                WID_SUFFIX,             ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        {}
+        { SW_PROP_NAME(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_BEGIN_NOTICE),          WID_BEGIN_NOTICE,       &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME),       WID_CHARACTER_STYLE,    &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_END_NOTICE),            WID_END_NOTICE ,        &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_FOOTNOTE_COUNTING),     WID_FOOTNOTE_COUNTING,  &::getCppuType((const sal_Int16*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE),        WID_NUMBERING_TYPE,     &::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
+        { SW_PROP_NAME(UNO_NAME_PAGE_STYLE_NAME),       WID_PAGE_STYLE,         &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_PARA_STYLE_NAME),       WID_PARAGRAPH_STYLE,    &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_POSITION_END_OF_DOC),   WID_POSITION_END_OF_DOC,&::getBooleanCppuType(), PROPERTY_NONE,         0},
+        { SW_PROP_NAME(UNO_NAME_PREFIX),                WID_PREFIX,             &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_START_AT),              WID_START_AT ,          &::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
+        { SW_PROP_NAME(UNO_NAME_SUFFIX),                WID_SUFFIX,             &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aFootnoteSet_Impl(aFootnoteMap_Impl);
     return &aFootnoteSet_Impl;
@@ -135,15 +135,15 @@ const SfxItemPropertySet* GetEndnoteSet()
 {
     static const SfxItemPropertyMapEntry aEndnoteMap_Impl[] =
     {
-        { OUString::createFromAscii(GetPropName(UNO_NAME_ANCHOR_CHAR_STYLE_NAME)),WID_ANCHOR_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAME)),       WID_CHARACTER_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),        WID_NUMBERING_TYPE,     ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PAGE_STYLE_NAME)),       WID_PAGE_STYLE,         ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PARA_STYLE_NAME)),       WID_PARAGRAPH_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_PREFIX)),                WID_PREFIX,     ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_START_AT)),              WID_START_AT ,          ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_SUFFIX)),                WID_SUFFIX,     ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        {}
+        { SW_PROP_NAME(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME),       WID_CHARACTER_STYLE,    &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE),        WID_NUMBERING_TYPE,     &::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
+        { SW_PROP_NAME(UNO_NAME_PAGE_STYLE_NAME),       WID_PAGE_STYLE,         &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_PARA_STYLE_NAME),       WID_PARAGRAPH_STYLE,    &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_PREFIX),                WID_PREFIX,     &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_START_AT),              WID_START_AT ,          &::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
+        { SW_PROP_NAME(UNO_NAME_SUFFIX),                WID_SUFFIX,     &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aEndnoteSet_Impl(aEndnoteMap_Impl);
     return &aEndnoteSet_Impl;
@@ -153,13 +153,13 @@ const SfxItemPropertySet* GetNumberingRulesSet()
 {
     static const SfxItemPropertyMapEntry aNumberingRulesMap_Impl[] =
     {
-        { OUString::createFromAscii(GetPropName(UNO_NAME_IS_ABSOLUTE_MARGINS)),       WID_IS_ABS_MARGINS, ::getBooleanCppuType(),            PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_IS_AUTOMATIC)),              WID_IS_AUTOMATIC,   ::getBooleanCppuType(),            PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_IS_CONTINUOUS_NUMBERING)),   WID_CONTINUOUS,     ::getBooleanCppuType(),            PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NAME)),                      WID_RULE_NAME   ,   ::getCppuType((const OUString*)0), PropertyAttribute::READONLY,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_IS_OUTLINE)),      WID_IS_OUTLINE, ::getBooleanCppuType(),            PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_DEFAULT_LIST_ID)),           WID_DEFAULT_LIST_ID, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
-        {}
+        { SW_PROP_NAME(UNO_NAME_IS_ABSOLUTE_MARGINS),       WID_IS_ABS_MARGINS, &::getBooleanCppuType(),            PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_IS_AUTOMATIC),              WID_IS_AUTOMATIC,   &::getBooleanCppuType(),            PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_IS_CONTINUOUS_NUMBERING),   WID_CONTINUOUS,     &::getBooleanCppuType(),            PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_NAME),                      WID_RULE_NAME   ,   &::getCppuType((const OUString*)0), PropertyAttribute::READONLY,     0},
+        { SW_PROP_NAME(UNO_NAME_NUMBERING_IS_OUTLINE),      WID_IS_OUTLINE, &::getBooleanCppuType(),            PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_DEFAULT_LIST_ID),           WID_DEFAULT_LIST_ID, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet  aNumberingRulesSet_Impl( aNumberingRulesMap_Impl );
     return &aNumberingRulesSet_Impl;
@@ -180,18 +180,18 @@ const SfxItemPropertySet* GetLineNumberingSet()
 {
     static const SfxItemPropertyMapEntry aLineNumberingMap_Impl[] =
     {
-        { OUString::createFromAscii(GetPropName(UNO_NAME_CHAR_STYLE_NAME)),         WID_CHARACTER_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_COUNT_EMPTY_LINES)),       WID_COUNT_EMPTY_LINES , ::getBooleanCppuType(),PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_COUNT_LINES_IN_FRAMES)),   WID_COUNT_LINES_IN_FRAMES, ::getBooleanCppuType(),PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_DISTANCE)),                WID_DISTANCE       ,    ::getCppuType((const sal_Int32*)0),PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_IS_ON)),                   WID_NUM_ON,             ::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_INTERVAL)),                WID_INTERVAL  ,       ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_TEXT)),          WID_SEPARATOR_TEXT,   ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBER_POSITION)),         WID_NUMBER_POSITION,    ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_NUMBERING_TYPE)),          WID_NUMBERING_TYPE ,    ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_RESTART_AT_EACH_PAGE)),    WID_RESTART_AT_EACH_PAGE, ::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-        { OUString::createFromAscii(GetPropName(UNO_NAME_SEPARATOR_INTERVAL)),      WID_SEPARATOR_INTERVAL, ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
-        {}
+        { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME),         WID_CHARACTER_STYLE,    &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_COUNT_EMPTY_LINES),       WID_COUNT_EMPTY_LINES , &::getBooleanCppuType(),PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_COUNT_LINES_IN_FRAMES),   WID_COUNT_LINES_IN_FRAMES, &::getBooleanCppuType(),PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_DISTANCE       ),         WID_DISTANCE       ,    &::getCppuType((const sal_Int32*)0),PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_IS_ON),                     WID_NUM_ON,             &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_INTERVAL  ),              WID_INTERVAL  ,       &::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_SEPARATOR_TEXT ),         WID_SEPARATOR_TEXT,   &::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_NUMBER_POSITION),         WID_NUMBER_POSITION,    &::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE),          WID_NUMBERING_TYPE ,    &::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_RESTART_AT_EACH_PAGE),    WID_RESTART_AT_EACH_PAGE, &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
+        { SW_PROP_NAME(UNO_NAME_SEPARATOR_INTERVAL),      WID_SEPARATOR_INTERVAL, &::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
+        {0,0,0,0,0,0}
     };
     static const SfxItemPropertySet aLineNumberingSet_Impl(aLineNumberingMap_Impl);
     return &aLineNumberingSet_Impl;
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index da8669dac15e..d9dbc4261d10 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -536,67 +536,71 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
     // the user.
 
     // create XPropertySet with three properties for status indicator
-    comphelper::PropertyMapEntry const aInfoMap[] =
+    comphelper::PropertyMapEntry aInfoMap[] =
     {
-        { "ProgressRange", 0,
-              ::getCppuType((sal_Int32*)0),
+        { "ProgressRange", sizeof("ProgressRange")-1, 0,
+              &::getCppuType((sal_Int32*)0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressMax", 0,
-              ::getCppuType((sal_Int32*)0),
+        { "ProgressMax", sizeof("ProgressMax")-1, 0,
+              &::getCppuType((sal_Int32*)0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressCurrent", 0,
-              ::getCppuType((sal_Int32*)0),
+        { "ProgressCurrent", sizeof("ProgressCurrent")-1, 0,
+              &::getCppuType((sal_Int32*)0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "NumberStyles", 0,
-              ::getCppuType( (uno::Reference<container::XNameContainer> *) 0),
+        { "NumberStyles", sizeof("NumberStyles")-1, 0,
+              &::getCppuType( (uno::Reference<container::XNameContainer> *) 0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "RecordChanges", 0,
-              ::getBooleanCppuType(),
+        { "RecordChanges", sizeof("RecordChanges")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "ShowChanges", 0,
-              ::getBooleanCppuType(),
+        { "ShowChanges", sizeof("ShowChanges")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "RedlineProtectionKey", 0,
-              ::getCppuType((Sequence<sal_Int8>*)0),
+        { "RedlineProtectionKey", sizeof("RedlineProtectionKey")-1, 0,
+#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
+              new uno::Type(::getCppuType((Sequence<sal_Int8>*)0)),
+#else
+              &::getCppuType((Sequence<sal_Int8>*)0),
+#endif
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "PrivateData", 0,
-              ::getCppuType( (uno::Reference<XInterface> *)0 ),
+        { "PrivateData", sizeof("PrivateData")-1, 0,
+              &::getCppuType( (uno::Reference<XInterface> *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "BaseURI", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "BaseURI", sizeof("BaseURI")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamRelPath", sizeof("StreamRelPath")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamName", sizeof("StreamName")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
         // properties for insert modes
-        { "StyleInsertModeFamilies", 0,
-              ::getCppuType((Sequence<OUString>*)0),
+        { "StyleInsertModeFamilies", sizeof("StyleInsertModeFamilies")-1, 0,
+              &::getCppuType((Sequence<OUString>*)0),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StyleInsertModeOverwrite", 0,
-              ::getBooleanCppuType(),
+        { "StyleInsertModeOverwrite", sizeof("StyleInsertModeOverwrite")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "TextInsertModeRange", 0,
-              ::getCppuType( (uno::Reference<text::XTextRange> *) 0),
+        { "TextInsertModeRange", sizeof("TextInsertModeRange")-1, 0,
+              &::getCppuType( (uno::Reference<text::XTextRange> *) 0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "AutoTextMode", 0,
-              ::getBooleanCppuType(),
+        { "AutoTextMode", sizeof("AutoTextMode")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "OrganizerMode", 0,
-              ::getBooleanCppuType(),
+        { "OrganizerMode", sizeof("OrganizerMode")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
 
         // #i28749# - Add property, which indicates, if the
         // shape position attributes are given in horizontal left-to-right layout.
         // This is the case for the OpenOffice.org file format.
-        { "ShapePositionInHoriL2R", 0,
-              ::getBooleanCppuType(),
+        { "ShapePositionInHoriL2R", sizeof("ShapePositionInHoriL2R")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
 
-        { "BuildId", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "BuildId", sizeof("BuildId")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
 
         // Add property, which indicates, if a text document in OpenOffice.org
@@ -605,12 +609,12 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
         //       read using the OpenOffice.org file format. Thus, e.g. for text
         //       documents in StarOffice 5.2 binary file format this property
         //       will be sal_True.
-        { "TextDocInOOoFileFormat", 0,
-              ::getBooleanCppuType(),
+        { "TextDocInOOoFileFormat", sizeof("TextDocInOOoFileFormat")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "SourceStorage", 0, embed::XStorage::static_type(),
+        { "SourceStorage", sizeof("SourceStorage")-1, 0, &embed::XStorage::static_type(),
           ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet(
                 comphelper::GenericPropertySet_CreateInstance(
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index bd18c7008b70..2753b9621537 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -105,54 +105,59 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
     // the user.
 
     // create XPropertySet with three properties for status indicator
-    comphelper::PropertyMapEntry const aInfoMap[] =
+    comphelper::PropertyMapEntry aInfoMap[] =
     {
-        { "ProgressRange", 0,
-              ::getCppuType((sal_Int32*)0),
+        { "ProgressRange", sizeof("ProgressRange")-1, 0,
+              &::getCppuType((sal_Int32*)0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressMax", 0,
-              ::getCppuType((sal_Int32*)0),
+        { "ProgressMax", sizeof("ProgressMax")-1, 0,
+              &::getCppuType((sal_Int32*)0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ProgressCurrent", 0,
-              ::getCppuType((sal_Int32*)0),
+        { "ProgressCurrent", sizeof("ProgressCurrent")-1, 0,
+              &::getCppuType((sal_Int32*)0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "WrittenNumberStyles", 0,
-              ::getCppuType((uno::Sequence<sal_Int32> *)0),
+        { "WrittenNumberStyles", sizeof("WrittenNumberStyles")-1, 0,
+              &::getCppuType((uno::Sequence<sal_Int32> *)0),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "UsePrettyPrinting", 0,
-              ::getBooleanCppuType(),
+        { "UsePrettyPrinting", sizeof("UsePrettyPrinting")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "ShowChanges", 0,
-              ::getBooleanCppuType(),
+        { "ShowChanges", sizeof("ShowChanges")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "RedlineProtectionKey", 0,
-              ::getCppuType((Sequence<sal_Int8>*)0),
+        { "RedlineProtectionKey", sizeof("RedlineProtectionKey")-1, 0,
+#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
+              new uno::Type(::getCppuType((Sequence<sal_Int8>*)0)),
+#else
+              &::getCppuType((Sequence<sal_Int8>*)0),
+#endif
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "BaseURI", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "BaseURI", sizeof("BaseURI")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamRelPath", sizeof("StreamRelPath")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamName", sizeof("StreamName")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "AutoTextMode", 0,
-              ::getBooleanCppuType(),
+        { "AutoTextMode", sizeof("AutoTextMode")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StyleNames", 0,
-              ::getCppuType( (Sequence<OUString>*)0 ),
+        { "StyleNames", sizeof("StyleNames")-1, 0,
+              &::getCppuType( (Sequence<OUString>*)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StyleFamilies", 0,
-              ::getCppuType( (Sequence<sal_Int32>*)0 ),
+        { "StyleFamilies", sizeof("StyleFamilies")-1, 0,
+              &::getCppuType( (Sequence<sal_Int32>*)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
         // #i69627#
-        { "OutlineStyleAsNormalListStyle", 0,
-              ::getBooleanCppuType(),
+        { "OutlineStyleAsNormalListStyle", sizeof("OutlineStyleAsNormalListStyle")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "TargetStorage",0, embed::XStorage::static_type(),
+        { "TargetStorage", sizeof("TargetStorage")-1,0, &embed::XStorage::static_type(),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet(
                 comphelper::GenericPropertySet_CreateInstance(
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index db9bf9d0e151..89c896baee88 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -852,6 +852,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
     else
     {
         void *pData = NULL;
+        const uno::Type* pType = pCur->pType;
         switch (pCur->nWID)
         {
             case WID_SELECTION :                pData = &aSelection;  break;
@@ -888,7 +889,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
             default :
                 OSL_FAIL("unknown WID");
         }
-        Any aOld( pData, pCur->aType );
+        Any aOld( pData, *pType );
 
         bool bChanged = false;
         sal_Bool bOK = sal_True;
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index bcb9960de4e4..68811c168672 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1332,12 +1332,12 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
     {
         try
         {
-            ::comphelper::PropertyMapEntry const aInfoMap[] =
+            ::comphelper::PropertyMapEntry aInfoMap[] =
             {
-                { "Class", 0,
-                    ::getCppuType((OUString*)0),
+                { "Class", sizeof("Class")-1, 0,
+                    &::getCppuType((OUString*)0),
                       PropertyAttribute::MAYBEVOID, 0},
-                {}
+                { NULL, 0, 0, NULL, 0, 0 }
             };
             Reference< XPropertySet > xConvPropSet(
                 ::comphelper::GenericPropertySet_CreateInstance(
@@ -2160,10 +2160,10 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
     if( ! (getExportFlags() & EXPORT_OASIS) &&
         bIsChart )
     {
-        static ::comphelper::PropertyMapEntry const aInfoMap[] =
+        static ::comphelper::PropertyMapEntry aInfoMap[] =
         {
-            { "ExportTableNumberList", 0, ::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0},
-            {}
+            { "ExportTableNumberList", 21, 0, &::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0},
+            { NULL, 0, 0, NULL, 0, 0 }
         };
         Reference< XPropertySet > xInfoProp(
             ::comphelper::GenericPropertySet_CreateInstance(
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index e664fc5c59a0..4a2d63ca0cda 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -78,12 +78,12 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
         uno::Reference< uno::XComponentContext > xContext = getComponentContext();
         try
         {
-            ::comphelper::PropertyMapEntry const aInfoMap[] =
+            ::comphelper::PropertyMapEntry aInfoMap[] =
             {
-                { "Class", 0,
-                    ::getCppuType((OUString*)0),
+                { "Class", sizeof("Class")-1, 0,
+                    &::getCppuType((OUString*)0),
                     beans::PropertyAttribute::MAYBEVOID, 0},
-                {}
+                { NULL, 0, 0, NULL, 0, 0 }
             };
             uno::Reference< beans::XPropertySet > xConvPropSet(
                 ::comphelper::GenericPropertySet_CreateInstance(