dmapper: kill remaining RTL_CONSTASCII_USTRINGPARAM usage

Change-Id: I4ac1056582a41dd2bc5c31452c93122afd666fc7

6 files changed, 311 insertions, 325 deletions

diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index 817a92ff9905..6facaa64a0cf 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -90,7 +90,7 @@ uno::Reference<form::XForm> FormControlHelper::FormControlHelper_Impl::getForm()
         if (xFormsSupplier.is())
         {
             uno::Reference<container::XNameContainer> xFormsNamedContainer(xFormsSupplier->getForms());
-            static ::rtl::OUString sDOCXForm(RTL_CONSTASCII_USTRINGPARAM("DOCX-Standard"));
+            static ::rtl::OUString sDOCXForm("DOCX-Standard");
 
             ::rtl::OUString sFormName(sDOCXForm);
             sal_uInt16 nUnique = 0;
@@ -102,18 +102,13 @@ uno::Reference<form::XForm> FormControlHelper::FormControlHelper_Impl::getForm()
                 sFormName += ::rtl::OUString::valueOf(nUnique);
             }
 
-            uno::Reference<uno::XInterface>
-                xForm(getServiceFactory()->createInstance
-                      (::rtl::OUString
-                       (RTL_CONSTASCII_USTRINGPARAM
-                        ("com.sun.star.form.component.Form"))));
+            uno::Reference<uno::XInterface> xForm(getServiceFactory()->createInstance("com.sun.star.form.component.Form"));
             if (xForm.is())
             {
                 uno::Reference<beans::XPropertySet>
                     xFormProperties(xForm, uno::UNO_QUERY);
                 uno::Any aAny(sFormName);
-                static ::rtl::OUString sName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")));
-                xFormProperties->setPropertyValue(sName, aAny);
+                xFormProperties->setPropertyValue("Name", aAny);
             }
 
             rForm = uno::Reference<form::XForm>(xForm, uno::UNO_QUERY);
@@ -158,9 +153,7 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> xTextRan
     if (! xServiceFactory.is())
         return false;
 
-    uno::Reference<uno::XInterface> xInterface =
-        xServiceFactory->createInstance
-        (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.CheckBox")));
+    uno::Reference<uno::XInterface> xInterface = xServiceFactory->createInstance("com.sun.star.form.component.CheckBox");
 
     if (!xInterface.is())
         return false;
@@ -179,9 +172,8 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> xTextRan
 
         try
         {
-            static ::rtl::OUString sCharHeight(RTL_CONSTASCII_USTRINGPARAM("CharHeight"));
             float fCheckBoxHeight = 0.0;
-            xTextRangeProps->getPropertyValue(sCharHeight) >>= fCheckBoxHeight;
+            xTextRangeProps->getPropertyValue("CharHeight") >>= fCheckBoxHeight;
             nCheckBoxHeight = static_cast<sal_uInt32>(floor(fCheckBoxHeight * 35.3));
         }
         catch (beans::UnknownPropertyException &)
@@ -197,20 +189,20 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> xTextRan
     {
         aAny <<= m_pFFData->getStatusText();
 
-        xPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText")), aAny);
+        xPropSet->setPropertyValue("HelpText", aAny);
     }
 
     aAny <<= m_pFFData->getCheckboxChecked();
-    xPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), aAny);
+    xPropSet->setPropertyValue("DefaultState", aAny);
 
     if (!m_pFFData->getHelpText().isEmpty())
     {
         aAny <<= m_pFFData->getHelpText();
-        xPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpF1Text")), aAny);
+        xPropSet->setPropertyValue("HelpF1Text", aAny);
     }
 
     aAny <<= rControlName;
-    xPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aAny);
+    xPropSet->setPropertyValue("Name", aAny);
 
     return true;
 }
@@ -225,7 +217,7 @@ bool FormControlHelper::processField(uno::Reference<text::XFormField> xFormField
 
         if (m_pImpl->m_eFieldId == FIELD_FORMTEXT )
         {
-            xFormField->setFieldType( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMTEXT)));
+            xFormField->setFieldType(ODF_FORMTEXT);
             if (  !m_pFFData->getName().isEmpty() )
             {
                 xNamed->setName( m_pFFData->getName() );
@@ -233,34 +225,34 @@ bool FormControlHelper::processField(uno::Reference<text::XFormField> xFormField
         }
         else if (m_pImpl->m_eFieldId == FIELD_FORMCHECKBOX )
         {
-            xFormField->setFieldType( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX)));
+            xFormField->setFieldType(ODF_FORMCHECKBOX);
             uno::Reference<beans::XPropertySet> xPropSet(xFormField, uno::UNO_QUERY);
             uno::Any aAny;
             aAny <<= m_pFFData->getCheckboxChecked();
             if ( xPropSet.is() )
-                xPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Checked")), aAny);
+                xPropSet->setPropertyValue("Checked", aAny);
             rtl::OUString sName;
         }
         else if (m_pImpl->m_eFieldId == FIELD_FORMDROPDOWN )
         {
-            xFormField->setFieldType( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN)));
+            xFormField->setFieldType(ODF_FORMDROPDOWN);
             uno::Sequence< rtl::OUString > sItems;
             sItems.realloc( m_pFFData->getDropDownEntries().size() );
             ::std::copy( m_pFFData->getDropDownEntries().begin(), m_pFFData->getDropDownEntries().end(), ::comphelper::stl_begin(sItems));
             if ( sItems.getLength() )
             {
-                if ( xNameCont->hasByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)) ) )
-                    xNameCont->replaceByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)), uno::makeAny( sItems ) );
+                if ( xNameCont->hasByName(ODF_FORMDROPDOWN_LISTENTRY) )
+                    xNameCont->replaceByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny( sItems ) );
                 else
-                    xNameCont->insertByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)), uno::makeAny( sItems ) );
+                    xNameCont->insertByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny( sItems ) );
 
                 sal_Int32 nResult = m_pFFData->getDropDownResult().toInt32();
                 if ( nResult )
                 {
-                    if ( xNameCont->hasByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT)) ) )
-                        xNameCont->replaceByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT)), uno::makeAny( nResult ) );
+                    if ( xNameCont->hasByName(ODF_FORMDROPDOWN_RESULT) )
+                        xNameCont->replaceByName(ODF_FORMDROPDOWN_RESULT, uno::makeAny( nResult ) );
                     else
-                        xNameCont->insertByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT)), uno::makeAny( nResult ) );
+                        xNameCont->insertByName(ODF_FORMDROPDOWN_RESULT, uno::makeAny( nResult ) );
                 }
             }
         }
@@ -280,7 +272,7 @@ bool FormControlHelper::insertControl(uno::Reference<text::XTextRange> xTextRang
     if (! xFormComps.is())
         return false;
 
-    static ::rtl::OUString sControl(RTL_CONSTASCII_USTRINGPARAM("Control"));
+    static ::rtl::OUString sControl("Control");
 
     sal_Int32 nControl = 0;
     bool bDone = false;
@@ -318,9 +310,7 @@ bool FormControlHelper::insertControl(uno::Reference<text::XTextRange> xTextRang
     if (! m_pImpl->getServiceFactory().is())
         return false;
 
-    uno::Reference<uno::XInterface> xInterface =
-        m_pImpl->getServiceFactory()->createInstance
-        (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")));
+    uno::Reference<uno::XInterface> xInterface = m_pImpl->getServiceFactory()->createInstance("com.sun.star.drawing.ControlShape");
 
     if (! xInterface.is())
         return false;
@@ -337,18 +327,15 @@ bool FormControlHelper::insertControl(uno::Reference<text::XTextRange> xTextRang
     sal_uInt16 nTmp = text::TextContentAnchorType_AS_CHARACTER;
     aAny <<= nTmp;
 
-    static const ::rtl::OUString sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType"));
-    xShapeProps->setPropertyValue(sAnchorType, aAny);
+    xShapeProps->setPropertyValue("AnchorType", aAny);
 
-    static const ::rtl::OUString sVertOrient(RTL_CONSTASCII_USTRINGPARAM("VertOrient"));
     nTmp = text::VertOrientation::CENTER;
     aAny <<= nTmp;
-    xShapeProps->setPropertyValue(sVertOrient, aAny);
+    xShapeProps->setPropertyValue("VertOrient", aAny);
 
     aAny <<= xTextRange;
 
-    static const ::rtl::OUString sTextRange(RTL_CONSTASCII_USTRINGPARAM("TextRange"));
-    xShapeProps->setPropertyValue(sTextRange, aAny);
+    xShapeProps->setPropertyValue("TextRange", aAny);
 
     uno::Reference<drawing::XControlShape> xControlShape(xShape, uno::UNO_QUERY);
     uno::Reference<awt::XControlModel> xControlModel(m_pImpl->rFormComponent, uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index f6f8798b590d..23a1602d111c 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -144,29 +144,29 @@ void PositionHandler::setPositionOffset(const ::rtl::OUString & sText, bool vert
 
 void PositionHandler::setAlignH(const ::rtl::OUString & sText)
 {
-    if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "left" )))
+    if( sText == "left")
         savedAlignH = text::HoriOrientation::LEFT;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "right" )))
+    else if( sText == "right" )
         savedAlignH = text::HoriOrientation::RIGHT;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "center" )))
+    else if( sText == "center" )
         savedAlignH = text::HoriOrientation::CENTER;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "inside" )))
+    else if( sText == "inside" )
         savedAlignH = text::HoriOrientation::INSIDE;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "outside" )))
+    else if( sText == "outside" )
         savedAlignH = text::HoriOrientation::OUTSIDE;
 }
 
 void PositionHandler::setAlignV(const ::rtl::OUString & sText)
 {
-    if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "top" )))
+    if( sText == "top" )
         savedAlignV = text::VertOrientation::TOP;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bottom" )))
+    else if( sText == "bottom" )
         savedAlignV = text::VertOrientation::BOTTOM;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "center" )))
+    else if( sText == "center" )
         savedAlignV = text::VertOrientation::CENTER;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "inside" )))
+    else if( sText == "inside" )
         savedAlignV = text::VertOrientation::NONE;
-    else if( sText == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "outside" )))
+    else if( sText == "outside" )
         savedAlignV = text::VertOrientation::NONE;
 }
 
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index af648cd30bf6..3cf7c7fa04b5 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -190,12 +190,11 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
     {
         uno::Reference < lang::XMultiServiceFactory > xFactory(xTextDocument, uno::UNO_QUERY_THROW);
         uno::Reference< document::XEmbeddedObjectResolver > xEmbeddedResolver(
-            xFactory->createInstance(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver" ))), uno::UNO_QUERY_THROW );
+            xFactory->createInstance("com.sun.star.document.ImportEmbeddedObjectResolver"), uno::UNO_QUERY_THROW );
         //hack to work with the ImportEmbeddedObjectResolver
         static sal_Int32 nObjectCount = 100;
         uno::Reference< container::XNameAccess > xNA( xEmbeddedResolver, uno::UNO_QUERY_THROW );
-        ::rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("Obj" ));
+        ::rtl::OUString aURL("Obj");
         aURL += ::rtl::OUString::valueOf( nObjectCount++ );
         uno::Reference < io::XOutputStream > xOLEStream;
         if( (xNA->getByName( aURL ) >>= xOLEStream) && xOLEStream.is() )
@@ -214,7 +213,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
                 }
             }
 
-            static const ::rtl::OUString sProtocol = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.EmbeddedObject:" ));
+            static const ::rtl::OUString sProtocol("vnd.sun.star.EmbeddedObject:");
             ::rtl::OUString aPersistName( xEmbeddedResolver->resolveEmbeddedObjectURL( aURL ) );
             sRet = aPersistName.copy( sProtocol.getLength() );
 
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index f97c9272deed..88461aa0a08b 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -52,267 +52,267 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
         ::rtl::OUString sName;
         switch(eId)
         {
-            case PROP_CHAR_WEIGHT:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight")); break;
-            case PROP_CHAR_POSTURE:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture")); break;
-            case PROP_CHAR_STRIKEOUT:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout")); break;
-            case PROP_CHAR_CONTOURED:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharContoured")); break;
-            case PROP_CHAR_SHADOWED:   sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharShadowed")); break;
-            case PROP_CHAR_CASE_MAP:   sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCaseMap")); break;
-            case PROP_CHAR_COLOR:      sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor")); break;
-            case PROP_CHAR_RELIEF:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRelief")); break;
-            case PROP_CHAR_UNDERLINE:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")); break;
-            case PROP_CHAR_UNDERLINE_COLOR:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineColor")); break;
-            case PROP_CHAR_UNDERLINE_HAS_COLOR:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineHasColor")); break;
-            case PROP_CHAR_WORD_MODE:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWordMode")); break;
-            case PROP_CHAR_ESCAPEMENT       :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEscapement")); break;
-            case PROP_CHAR_ESCAPEMENT_HEIGHT:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEscapementHeight")); break;
-            case PROP_CHAR_HEIGHT:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeight")); break;
-            case PROP_CHAR_HEIGHT_COMPLEX:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeightComplex")); break;
-            case PROP_CHAR_LOCALE:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocale")); break;
-            case PROP_CHAR_LOCALE_ASIAN:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocaleAsian")); break;
-            case PROP_CHAR_LOCALE_COMPLEX:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocaleComplex")); break;
-            case PROP_CHAR_WEIGHT_COMPLEX :  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeightComplex")); break;
-            case PROP_CHAR_POSTURE_COMPLEX:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPostureComplex")); break;
-            case PROP_CHAR_CHAR_KERNING:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharKerning")); break;
-            case PROP_CHAR_AUTO_KERNING:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoKerning")); break;
-            case PROP_CHAR_SCALE_WIDTH:      sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharScaleWidth")); break;
-            case PROP_CHAR_STYLE_NAME:      sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")); break;
-            case PROP_CHAR_FONT_NAME:                sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontName")); break;
-            case PROP_CHAR_FONT_STYLE:               sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyle")); break;
-            case PROP_CHAR_FONT_FAMILY:              sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamily")); break;
-            case PROP_CHAR_FONT_CHAR_SET:            sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSet")); break;
-            case PROP_CHAR_FONT_PITCH:               sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitch")); break;
-            case PROP_CHAR_FONT_NAME_ASIAN     :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontNameAsian")); break;
-            case PROP_CHAR_HEIGHT_ASIAN        :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeightAsian")); break;
-            case PROP_CHAR_FONT_STYLE_ASIAN    :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyleAsian")); break;
-            case PROP_CHAR_FONT_FAMILY_ASIAN   :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamilyAsian")); break;
-            case PROP_CHAR_FONT_CHAR_SET_ASIAN :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSetAsian")); break;
-            case PROP_CHAR_FONT_PITCH_ASIAN    :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitchAsian")); break;
-            case PROP_CHAR_FONT_NAME_COMPLEX   :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontNameComplex")); break;
-            case PROP_CHAR_FONT_STYLE_COMPLEX  :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyleComplex")); break;
-            case PROP_CHAR_FONT_FAMILY_COMPLEX:      sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamilyComplex")); break;
-            case PROP_CHAR_FONT_CHAR_SET_COMPLEX:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSetComplex")); break;
-            case PROP_CHAR_FONT_PITCH_COMPLEX:       sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitchComplex")); break;
-            case PROP_CHAR_HIDDEN           :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHidden")); break;
-            case PROP_CHAR_WEIGHT_ASIAN     :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeightAsian")); break;
-            case PROP_CHAR_POSTURE_ASIAN    :     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPostureAsian")); break;
-            case PROP_CHAR_BACK_COLOR:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharBackColor")); break;
-            case PROP_CHAR_EMPHASIS:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEmphasis")); break;
-            case PROP_CHAR_COMBINE_IS_ON:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombineIsOn")); break;
-            case PROP_CHAR_COMBINE_PREFIX:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombinePrefix")); break;
-            case PROP_CHAR_COMBINE_SUFFIX:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombineSuffix")); break;
-            case PROP_CHAR_ROTATION:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotation")); break;
-            case PROP_CHAR_ROTATION_IS_FIT_TO_LINE:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotationIsFitToLine")); break;
-            case PROP_CHAR_FLASH:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFlash")); break;
+            case PROP_CHAR_WEIGHT:     sName = "CharWeight"; break;
+            case PROP_CHAR_POSTURE:    sName = "CharPosture"; break;
+            case PROP_CHAR_STRIKEOUT:  sName = "CharStrikeout"; break;
+            case PROP_CHAR_CONTOURED:  sName = "CharContoured"; break;
+            case PROP_CHAR_SHADOWED:   sName = "CharShadowed"; break;
+            case PROP_CHAR_CASE_MAP:   sName = "CharCaseMap"; break;
+            case PROP_CHAR_COLOR:      sName = "CharColor"; break;
+            case PROP_CHAR_RELIEF:     sName = "CharRelief"; break;
+            case PROP_CHAR_UNDERLINE:  sName = "CharUnderline"; break;
+            case PROP_CHAR_UNDERLINE_COLOR:  sName = "CharUnderlineColor"; break;
+            case PROP_CHAR_UNDERLINE_HAS_COLOR:  sName = "CharUnderlineHasColor"; break;
+            case PROP_CHAR_WORD_MODE:  sName = "CharWordMode"; break;
+            case PROP_CHAR_ESCAPEMENT       :     sName = "CharEscapement"; break;
+            case PROP_CHAR_ESCAPEMENT_HEIGHT:     sName = "CharEscapementHeight"; break;
+            case PROP_CHAR_HEIGHT:     sName = "CharHeight"; break;
+            case PROP_CHAR_HEIGHT_COMPLEX:     sName = "CharHeightComplex"; break;
+            case PROP_CHAR_LOCALE:     sName = "CharLocale"; break;
+            case PROP_CHAR_LOCALE_ASIAN:     sName = "CharLocaleAsian"; break;
+            case PROP_CHAR_LOCALE_COMPLEX:     sName = "CharLocaleComplex"; break;
+            case PROP_CHAR_WEIGHT_COMPLEX :  sName = "CharWeightComplex"; break;
+            case PROP_CHAR_POSTURE_COMPLEX:  sName = "CharPostureComplex"; break;
+            case PROP_CHAR_CHAR_KERNING:     sName = "CharKerning"; break;
+            case PROP_CHAR_AUTO_KERNING:     sName = "CharAutoKerning"; break;
+            case PROP_CHAR_SCALE_WIDTH:      sName = "CharScaleWidth"; break;
+            case PROP_CHAR_STYLE_NAME:      sName = "CharStyleName"; break;
+            case PROP_CHAR_FONT_NAME:                sName = "CharFontName"; break;
+            case PROP_CHAR_FONT_STYLE:               sName = "CharFontStyle"; break;
+            case PROP_CHAR_FONT_FAMILY:              sName = "CharFontFamily"; break;
+            case PROP_CHAR_FONT_CHAR_SET:            sName = "CharFontCharSet"; break;
+            case PROP_CHAR_FONT_PITCH:               sName = "CharFontPitch"; break;
+            case PROP_CHAR_FONT_NAME_ASIAN     :     sName = "CharFontNameAsian"; break;
+            case PROP_CHAR_HEIGHT_ASIAN        :     sName = "CharHeightAsian"; break;
+            case PROP_CHAR_FONT_STYLE_ASIAN    :     sName = "CharFontStyleAsian"; break;
+            case PROP_CHAR_FONT_FAMILY_ASIAN   :     sName = "CharFontFamilyAsian"; break;
+            case PROP_CHAR_FONT_CHAR_SET_ASIAN :     sName = "CharFontCharSetAsian"; break;
+            case PROP_CHAR_FONT_PITCH_ASIAN    :     sName = "CharFontPitchAsian"; break;
+            case PROP_CHAR_FONT_NAME_COMPLEX   :     sName = "CharFontNameComplex"; break;
+            case PROP_CHAR_FONT_STYLE_COMPLEX  :     sName = "CharFontStyleComplex"; break;
+            case PROP_CHAR_FONT_FAMILY_COMPLEX:      sName = "CharFontFamilyComplex"; break;
+            case PROP_CHAR_FONT_CHAR_SET_COMPLEX:    sName = "CharFontCharSetComplex"; break;
+            case PROP_CHAR_FONT_PITCH_COMPLEX:       sName = "CharFontPitchComplex"; break;
+            case PROP_CHAR_HIDDEN           :     sName = "CharHidden"; break;
+            case PROP_CHAR_WEIGHT_ASIAN     :     sName = "CharWeightAsian"; break;
+            case PROP_CHAR_POSTURE_ASIAN    :     sName = "CharPostureAsian"; break;
+            case PROP_CHAR_BACK_COLOR:     sName = "CharBackColor"; break;
+            case PROP_CHAR_EMPHASIS:     sName = "CharEmphasis"; break;
+            case PROP_CHAR_COMBINE_IS_ON:     sName = "CharCombineIsOn"; break;
+            case PROP_CHAR_COMBINE_PREFIX:     sName = "CharCombinePrefix"; break;
+            case PROP_CHAR_COMBINE_SUFFIX:     sName = "CharCombineSuffix"; break;
+            case PROP_CHAR_ROTATION:     sName = "CharRotation"; break;
+            case PROP_CHAR_ROTATION_IS_FIT_TO_LINE:     sName = "CharRotationIsFitToLine"; break;
+            case PROP_CHAR_FLASH:     sName = "CharFlash"; break;
 
-            case PROP_PARA_STYLE_NAME:      sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName")); break;
-            case PROP_PARA_ADJUST:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAdjust")); break;
-            case PROP_PARA_VERT_ALIGNMENT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaVertAlignment")); break;
-            case PROP_PARA_LAST_LINE_ADJUST:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLastLineAdjust")); break;
-            case PROP_PARA_RIGHT_MARGIN     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin")); break;
-            case PROP_PARA_LEFT_MARGIN      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin")); break;
-            case PROP_PARA_FIRST_LINE_INDENT:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent")); break;
-            case PROP_PARA_KEEP_TOGETHER:       sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether")); break;
-            case PROP_PARA_TOP_MARGIN:       sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin")); break;
-            case PROP_PARA_CONTEXT_MARGIN:       sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaContextMargin")); break;
-            case PROP_PARA_BOTTOM_MARGIN:       sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin")); break;
-            case PROP_PARA_IS_HYPHENATION:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation")); break;
-            case PROP_PARA_LINE_NUMBER_COUNT:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount")); break;
-            case PROP_PARA_IS_HANGING_PUNCTUATION: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaIsHangingPunctuation")); break;
-            case PROP_PARA_LINE_SPACING:     sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing")); break;
-            case PROP_PARA_TAB_STOPS:       sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaTabStops")); break;
-            case PROP_PARA_WIDOWS:          sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaWidows")); break;
-            case PROP_PARA_ORPHANS:         sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaOrphans")); break;
-            case PROP_PARA_LINE_NUMBER_START_VALUE:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberStartValue")); break;
-            case PROP_NUMBERING_LEVEL:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingLevel")); break;
-            case PROP_NUMBERING_RULES:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")); break;
-            case PROP_NUMBERING_TYPE:   sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType")); break;
-            case PROP_START_WITH:       sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartWith")); break;
-            case PROP_ADJUST:           sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Adjust")); break;
-            case PROP_PARENT_NUMBERING: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentNumbering")); break;
-            case PROP_RIGHT_MARGIN     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightMargin")); break;
-            case PROP_LEFT_MARGIN      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftMargin")); break;
-            case PROP_TOP_MARGIN          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopMargin")); break;
-            case PROP_BOTTOM_MARGIN       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomMargin")); break;
-            case PROP_FIRST_LINE_OFFSET:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstLineOffset")); break;
-            case PROP_LEFT_BORDER           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftBorder"));break;
-            case PROP_RIGHT_BORDER          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightBorder"));break;
-            case PROP_TOP_BORDER            :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopBorder"));break;
-            case PROP_BOTTOM_BORDER         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomBorder"));break;
-            case PROP_TABLE_BORDER         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableBorder"));break;
-            case PROP_LEFT_BORDER_DISTANCE  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftBorderDistance")); break;
-            case PROP_RIGHT_BORDER_DISTANCE :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightBorderDistance")); break;
-            case PROP_TOP_BORDER_DISTANCE   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopBorderDistance"));break;
-            case PROP_BOTTOM_BORDER_DISTANCE:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomBorderDistance")); break;
-            case PROP_CURRENT_PRESENTATION  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentPresentation")); break;
-            case PROP_IS_FIXED              :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFixed")); break;
-            case PROP_SUB_TYPE              :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SubType")); break;
-            case PROP_FILE_FORMAT           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FileFormat")); break;
-            case PROP_HYPER_LINK_U_R_L      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL")); break;
-            case PROP_NUMBER_FORMAT         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")); break;
-            case PROP_NAME                  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); break;
-            case PROP_IS_INPUT              :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsInput")); break;
-            case PROP_HINT                  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hint")); break;
-            case PROP_FULL_NAME             :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullName")); break;
-            case PROP_KEYWORDS              :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Keywords")); break;
-            case PROP_DESCRIPTION           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")); break;
-            case PROP_MACRO_NAME            :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacroName")); break;
-            case PROP_SUBJECT               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subject")); break;
-            case PROP_USER_DATA_TYPE        :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDataType")); break;
-            case PROP_TITLE                 :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); break;
-            case PROP_CONTENT               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content")); break;
-            case PROP_DATA_COLUMN_NAME      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")); break;
-            case PROP_INPUT_STREAM          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")); break;
-            case PROP_GRAPHIC               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Graphic")); break;
-            case PROP_ANCHOR_TYPE           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); break;
-            case PROP_SIZE                  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")); break;
-            case PROP_HORI_ORIENT           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")); break;
-            case PROP_HORI_ORIENT_POSITION  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")); break;
-            case PROP_HORI_ORIENT_RELATION  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientRelation")); break;
-            case PROP_VERT_ORIENT           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")); break;
-            case PROP_VERT_ORIENT_POSITION  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")); break;
-            case PROP_VERT_ORIENT_RELATION  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientRelation")); break;
-            case PROP_GRAPHIC_CROP          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicCrop")); break;
-            case PROP_SIZE100th_M_M         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size100thMM")); break;
-            case PROP_SIZE_PIXEL            :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")); break;
-            case PROP_SURROUND              :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Surround")); break;
-            case PROP_SURROUND_CONTOUR      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SurroundContour")); break;
-            case PROP_ADJUST_CONTRAST       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustContrast")); break;
-            case PROP_ADJUST_LUMINANCE      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustLuminance")); break;
-            case PROP_GRAPHIC_COLOR_MODE    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicColorMode")); break;
-            case PROP_GAMMA                 :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Gamma")); break;
-            case PROP_HORI_MIRRORED_ON_EVEN_PAGES:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriMirroredOnEvenPages")); break;
-            case PROP_HORI_MIRRORED_ON_ODD_PAGES :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriMirroredOnOddPages")); break;
-            case PROP_VERT_MIRRORED        :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertMirrored")); break;
-            case PROP_CONTOUR_OUTSIDE      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContourOutside")); break;
-            case PROP_CONTOUR_POLY_POLYGON :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContourPolyPolygon")); break;
-            case PROP_PAGE_TOGGLE          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageToggle")); break;
-            case PROP_BACK_COLOR           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackColor")); break;
-            case PROP_BACK_COLOR_TRANSPARENCY:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackColorTransparency")); break;
-            case PROP_ALTERNATIVE_TEXT     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")); break;
-            case PROP_HEADER_TEXT_LEFT     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft")); break;
-            case PROP_HEADER_TEXT          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderText")); break;
-            case PROP_HEADER_IS_SHARED     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared")); break;
-            case PROP_HEADER_IS_ON         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")); break;
-            case PROP_FOOTER_TEXT_LEFT     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft")); break;
-            case PROP_FOOTER_TEXT          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterText")); break;
-            case PROP_FOOTER_IS_SHARED     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsShared")); break;
-            case PROP_FOOTER_IS_ON         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")); break;
-            case PROP_FOOTNOTE_COUNTING    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FootnoteCounting")); break;
-            case PROP_WIDTH                :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")); break;
-            case PROP_HEIGHT               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")); break;
-            case PROP_SEPARATOR_LINE_IS_ON :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineIsOn")); break;
-            case PROP_TEXT_COLUMNS         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextColumns")); break;
-            case PROP_AUTOMATIC_DISTANCE   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticDistance")); break;
-            case PROP_IS_LANDSCAPE         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsLandscape")); break;
-            case PROP_PRINTER_PAPER_TRAY_INDEX:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrinterPaperTrayIndex")); break;
-            case PROP_FIRST_PAGE       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First Page")); break;
-            case PROP_DEFAULT          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default")); break;
-            case PROP_PAGE_DESC_NAME   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageDescName")); break;
-            case PROP_PAGE_NUMBER_OFFSET:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageNumberOffset")); break;
-            case PROP_BREAK_TYPE       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BreakType")); break;
-            case PROP_FOOTER_IS_DYNAMIC_HEIGHT:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsDynamicHeight")); break;
-            case PROP_FOOTER_DYNAMIC_SPACING:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterDynamicSpacing")); break;
-            case PROP_FOOTER_HEIGHT         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterHeight")); break;
-            case PROP_FOOTER_BODY_DISTANCE  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance")); break;
-            case PROP_HEADER_IS_DYNAMIC_HEIGHT:  sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsDynamicHeight")); break;
-            case PROP_HEADER_DYNAMIC_SPACING:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderDynamicSpacing")); break;
-            case PROP_HEADER_HEIGHT         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")); break;
-            case PROP_HEADER_BODY_DISTANCE  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance")); break;
-            case PROP_WRITING_MODE          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritingMode")); break;
-            case PROP_GRID_MODE             :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridMode")); break;
-            case PROP_GRID_DISPLAY          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridDisplay")); break;
-            case PROP_GRID_PRINT            :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridPrint")); break;
-            case PROP_ADD_EXTERNAL_LEADING  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddExternalLeading")); break;
-            case PROP_GRID_LINES            :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridLines")); break;
-            case PROP_GRID_BASE_HEIGHT      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridBaseHeight")); break;
-            case PROP_GRID_RUBY_HEIGHT      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridRubyHeight")); break;
-            case PROP_IS_ON                  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsOn")); break;
-            case PROP_RESTART_AT_EACH_PAGE   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")); break;
-            case PROP_COUNT_EMPTY_LINES      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")); break;
-            case PROP_COUNT_LINES_IN_FRAMES  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountLinesInFrames")); break;
-            case PROP_INTERVAL               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Interval")); break;
-            case PROP_DISTANCE               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Distance")); break;
-            case PROP_NUMBER_POSITION        :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberPosition")); break;
-            case PROP_LEVEL                  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Level")); break;
-            case PROP_LEVEL_FOLLOW           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LabelFollowedBy")); break;
-            case PROP_LEVEL_PARAGRAPH_STYLES :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LevelParagraphStyles")); break;
-            case PROP_LEVEL_FORMAT           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LevelFormat")); break;
-            case PROP_TOKEN_TYPE             :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenType")); break;
-            case PROP_TOKEN_HYPERLINK_START  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkStart")); break;
-            case PROP_TOKEN_HYPERLINK_END    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkEnd")); break;
-            case PROP_TOKEN_CHAPTER_INFO     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenChapterInfo")); break;
-            case PROP_CHAPTER_FORMAT         :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")); break;
-            case PROP_TOKEN_TEXT             :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenText")); break;
-            case PROP_TEXT                   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text")); break;
-            case PROP_CREATE_FROM_OUTLINE    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromOutline")); break;
-            case PROP_CREATE_FROM_MARKS      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks")); break;
-            case PROP_STANDARD               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); break;
-            case PROP_IS_SPLIT_ALLOWED       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSplitAllowed")); break;
-            case META_PROP_VERTICAL_BORDER   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalBorder")); break;
-            case META_PROP_HORIZONTAL_BORDER :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HorizontalBorder")); break;
-            case PROP_HEADER_ROW_COUNT      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderRowCount")); break;
-            case PROP_IS_AUTO_HEIGHT        :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoHeight")); break;
-            case PROP_SIZE_TYPE             :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizeType")); break;
-            case PROP_TABLE_COLUMN_SEPARATORS:   sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableColumnSeparators")); break;
-            case META_PROP_TABLE_STYLE_NAME  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableStyleName")); break;
-            case PROP_REDLINE_AUTHOR        :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineAuthor")); break;
-            case PROP_REDLINE_DATE_TIME     :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineDateTime")); break;
-            case PROP_REDLINE_COMMENT       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineComment")); break;
-            case PROP_REDLINE_TYPE          :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineType")); break;
-            case PROP_REDLINE_SUCCESSOR_DATA:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineSuccessorData")); break;
-            case PROP_REDLINE_IDENTIFIER    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineIdentifier")); break;
-            case PROP_SIZE_PROTECTED        :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizeProtected")); break;
-            case PROP_POSITION_PROTECTED    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionProtected")); break;
-            case PROP_OPAQUE                :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Opaque")); break;
-            case PROP_VERTICAL_MERGE   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalMerge")); break;
-            case PROP_BULLET_CHAR      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletChar")); break;
-            case PROP_BULLET_FONT_NAME :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFontName")); break;
-            case PROP_PARA_BACK_COLOR  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackColor")); break;
-            case PROP_TABS_RELATIVE_TO_INDENT:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabsRelativeToIndent")); break;
-            case PROP_PREFIX           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefix")); break;
-            case PROP_SUFFIX           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Suffix")); break;
-            case PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromLevelParagraphStyles")); break;
-            case PROP_DROP_CAP_FORMAT  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DropCapFormat")); break;
-            case PROP_REFERENCE_FIELD_PART :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldPart")); break;
-            case PROP_SOURCE_NAME:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SourceName")); break;
-            case PROP_REFERENCE_FIELD_SOURCE :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldSource")); break;
-            case PROP_WIDTH_TYPE :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WidthType")); break;
-            case  PROP_TEXT_RANGE:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")); break;
-            case PROP_SERVICE_CHAR_STYLE       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle")); break;
-            case PROP_SERVICE_PARA_STYLE       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle")); break;
-            case PROP_CHARACTER_STYLES :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterStyles")); break;
-            case PROP_PARAGRAPH_STYLES :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles")); break;
-            case PROP_PARAGRAPH_STYLE_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyleName")); break;
-            case PROP_TABLE_BORDER_DISTANCES:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableBorderDistances")); break;
-            case META_PROP_CELL_MAR_TOP    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarTop")); break;
-            case META_PROP_CELL_MAR_BOTTOM :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarBottom")); break;
-            case META_PROP_CELL_MAR_LEFT   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarLeft")); break;
-            case META_PROP_CELL_MAR_RIGHT  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarRight")); break;
-            case PROP_START_AT :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartAt")); break;
-            case PROP_ADD_PARA_TABLE_SPACING :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddParaTableSpacing")); break;
-            case PROP_CHAR_PROP_HEIGHT        :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeight")); break;
-            case PROP_CHAR_PROP_HEIGHT_ASIAN  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeightAsian")); break;
-            case PROP_CHAR_PROP_HEIGHT_COMPLEX:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeightComplex")); break;
-            case PROP_FORMAT   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Format")); break;
-            case PROP_INSERT   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Insert")); break;
-            case PROP_DELETE   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Delete")); break;
-            case PROP_STREAM_NAME:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")); break;
-            case PROP_BITMAP :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap")); break;
-            case PROP_IS_DATE :   sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDate")); break;
-            case PROP_TAB_STOP_DISTANCE :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabStopDistance")); break;
-            case PROP_CNF_STYLE  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CnfStyle")); break;
-            case PROP_INDENT_AT :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IndentAt")); break;
-            case PROP_FIRST_LINE_INDENT :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstLineIndent")); break;
-            case PROP_NUMBERING_STYLE_NAME  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName")); break;
-            case PROP_OUTLINE_LEVEL  :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutlineLevel")); break;
-            case PROP_LISTTAB_STOP_POSITION :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListtabStopPosition")); break;
-            case PROP_POSITION_AND_SPACE_MODE :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionAndSpaceMode")); break;
-            case PROP_PARA_SPLIT:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaSplit")); break;
-            case PROP_HELP:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Help")); break;
-            case PROP_HEADING_STYLE_NAME:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName")); break;
-            case PROP_FRM_DIRECTION:        sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FRMDirection")); break;
-            case PROP_EMBEDDED_OBJECT           :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EmbeddedObject")); break;
+            case PROP_PARA_STYLE_NAME:      sName = "ParaStyleName"; break;
+            case PROP_PARA_ADJUST:     sName = "ParaAdjust"; break;
+            case PROP_PARA_VERT_ALIGNMENT: sName = "ParaVertAlignment"; break;
+            case PROP_PARA_LAST_LINE_ADJUST:     sName = "ParaLastLineAdjust"; break;
+            case PROP_PARA_RIGHT_MARGIN     :    sName = "ParaRightMargin"; break;
+            case PROP_PARA_LEFT_MARGIN      :    sName = "ParaLeftMargin"; break;
+            case PROP_PARA_FIRST_LINE_INDENT:    sName = "ParaFirstLineIndent"; break;
+            case PROP_PARA_KEEP_TOGETHER:       sName = "ParaKeepTogether"; break;
+            case PROP_PARA_TOP_MARGIN:       sName = "ParaTopMargin"; break;
+            case PROP_PARA_CONTEXT_MARGIN:       sName = "ParaContextMargin"; break;
+            case PROP_PARA_BOTTOM_MARGIN:       sName = "ParaBottomMargin"; break;
+            case PROP_PARA_IS_HYPHENATION:     sName = "ParaIsHyphenation"; break;
+            case PROP_PARA_LINE_NUMBER_COUNT:     sName = "ParaLineNumberCount"; break;
+            case PROP_PARA_IS_HANGING_PUNCTUATION: sName = "ParaIsHangingPunctuation"; break;
+            case PROP_PARA_LINE_SPACING:     sName = "ParaLineSpacing"; break;
+            case PROP_PARA_TAB_STOPS:       sName = "ParaTabStops"; break;
+            case PROP_PARA_WIDOWS:          sName = "ParaWidows"; break;
+            case PROP_PARA_ORPHANS:         sName = "ParaOrphans"; break;
+            case PROP_PARA_LINE_NUMBER_START_VALUE:    sName = "ParaLineNumberStartValue"; break;
+            case PROP_NUMBERING_LEVEL:  sName = "NumberingLevel"; break;
+            case PROP_NUMBERING_RULES:  sName = "NumberingRules"; break;
+            case PROP_NUMBERING_TYPE:   sName = "NumberingType"; break;
+            case PROP_START_WITH:       sName = "StartWith"; break;
+            case PROP_ADJUST:           sName = "Adjust"; break;
+            case PROP_PARENT_NUMBERING: sName = "ParentNumbering"; break;
+            case PROP_RIGHT_MARGIN     :    sName = "RightMargin"; break;
+            case PROP_LEFT_MARGIN      :    sName = "LeftMargin"; break;
+            case PROP_TOP_MARGIN          :    sName = "TopMargin"; break;
+            case PROP_BOTTOM_MARGIN       :    sName = "BottomMargin"; break;
+            case PROP_FIRST_LINE_OFFSET:    sName = "FirstLineOffset"; break;
+            case PROP_LEFT_BORDER           :    sName = "LeftBorder";break;
+            case PROP_RIGHT_BORDER          :    sName = "RightBorder";break;
+            case PROP_TOP_BORDER            :    sName = "TopBorder";break;
+            case PROP_BOTTOM_BORDER         :    sName = "BottomBorder";break;
+            case PROP_TABLE_BORDER         :    sName = "TableBorder";break;
+            case PROP_LEFT_BORDER_DISTANCE  :    sName = "LeftBorderDistance"; break;
+            case PROP_RIGHT_BORDER_DISTANCE :    sName = "RightBorderDistance"; break;
+            case PROP_TOP_BORDER_DISTANCE   :    sName = "TopBorderDistance";break;
+            case PROP_BOTTOM_BORDER_DISTANCE:    sName = "BottomBorderDistance"; break;
+            case PROP_CURRENT_PRESENTATION  :    sName = "CurrentPresentation"; break;
+            case PROP_IS_FIXED              :    sName = "IsFixed"; break;
+            case PROP_SUB_TYPE              :    sName = "SubType"; break;
+            case PROP_FILE_FORMAT           :    sName = "FileFormat"; break;
+            case PROP_HYPER_LINK_U_R_L      :    sName = "HyperLinkURL"; break;
+            case PROP_NUMBER_FORMAT         :    sName = "NumberFormat"; break;
+            case PROP_NAME                  :    sName = "Name"; break;
+            case PROP_IS_INPUT              :    sName = "IsInput"; break;
+            case PROP_HINT                  :    sName = "Hint"; break;
+            case PROP_FULL_NAME             :    sName = "FullName"; break;
+            case PROP_KEYWORDS              :    sName = "Keywords"; break;
+            case PROP_DESCRIPTION           :    sName = "Description"; break;
+            case PROP_MACRO_NAME            :    sName = "MacroName"; break;
+            case PROP_SUBJECT               :    sName = "Subject"; break;
+            case PROP_USER_DATA_TYPE        :    sName = "UserDataType"; break;
+            case PROP_TITLE                 :    sName = "Title"; break;
+            case PROP_CONTENT               :    sName = "Content"; break;
+            case PROP_DATA_COLUMN_NAME      :    sName = "DataColumnName"; break;
+            case PROP_INPUT_STREAM          :    sName = "InputStream"; break;
+            case PROP_GRAPHIC               :    sName = "Graphic"; break;
+            case PROP_ANCHOR_TYPE           :    sName = "AnchorType"; break;
+            case PROP_SIZE                  :    sName = "Size"; break;
+            case PROP_HORI_ORIENT           :    sName = "HoriOrient"; break;
+            case PROP_HORI_ORIENT_POSITION  :    sName = "HoriOrientPosition"; break;
+            case PROP_HORI_ORIENT_RELATION  :    sName = "HoriOrientRelation"; break;
+            case PROP_VERT_ORIENT           :    sName = "VertOrient"; break;
+            case PROP_VERT_ORIENT_POSITION  :    sName = "VertOrientPosition"; break;
+            case PROP_VERT_ORIENT_RELATION  :    sName = "VertOrientRelation"; break;
+            case PROP_GRAPHIC_CROP          :    sName = "GraphicCrop"; break;
+            case PROP_SIZE100th_M_M         :    sName = "Size100thMM"; break;
+            case PROP_SIZE_PIXEL            :    sName = "SizePixel"; break;
+            case PROP_SURROUND              :    sName = "Surround"; break;
+            case PROP_SURROUND_CONTOUR      :    sName = "SurroundContour"; break;
+            case PROP_ADJUST_CONTRAST       :    sName = "AdjustContrast"; break;
+            case PROP_ADJUST_LUMINANCE      :    sName = "AdjustLuminance"; break;
+            case PROP_GRAPHIC_COLOR_MODE    :    sName = "GraphicColorMode"; break;
+            case PROP_GAMMA                 :    sName = "Gamma"; break;
+            case PROP_HORI_MIRRORED_ON_EVEN_PAGES:    sName = "HoriMirroredOnEvenPages"; break;
+            case PROP_HORI_MIRRORED_ON_ODD_PAGES :    sName = "HoriMirroredOnOddPages"; break;
+            case PROP_VERT_MIRRORED        :    sName = "VertMirrored"; break;
+            case PROP_CONTOUR_OUTSIDE      :    sName = "ContourOutside"; break;
+            case PROP_CONTOUR_POLY_POLYGON :    sName = "ContourPolyPolygon"; break;
+            case PROP_PAGE_TOGGLE          :    sName = "PageToggle"; break;
+            case PROP_BACK_COLOR           :    sName = "BackColor"; break;
+            case PROP_BACK_COLOR_TRANSPARENCY:  sName = "BackColorTransparency"; break;
+            case PROP_ALTERNATIVE_TEXT     :    sName = "AlternativeText"; break;
+            case PROP_HEADER_TEXT_LEFT     :    sName = "HeaderTextLeft"; break;
+            case PROP_HEADER_TEXT          :    sName = "HeaderText"; break;
+            case PROP_HEADER_IS_SHARED     :    sName = "HeaderIsShared"; break;
+            case PROP_HEADER_IS_ON         :    sName = "HeaderIsOn"; break;
+            case PROP_FOOTER_TEXT_LEFT     :    sName = "FooterTextLeft"; break;
+            case PROP_FOOTER_TEXT          :    sName = "FooterText"; break;
+            case PROP_FOOTER_IS_SHARED     :    sName = "FooterIsShared"; break;
+            case PROP_FOOTER_IS_ON         :    sName = "FooterIsOn"; break;
+            case PROP_FOOTNOTE_COUNTING    :    sName = "FootnoteCounting"; break;
+            case PROP_WIDTH                :    sName = "Width"; break;
+            case PROP_HEIGHT               :    sName = "Height"; break;
+            case PROP_SEPARATOR_LINE_IS_ON :    sName = "SeparatorLineIsOn"; break;
+            case PROP_TEXT_COLUMNS         :    sName = "TextColumns"; break;
+            case PROP_AUTOMATIC_DISTANCE   :    sName = "AutomaticDistance"; break;
+            case PROP_IS_LANDSCAPE         :    sName = "IsLandscape"; break;
+            case PROP_PRINTER_PAPER_TRAY_INDEX:    sName = "PrinterPaperTrayIndex"; break;
+            case PROP_FIRST_PAGE       :    sName = "First Page"; break;
+            case PROP_DEFAULT          :    sName = "Default"; break;
+            case PROP_PAGE_DESC_NAME   :    sName = "PageDescName"; break;
+            case PROP_PAGE_NUMBER_OFFSET:    sName = "PageNumberOffset"; break;
+            case PROP_BREAK_TYPE       :    sName = "BreakType"; break;
+            case PROP_FOOTER_IS_DYNAMIC_HEIGHT:  sName = "FooterIsDynamicHeight"; break;
+            case PROP_FOOTER_DYNAMIC_SPACING:    sName = "FooterDynamicSpacing"; break;
+            case PROP_FOOTER_HEIGHT         :    sName = "FooterHeight"; break;
+            case PROP_FOOTER_BODY_DISTANCE  :    sName = "FooterBodyDistance"; break;
+            case PROP_HEADER_IS_DYNAMIC_HEIGHT:  sName = "HeaderIsDynamicHeight"; break;
+            case PROP_HEADER_DYNAMIC_SPACING:    sName = "HeaderDynamicSpacing"; break;
+            case PROP_HEADER_HEIGHT         :    sName = "HeaderHeight"; break;
+            case PROP_HEADER_BODY_DISTANCE  :    sName = "HeaderBodyDistance"; break;
+            case PROP_WRITING_MODE          :    sName = "WritingMode"; break;
+            case PROP_GRID_MODE             :    sName = "GridMode"; break;
+            case PROP_GRID_DISPLAY          :    sName = "GridDisplay"; break;
+            case PROP_GRID_PRINT            :    sName = "GridPrint"; break;
+            case PROP_ADD_EXTERNAL_LEADING  :    sName = "AddExternalLeading"; break;
+            case PROP_GRID_LINES            :    sName = "GridLines"; break;
+            case PROP_GRID_BASE_HEIGHT      :    sName = "GridBaseHeight"; break;
+            case PROP_GRID_RUBY_HEIGHT      :    sName = "GridRubyHeight"; break;
+            case PROP_IS_ON                  :    sName = "IsOn"; break;
+            case PROP_RESTART_AT_EACH_PAGE   :    sName = "RestartAtEachPage"; break;
+            case PROP_COUNT_EMPTY_LINES      :    sName = "CountEmptyLines"; break;
+            case PROP_COUNT_LINES_IN_FRAMES  :    sName = "CountLinesInFrames"; break;
+            case PROP_INTERVAL               :    sName = "Interval"; break;
+            case PROP_DISTANCE               :    sName = "Distance"; break;
+            case PROP_NUMBER_POSITION        :    sName = "NumberPosition"; break;
+            case PROP_LEVEL                  :    sName = "Level"; break;
+            case PROP_LEVEL_FOLLOW           :    sName = "LabelFollowedBy"; break;
+            case PROP_LEVEL_PARAGRAPH_STYLES :    sName = "LevelParagraphStyles"; break;
+            case PROP_LEVEL_FORMAT           :    sName = "LevelFormat"; break;
+            case PROP_TOKEN_TYPE             :    sName = "TokenType"; break;
+            case PROP_TOKEN_HYPERLINK_START  :    sName = "TokenHyperlinkStart"; break;
+            case PROP_TOKEN_HYPERLINK_END    :    sName = "TokenHyperlinkEnd"; break;
+            case PROP_TOKEN_CHAPTER_INFO     :    sName = "TokenChapterInfo"; break;
+            case PROP_CHAPTER_FORMAT         :    sName = "ChapterFormat"; break;
+            case PROP_TOKEN_TEXT             :    sName = "TokenText"; break;
+            case PROP_TEXT                   :    sName = "Text"; break;
+            case PROP_CREATE_FROM_OUTLINE    :    sName = "CreateFromOutline"; break;
+            case PROP_CREATE_FROM_MARKS      :    sName = "CreateFromMarks"; break;
+            case PROP_STANDARD               :    sName = "Standard"; break;
+            case PROP_IS_SPLIT_ALLOWED       :    sName = "IsSplitAllowed"; break;
+            case META_PROP_VERTICAL_BORDER   :    sName = "VerticalBorder"; break;
+            case META_PROP_HORIZONTAL_BORDER :    sName = "HorizontalBorder"; break;
+            case PROP_HEADER_ROW_COUNT      :    sName = "HeaderRowCount"; break;
+            case PROP_IS_AUTO_HEIGHT        :    sName = "IsAutoHeight"; break;
+            case PROP_SIZE_TYPE             :    sName = "SizeType"; break;
+            case PROP_TABLE_COLUMN_SEPARATORS:   sName = "TableColumnSeparators"; break;
+            case META_PROP_TABLE_STYLE_NAME  :    sName = "TableStyleName"; break;
+            case PROP_REDLINE_AUTHOR        :    sName = "RedlineAuthor"; break;
+            case PROP_REDLINE_DATE_TIME     :    sName = "RedlineDateTime"; break;
+            case PROP_REDLINE_COMMENT       :    sName = "RedlineComment"; break;
+            case PROP_REDLINE_TYPE          :    sName = "RedlineType"; break;
+            case PROP_REDLINE_SUCCESSOR_DATA:    sName = "RedlineSuccessorData"; break;
+            case PROP_REDLINE_IDENTIFIER    :    sName = "RedlineIdentifier"; break;
+            case PROP_SIZE_PROTECTED        :    sName = "SizeProtected"; break;
+            case PROP_POSITION_PROTECTED    :    sName = "PositionProtected"; break;
+            case PROP_OPAQUE                :    sName = "Opaque"; break;
+            case PROP_VERTICAL_MERGE   :    sName = "VerticalMerge"; break;
+            case PROP_BULLET_CHAR      :    sName = "BulletChar"; break;
+            case PROP_BULLET_FONT_NAME :    sName = "BulletFontName"; break;
+            case PROP_PARA_BACK_COLOR  :    sName = "ParaBackColor"; break;
+            case PROP_TABS_RELATIVE_TO_INDENT:    sName = "TabsRelativeToIndent"; break;
+            case PROP_PREFIX           :    sName = "Prefix"; break;
+            case PROP_SUFFIX           :    sName = "Suffix"; break;
+            case PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES:    sName = "CreateFromLevelParagraphStyles"; break;
+            case PROP_DROP_CAP_FORMAT  :    sName = "DropCapFormat"; break;
+            case PROP_REFERENCE_FIELD_PART :    sName = "ReferenceFieldPart"; break;
+            case PROP_SOURCE_NAME:    sName = "SourceName"; break;
+            case PROP_REFERENCE_FIELD_SOURCE :    sName = "ReferenceFieldSource"; break;
+            case PROP_WIDTH_TYPE :    sName = "WidthType"; break;
+            case  PROP_TEXT_RANGE:    sName = "TextRange"; break;
+            case PROP_SERVICE_CHAR_STYLE       :    sName = "com.sun.star.style.CharacterStyle"; break;
+            case PROP_SERVICE_PARA_STYLE       :    sName = "com.sun.star.style.ParagraphStyle"; break;
+            case PROP_CHARACTER_STYLES :    sName = "CharacterStyles"; break;
+            case PROP_PARAGRAPH_STYLES :    sName = "ParagraphStyles"; break;
+            case PROP_PARAGRAPH_STYLE_NAME : sName = "ParagraphStyleName"; break;
+            case PROP_TABLE_BORDER_DISTANCES:    sName = "TableBorderDistances"; break;
+            case META_PROP_CELL_MAR_TOP    :    sName = "MetaPropCellMarTop"; break;
+            case META_PROP_CELL_MAR_BOTTOM :    sName = "MetaPropCellMarBottom"; break;
+            case META_PROP_CELL_MAR_LEFT   :    sName = "MetaPropCellMarLeft"; break;
+            case META_PROP_CELL_MAR_RIGHT  :    sName = "MetaPropCellMarRight"; break;
+            case PROP_START_AT :    sName = "StartAt"; break;
+            case PROP_ADD_PARA_TABLE_SPACING :    sName = "AddParaTableSpacing"; break;
+            case PROP_CHAR_PROP_HEIGHT        :    sName = "CharPropHeight"; break;
+            case PROP_CHAR_PROP_HEIGHT_ASIAN  :    sName = "CharPropHeightAsian"; break;
+            case PROP_CHAR_PROP_HEIGHT_COMPLEX:    sName = "CharPropHeightComplex"; break;
+            case PROP_FORMAT   :    sName = "Format"; break;
+            case PROP_INSERT   :    sName = "Insert"; break;
+            case PROP_DELETE   :    sName = "Delete"; break;
+            case PROP_STREAM_NAME:    sName = "StreamName"; break;
+            case PROP_BITMAP :    sName = "Bitmap"; break;
+            case PROP_IS_DATE :   sName = "IsDate"; break;
+            case PROP_TAB_STOP_DISTANCE :    sName = "TabStopDistance"; break;
+            case PROP_CNF_STYLE  :    sName = "CnfStyle"; break;
+            case PROP_INDENT_AT :    sName = "IndentAt"; break;
+            case PROP_FIRST_LINE_INDENT :    sName = "FirstLineIndent"; break;
+            case PROP_NUMBERING_STYLE_NAME  :    sName = "NumberingStyleName"; break;
+            case PROP_OUTLINE_LEVEL  :    sName = "OutlineLevel"; break;
+            case PROP_LISTTAB_STOP_POSITION :    sName = "ListtabStopPosition"; break;
+            case PROP_POSITION_AND_SPACE_MODE :    sName = "PositionAndSpaceMode"; break;
+            case PROP_PARA_SPLIT:    sName = "ParaSplit"; break;
+            case PROP_HELP:    sName = "Help"; break;
+            case PROP_HEADING_STYLE_NAME:    sName = "HeadingStyleName"; break;
+            case PROP_FRM_DIRECTION:        sName = "FRMDirection"; break;
+            case PROP_EMBEDDED_OBJECT           :    sName = "EmbeddedObject"; break;
             case PROP_IS_VISIBLE: sName = "IsVisible"; break;
             case PROP_PAGE_STYLE_LAYOUT: sName = "PageStyleLayout"; break;
             case PROP_Z_ORDER: sName = "ZOrder"; break;
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 546301ab151e..214fe91def51 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -367,7 +367,7 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle(
                 uno::Sequence< ::rtl::OUString > aPageStyleNames = xPageStyles->getElementNames();
                 m_sFirstPageStyleName = lcl_FindUnusedPageStyleName(aPageStyleNames);
                 m_aFirstPageStyle = uno::Reference< beans::XPropertySet > (
-                        xTextFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle") )),
+                        xTextFactory->createInstance("com.sun.star.style.PageStyle"),
                         uno::UNO_QUERY);
                 if (xPageStyles.is())
                     xPageStyles->insertByName( m_sFirstPageStyleName, uno::makeAny(m_aFirstPageStyle) );
@@ -385,7 +385,7 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle(
                 uno::Sequence< ::rtl::OUString > aPageStyleNames = xPageStyles->getElementNames();
                 m_sFollowPageStyleName = lcl_FindUnusedPageStyleName(aPageStyleNames);
                 m_aFollowPageStyle = uno::Reference< beans::XPropertySet > (
-                        xTextFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle") )),
+                        xTextFactory->createInstance("com.sun.star.style.PageStyle"),
                         uno::UNO_QUERY);
                 xPageStyles->insertByName( m_sFollowPageStyleName, uno::makeAny(m_aFollowPageStyle) );
             }
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 0cfbbcecac28..5d2172454324 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -801,9 +801,9 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                         }
 
                         uno::Reference< beans::XPropertyState >xState( xStyle, uno::UNO_QUERY_THROW );
-                        if( sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Contents Heading" ) ) ||
-                            sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "User Index Heading" ) ) ||
-                            sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Index Heading" ) ))
+                        if( sConvertedStyleName == "Contents Heading" ||
+                            sConvertedStyleName == "User Index Heading" ||
+                            sConvertedStyleName == "Index Heading" )
                         {
                             //left margin is set to NULL by default
                             uno::Reference< beans::XPropertyState >xState1( xStyle, uno::UNO_QUERY_THROW );
@@ -811,15 +811,15 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                         }
                         else if ( sConvertedStyleName == "Text body" )
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_PARA_BOTTOM_MARGIN ));
-                        else if( sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 1" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 2" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 3" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 4" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 5" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 6" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 7" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 8" ) ) ||
-                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 9" ) ) )
+                        else if( sConvertedStyleName == "Heading 1" ||
+                                sConvertedStyleName == "Heading 2" ||
+                                sConvertedStyleName == "Heading 3" ||
+                                sConvertedStyleName == "Heading 4" ||
+                                sConvertedStyleName == "Heading 5" ||
+                                sConvertedStyleName == "Heading 6" ||
+                                sConvertedStyleName == "Heading 7" ||
+                                sConvertedStyleName == "Heading 8" ||
+                                sConvertedStyleName == "Heading 9" )
                         {
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_WEIGHT ));
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_WEIGHT_ASIAN ));