reportdesign: {DECLARE,IMPLEMENT}_CONSTASCII_USTRING are no longer needed

Change-Id: I85fedf6f3db0ffa59eaafe94d370b05660468c24

28 files changed, 576 insertions, 1043 deletions

diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 1dfe60e0efa4..7b770abbc9df 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_Library_add_exception_objects,rpt,\
     reportdesign/source/core/sdr/RptPage \
     reportdesign/source/core/sdr/UndoActions \
     reportdesign/source/core/sdr/UndoEnv \
-    reportdesign/source/shared/corestrings \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 706ef0a76146..831ee34dbd5f 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_libraries,rptui,\
 $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui))
 
 $(eval $(call gb_Library_add_exception_objects,rptui,\
-    reportdesign/source/shared/uistrings \
     reportdesign/source/ui/dlg/AddField \
     reportdesign/source/ui/dlg/CondFormat \
     reportdesign/source/ui/dlg/Condition \
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 59c5275a4d50..f46518e30e85 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,rptxml,\
     reportdesign/source/filter/xml/xmlStyleImport \
     reportdesign/source/filter/xml/xmlSubDocument \
     reportdesign/source/filter/xml/xmlTable \
-    reportdesign/source/shared/xmlstrings \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index f22fb7a0bb04..09a55b8f78a9 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -41,86 +41,86 @@ namespace reportdesign
 uno::Sequence< OUString > lcl_getLineOptionals()
 {
     OUString pProps[] = {
-             PROPERTY_DATAFIELD
-            ,PROPERTY_DEFAULTCONTROL
-            ,PROPERTY_CONTROLBORDER
-            ,PROPERTY_CONTROLBORDERCOLOR
-            ,PROPERTY_CHARCOLOR
-            ,PROPERTY_CHAREMPHASIS
-            ,PROPERTY_CHARFONTCHARSET
-            ,PROPERTY_CHARFONTFAMILY
-            ,PROPERTY_CHARFONTNAME
-            ,PROPERTY_CHARFONTPITCH
-            ,PROPERTY_CHARFONTSTYLENAME
-            ,PROPERTY_CHARHEIGHT
-            ,PROPERTY_CHARPOSTURE
-            ,PROPERTY_CHARRELIEF
-            ,PROPERTY_FONTDESCRIPTOR
-            ,PROPERTY_FONTDESCRIPTORASIAN
-            ,PROPERTY_FONTDESCRIPTORCOMPLEX
-            ,PROPERTY_CONTROLTEXTEMPHASISMARK
-            ,PROPERTY_CHARROTATION
-            ,PROPERTY_CHARSCALEWIDTH
-            ,PROPERTY_CHARSTRIKEOUT
-            ,PROPERTY_CHARUNDERLINECOLOR
-            ,PROPERTY_CHARUNDERLINE
-            ,PROPERTY_CHARWEIGHT
-            ,PROPERTY_CHARWORDMODE
-            ,PROPERTY_CONTROLBACKGROUND
-            ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
-            ,PROPERTY_CHARFLASH
-            ,PROPERTY_CHARAUTOKERNING
-            ,PROPERTY_CHARESCAPEMENTHEIGHT
-            ,PROPERTY_CHARLOCALE
-            ,PROPERTY_CHARESCAPEMENT
-            ,PROPERTY_CHARCASEMAP
-            ,PROPERTY_CHARCOMBINEISON
-            ,PROPERTY_CHARCOMBINEPREFIX
-            ,PROPERTY_CHARCOMBINESUFFIX
-            ,PROPERTY_CHARHIDDEN
-            ,PROPERTY_CHARSHADOWED
-            ,PROPERTY_CHARCONTOURED
-            ,PROPERTY_HYPERLINKURL
-            ,PROPERTY_HYPERLINKTARGET
-            ,PROPERTY_HYPERLINKNAME
-            ,PROPERTY_VISITEDCHARSTYLENAME
-            ,PROPERTY_UNVISITEDCHARSTYLENAME
-            ,PROPERTY_CHARKERNING
-            ,PROPERTY_PRINTREPEATEDVALUES
-            ,PROPERTY_CONDITIONALPRINTEXPRESSION
-            ,PROPERTY_PRINTWHENGROUPCHANGE
-            ,PROPERTY_MASTERFIELDS
-            ,PROPERTY_DETAILFIELDS
-            ,PROPERTY_PARAADJUST
+             OUString(PROPERTY_DATAFIELD)
+            ,OUString(PROPERTY_DEFAULTCONTROL)
+            ,OUString(PROPERTY_CONTROLBORDER)
+            ,OUString(PROPERTY_CONTROLBORDERCOLOR)
+            ,OUString(PROPERTY_CHARCOLOR)
+            ,OUString(PROPERTY_CHAREMPHASIS)
+            ,OUString(PROPERTY_CHARFONTCHARSET)
+            ,OUString(PROPERTY_CHARFONTFAMILY)
+            ,OUString(PROPERTY_CHARFONTNAME)
+            ,OUString(PROPERTY_CHARFONTPITCH)
+            ,OUString(PROPERTY_CHARFONTSTYLENAME)
+            ,OUString(PROPERTY_CHARHEIGHT)
+            ,OUString(PROPERTY_CHARPOSTURE)
+            ,OUString(PROPERTY_CHARRELIEF)
+            ,OUString(PROPERTY_FONTDESCRIPTOR)
+            ,OUString(PROPERTY_FONTDESCRIPTORASIAN)
+            ,OUString(PROPERTY_FONTDESCRIPTORCOMPLEX)
+            ,OUString(PROPERTY_CONTROLTEXTEMPHASISMARK)
+            ,OUString(PROPERTY_CHARROTATION)
+            ,OUString(PROPERTY_CHARSCALEWIDTH)
+            ,OUString(PROPERTY_CHARSTRIKEOUT)
+            ,OUString(PROPERTY_CHARUNDERLINECOLOR)
+            ,OUString(PROPERTY_CHARUNDERLINE)
+            ,OUString(PROPERTY_CHARWEIGHT)
+            ,OUString(PROPERTY_CHARWORDMODE)
+            ,OUString(PROPERTY_CONTROLBACKGROUND)
+            ,OUString(PROPERTY_CONTROLBACKGROUNDTRANSPARENT)
+            ,OUString(PROPERTY_CHARFLASH)
+            ,OUString(PROPERTY_CHARAUTOKERNING)
+            ,OUString(PROPERTY_CHARESCAPEMENTHEIGHT)
+            ,OUString(PROPERTY_CHARLOCALE)
+            ,OUString(PROPERTY_CHARESCAPEMENT)
+            ,OUString(PROPERTY_CHARCASEMAP)
+            ,OUString(PROPERTY_CHARCOMBINEISON)
+            ,OUString(PROPERTY_CHARCOMBINEPREFIX)
+            ,OUString(PROPERTY_CHARCOMBINESUFFIX)
+            ,OUString(PROPERTY_CHARHIDDEN)
+            ,OUString(PROPERTY_CHARSHADOWED)
+            ,OUString(PROPERTY_CHARCONTOURED)
+            ,OUString(PROPERTY_HYPERLINKURL)
+            ,OUString(PROPERTY_HYPERLINKTARGET)
+            ,OUString(PROPERTY_HYPERLINKNAME)
+            ,OUString(PROPERTY_VISITEDCHARSTYLENAME)
+            ,OUString(PROPERTY_UNVISITEDCHARSTYLENAME)
+            ,OUString(PROPERTY_CHARKERNING)
+            ,OUString(PROPERTY_PRINTREPEATEDVALUES)
+            ,OUString(PROPERTY_CONDITIONALPRINTEXPRESSION)
+            ,OUString(PROPERTY_PRINTWHENGROUPCHANGE)
+            ,OUString(PROPERTY_MASTERFIELDS)
+            ,OUString(PROPERTY_DETAILFIELDS)
+            ,OUString(PROPERTY_PARAADJUST)
 
-            , PROPERTY_CHAREMPHASISASIAN
-            , PROPERTY_CHARFONTNAMEASIAN
-            , PROPERTY_CHARFONTSTYLENAMEASIAN
-            , PROPERTY_CHARFONTFAMILYASIAN
-            , PROPERTY_CHARFONTCHARSETASIAN
-            , PROPERTY_CHARFONTPITCHASIAN
-            , PROPERTY_CHARHEIGHTASIAN
-            , PROPERTY_CHARUNDERLINEASIAN
-            , PROPERTY_CHARWEIGHTASIAN
-            , PROPERTY_CHARPOSTUREASIAN
-            , PROPERTY_CHARWORDMODEASIAN
-            , PROPERTY_CHARROTATIONASIAN
-            , PROPERTY_CHARSCALEWIDTHASIAN
-            , PROPERTY_CHARLOCALEASIAN
-            , PROPERTY_CHAREMPHASISCOMPLEX
-            , PROPERTY_CHARFONTNAMECOMPLEX
-            , PROPERTY_CHARFONTSTYLENAMECOMPLEX
-            , PROPERTY_CHARFONTFAMILYCOMPLEX
-            , PROPERTY_CHARFONTCHARSETCOMPLEX
-            , PROPERTY_CHARFONTPITCHCOMPLEX
-            , PROPERTY_CHARHEIGHTCOMPLEX
-            , PROPERTY_CHARUNDERLINECOMPLEX
-            , PROPERTY_CHARWEIGHTCOMPLEX
-            , PROPERTY_CHARPOSTURECOMPLEX
-            , PROPERTY_CHARWORDMODECOMPLEX
-            , PROPERTY_CHARROTATIONCOMPLEX
-            , PROPERTY_CHARSCALEWIDTHCOMPLEX
-            , PROPERTY_CHARLOCALECOMPLEX
+            , OUString(PROPERTY_CHAREMPHASISASIAN)
+            , OUString(PROPERTY_CHARFONTNAMEASIAN)
+            , OUString(PROPERTY_CHARFONTSTYLENAMEASIAN)
+            , OUString(PROPERTY_CHARFONTFAMILYASIAN)
+            , OUString(PROPERTY_CHARFONTCHARSETASIAN)
+            , OUString(PROPERTY_CHARFONTPITCHASIAN)
+            , OUString(PROPERTY_CHARHEIGHTASIAN)
+            , OUString(PROPERTY_CHARUNDERLINEASIAN)
+            , OUString(PROPERTY_CHARWEIGHTASIAN)
+            , OUString(PROPERTY_CHARPOSTUREASIAN)
+            , OUString(PROPERTY_CHARWORDMODEASIAN)
+            , OUString(PROPERTY_CHARROTATIONASIAN)
+            , OUString(PROPERTY_CHARSCALEWIDTHASIAN)
+            , OUString(PROPERTY_CHARLOCALEASIAN)
+            , OUString(PROPERTY_CHAREMPHASISCOMPLEX)
+            , OUString(PROPERTY_CHARFONTNAMECOMPLEX)
+            , OUString(PROPERTY_CHARFONTSTYLENAMECOMPLEX)
+            , OUString(PROPERTY_CHARFONTFAMILYCOMPLEX)
+            , OUString(PROPERTY_CHARFONTCHARSETCOMPLEX)
+            , OUString(PROPERTY_CHARFONTPITCHCOMPLEX)
+            , OUString(PROPERTY_CHARHEIGHTCOMPLEX)
+            , OUString(PROPERTY_CHARUNDERLINECOMPLEX)
+            , OUString(PROPERTY_CHARWEIGHTCOMPLEX)
+            , OUString(PROPERTY_CHARPOSTURECOMPLEX)
+            , OUString(PROPERTY_CHARWORDMODECOMPLEX)
+            , OUString(PROPERTY_CHARROTATIONCOMPLEX)
+            , OUString(PROPERTY_CHARSCALEWIDTHCOMPLEX)
+            , OUString(PROPERTY_CHARLOCALECOMPLEX)
 
 
     };
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 8c256c15e354..02f038e15ad1 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -38,7 +38,7 @@ namespace reportdesign
     using namespace comphelper;
 uno::Sequence< OUString > lcl_getFixedTextOptionals()
 {
-    OUString pProps[] = { PROPERTY_DATAFIELD,PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS };
+    OUString pProps[] = { OUString(PROPERTY_DATAFIELD),OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) };
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
 DBG_NAME( rpt_OFixedText )
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 646cae21bce1..0b2ba8cd8038 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -45,7 +45,7 @@ uno::Reference< uno::XInterface > OFormattedField::create(uno::Reference< uno::X
 
 uno::Sequence< OUString > lcl_getFormattedFieldOptionals()
 {
-    OUString pProps[] = { PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS };
+    OUString pProps[] = { OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) };
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
 DBG_NAME( rpt_OFormattedField )
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index d41e83dae278..972b8d70bdf5 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -40,73 +40,73 @@ namespace reportdesign
 uno::Sequence< OUString > lcl_getImageOptionals()
 {
     OUString pProps[] = {
-            PROPERTY_CHARCOLOR
-            ,PROPERTY_CHAREMPHASIS
-            ,PROPERTY_CHARFONTCHARSET
-            ,PROPERTY_CHARFONTFAMILY
-            ,PROPERTY_CHARFONTNAME
-            ,PROPERTY_CHARFONTPITCH
-            ,PROPERTY_CHARFONTSTYLENAME
-            ,PROPERTY_CHARHEIGHT
-            ,PROPERTY_CHARPOSTURE
-            ,PROPERTY_CHARRELIEF
-            ,PROPERTY_FONTDESCRIPTOR
-            ,PROPERTY_FONTDESCRIPTORASIAN
-            ,PROPERTY_FONTDESCRIPTORCOMPLEX
-            ,PROPERTY_CONTROLTEXTEMPHASISMARK
-            ,PROPERTY_CHARROTATION
-            ,PROPERTY_CHARSCALEWIDTH
-            ,PROPERTY_CHARSTRIKEOUT
-            ,PROPERTY_CHARUNDERLINECOLOR
-            ,PROPERTY_CHARUNDERLINE
-            ,PROPERTY_CHARWEIGHT
-            ,PROPERTY_CHARWORDMODE
-            ,PROPERTY_CHARFLASH
-            ,PROPERTY_CHARAUTOKERNING
-            ,PROPERTY_CHARESCAPEMENTHEIGHT
-            ,PROPERTY_CHARLOCALE
-            ,PROPERTY_CHARESCAPEMENT
-            ,PROPERTY_CHARCASEMAP
-            ,PROPERTY_CHARCOMBINEISON
-            ,PROPERTY_CHARCOMBINEPREFIX
-            ,PROPERTY_CHARCOMBINESUFFIX
-            ,PROPERTY_CHARHIDDEN
-            ,PROPERTY_CHARSHADOWED
-            ,PROPERTY_CHARCONTOURED
-            ,PROPERTY_VISITEDCHARSTYLENAME
-            ,PROPERTY_UNVISITEDCHARSTYLENAME
-            ,PROPERTY_CHARKERNING
-            ,PROPERTY_MASTERFIELDS
-            ,PROPERTY_DETAILFIELDS
-            ,PROPERTY_PARAADJUST
-            , PROPERTY_CHAREMPHASISASIAN
-            , PROPERTY_CHARFONTNAMEASIAN
-            , PROPERTY_CHARFONTSTYLENAMEASIAN
-            , PROPERTY_CHARFONTFAMILYASIAN
-            , PROPERTY_CHARFONTCHARSETASIAN
-            , PROPERTY_CHARFONTPITCHASIAN
-            , PROPERTY_CHARHEIGHTASIAN
-            , PROPERTY_CHARUNDERLINEASIAN
-            , PROPERTY_CHARWEIGHTASIAN
-            , PROPERTY_CHARPOSTUREASIAN
-            , PROPERTY_CHARWORDMODEASIAN
-            , PROPERTY_CHARROTATIONASIAN
-            , PROPERTY_CHARSCALEWIDTHASIAN
-            , PROPERTY_CHARLOCALEASIAN
-            , PROPERTY_CHAREMPHASISCOMPLEX
-            , PROPERTY_CHARFONTNAMECOMPLEX
-            , PROPERTY_CHARFONTSTYLENAMECOMPLEX
-            , PROPERTY_CHARFONTFAMILYCOMPLEX
-            , PROPERTY_CHARFONTCHARSETCOMPLEX
-            , PROPERTY_CHARFONTPITCHCOMPLEX
-            , PROPERTY_CHARHEIGHTCOMPLEX
-            , PROPERTY_CHARUNDERLINECOMPLEX
-            , PROPERTY_CHARWEIGHTCOMPLEX
-            , PROPERTY_CHARPOSTURECOMPLEX
-            , PROPERTY_CHARWORDMODECOMPLEX
-            , PROPERTY_CHARROTATIONCOMPLEX
-            , PROPERTY_CHARSCALEWIDTHCOMPLEX
-            , PROPERTY_CHARLOCALECOMPLEX
+            OUString(PROPERTY_CHARCOLOR)
+            ,OUString(PROPERTY_CHAREMPHASIS)
+            ,OUString(PROPERTY_CHARFONTCHARSET)
+            ,OUString(PROPERTY_CHARFONTFAMILY)
+            ,OUString(PROPERTY_CHARFONTNAME)
+            ,OUString(PROPERTY_CHARFONTPITCH)
+            ,OUString(PROPERTY_CHARFONTSTYLENAME)
+            ,OUString(PROPERTY_CHARHEIGHT)
+            ,OUString(PROPERTY_CHARPOSTURE)
+            ,OUString(PROPERTY_CHARRELIEF)
+            ,OUString(PROPERTY_FONTDESCRIPTOR)
+            ,OUString(PROPERTY_FONTDESCRIPTORASIAN)
+            ,OUString(PROPERTY_FONTDESCRIPTORCOMPLEX)
+            ,OUString(PROPERTY_CONTROLTEXTEMPHASISMARK)
+            ,OUString(PROPERTY_CHARROTATION)
+            ,OUString(PROPERTY_CHARSCALEWIDTH)
+            ,OUString(PROPERTY_CHARSTRIKEOUT)
+            ,OUString(PROPERTY_CHARUNDERLINECOLOR)
+            ,OUString(PROPERTY_CHARUNDERLINE)
+            ,OUString(PROPERTY_CHARWEIGHT)
+            ,OUString(PROPERTY_CHARWORDMODE)
+            ,OUString(PROPERTY_CHARFLASH)
+            ,OUString(PROPERTY_CHARAUTOKERNING)
+            ,OUString(PROPERTY_CHARESCAPEMENTHEIGHT)
+            ,OUString(PROPERTY_CHARLOCALE)
+            ,OUString(PROPERTY_CHARESCAPEMENT)
+            ,OUString(PROPERTY_CHARCASEMAP)
+            ,OUString(PROPERTY_CHARCOMBINEISON)
+            ,OUString(PROPERTY_CHARCOMBINEPREFIX)
+            ,OUString(PROPERTY_CHARCOMBINESUFFIX)
+            ,OUString(PROPERTY_CHARHIDDEN)
+            ,OUString(PROPERTY_CHARSHADOWED)
+            ,OUString(PROPERTY_CHARCONTOURED)
+            ,OUString(PROPERTY_VISITEDCHARSTYLENAME)
+            ,OUString(PROPERTY_UNVISITEDCHARSTYLENAME)
+            ,OUString(PROPERTY_CHARKERNING)
+            ,OUString(PROPERTY_MASTERFIELDS)
+            ,OUString(PROPERTY_DETAILFIELDS)
+            ,OUString(PROPERTY_PARAADJUST)
+            , OUString(PROPERTY_CHAREMPHASISASIAN)
+            , OUString(PROPERTY_CHARFONTNAMEASIAN)
+            , OUString(PROPERTY_CHARFONTSTYLENAMEASIAN)
+            , OUString(PROPERTY_CHARFONTFAMILYASIAN)
+            , OUString(PROPERTY_CHARFONTCHARSETASIAN)
+            , OUString(PROPERTY_CHARFONTPITCHASIAN)
+            , OUString(PROPERTY_CHARHEIGHTASIAN)
+            , OUString(PROPERTY_CHARUNDERLINEASIAN)
+            , OUString(PROPERTY_CHARWEIGHTASIAN)
+            , OUString(PROPERTY_CHARPOSTUREASIAN)
+            , OUString(PROPERTY_CHARWORDMODEASIAN)
+            , OUString(PROPERTY_CHARROTATIONASIAN)
+            , OUString(PROPERTY_CHARSCALEWIDTHASIAN)
+            , OUString(PROPERTY_CHARLOCALEASIAN)
+            , OUString(PROPERTY_CHAREMPHASISCOMPLEX)
+            , OUString(PROPERTY_CHARFONTNAMECOMPLEX)
+            , OUString(PROPERTY_CHARFONTSTYLENAMECOMPLEX)
+            , OUString(PROPERTY_CHARFONTFAMILYCOMPLEX)
+            , OUString(PROPERTY_CHARFONTCHARSETCOMPLEX)
+            , OUString(PROPERTY_CHARFONTPITCHCOMPLEX)
+            , OUString(PROPERTY_CHARHEIGHTCOMPLEX)
+            , OUString(PROPERTY_CHARUNDERLINECOMPLEX)
+            , OUString(PROPERTY_CHARWEIGHTCOMPLEX)
+            , OUString(PROPERTY_CHARPOSTURECOMPLEX)
+            , OUString(PROPERTY_CHARWORDMODECOMPLEX)
+            , OUString(PROPERTY_CHARROTATIONCOMPLEX)
+            , OUString(PROPERTY_CHARSCALEWIDTHCOMPLEX)
+            , OUString(PROPERTY_CHARLOCALECOMPLEX)
 
     };
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 931e1ecbc40f..e7d760b7f81c 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -48,8 +48,8 @@ DBG_NAME( rpt_OSection )
 uno::Sequence< OUString> lcl_getGroupAbsent()
 {
     OUString pProps[] = {
-                PROPERTY_CANGROW
-                ,PROPERTY_CANSHRINK
+                OUString(PROPERTY_CANGROW)
+                ,OUString(PROPERTY_CANSHRINK)
         };
 
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
@@ -61,20 +61,20 @@ uno::Sequence< OUString> lcl_getAbsent(bool _bPageSection)
     if ( _bPageSection )
     {
         OUString pProps[] = {
-                PROPERTY_FORCENEWPAGE
-                ,PROPERTY_NEWROWORCOL
-                ,PROPERTY_KEEPTOGETHER
-                ,PROPERTY_CANGROW
-                ,PROPERTY_CANSHRINK
-                ,PROPERTY_REPEATSECTION
+                OUString(PROPERTY_FORCENEWPAGE)
+                ,OUString(PROPERTY_NEWROWORCOL)
+                ,OUString(PROPERTY_KEEPTOGETHER)
+                ,OUString(PROPERTY_CANGROW)
+                ,OUString(PROPERTY_CANSHRINK)
+                ,OUString(PROPERTY_REPEATSECTION)
         };
         return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
     }
 
     OUString pProps[] = {
-                PROPERTY_CANGROW
-                ,PROPERTY_CANSHRINK
-                ,PROPERTY_REPEATSECTION
+                OUString(PROPERTY_CANGROW)
+                ,OUString(PROPERTY_CANSHRINK)
+                ,OUString(PROPERTY_REPEATSECTION)
         };
 
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index bd8295b6088c..f801c36493e3 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -44,9 +44,9 @@ namespace reportdesign
 uno::Sequence< OUString > lcl_getShapeOptionals()
 {
     OUString pProps[] = {
-        PROPERTY_DATAFIELD
-        ,PROPERTY_CONTROLBACKGROUND
-        ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
+        OUString(PROPERTY_DATAFIELD)
+        ,OUString(PROPERTY_CONTROLBACKGROUND)
+        ,OUString(PROPERTY_CONTROLBACKGROUNDTRANSPARENT)
     };
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 42abfe421be1..0c5908947c09 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -32,7 +32,6 @@ namespace rptui
 //........................................................................
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
-    using namespace reportdesign;
 
 DBG_NAME( rpt_OPropertyMediator )
 OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 43600f3dfa59..9553291b1127 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -134,7 +134,7 @@ SvxNumType OReportModel::GetPageNumType() const
 {
     uno::Reference< report::XReportDefinition > xReportDefinition( getReportDefinition() );
     if ( xReportDefinition.is() )
-        return (SvxNumType)getStyleProperty<sal_Int16>(xReportDefinition,reportdesign::PROPERTY_NUMBERINGTYPE);
+        return (SvxNumType)getStyleProperty<sal_Int16>(xReportDefinition,PROPERTY_NUMBERINGTYPE);
     return SVX_ARABIC;
 }
 
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 43dc1817d423..280f3dec7138 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -179,7 +179,7 @@ namespace
         virtual ::com::sun::star::uno::Any operator() (const OUString& _sPropertyName,const ::com::sun::star::uno::Any& lhs) const
         {
             uno::Any aRet;
-            if (_sPropertyName.equalsAsciiL(PROPERTY_PARAADJUST.ascii, PROPERTY_PARAADJUST.length))
+            if (_sPropertyName == PROPERTY_PARAADJUST)
             {
                 sal_Int16 nTextAlign = 0;
                 lhs >>= nTextAlign;
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index ddc053a87591..c2ca586864e1 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -133,8 +133,8 @@ void OXMLRowColumn::fillStyle(const OUString& _sStyleName)
             PropertySetInfo* pInfo = new PropertySetInfo();
             static PropertyMapEntry pMap[] =
             {
-                {PROPERTY_WIDTH.ascii,  static_cast<sal_uInt16>(PROPERTY_WIDTH.length),     PROPERTY_ID_WIDTH,          &::getCppuType(static_cast< sal_Int32* >( NULL ))       ,PropertyAttribute::BOUND,0},
-                {PROPERTY_HEIGHT.ascii, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length),    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);
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 8cfd55e11cd0..75c142706be7 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -104,11 +104,10 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
     return pHandler;
 }
 // -----------------------------------------------------------------------------
-#define MAP_CONST_T( name, prefix, token, type, context )  { name.ascii, name.length,   XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,      context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_P( name, prefix, token, type, context )  { name.ascii, name.length,   XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH,  context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_T_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,      context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_P_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH,  context, SvtSaveOptions::ODFVER_010 }
 #define MAP_CONST_S( name, prefix, token, type, context )  { name, sizeof(name)-1,      XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION,    context, SvtSaveOptions::ODFVER_010 }
 #define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_C( name, prefix, token, type, context )  { name.ascii, name.length,         XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 }
 #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010}
 // -----------------------------------------------------------------------------
 UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat)
@@ -117,16 +116,16 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _
     {
         static const XMLPropertyMapEntry s_aXMLCellStylesProperties[] =
         {
-            MAP_CONST_C(      PROPERTY_FORMATKEY,      STYLE,     DATA_STYLE_NAME,        XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ),
+            MAP_CONST_C_ASCII(      PROPERTY_FORMATKEY,      STYLE,     DATA_STYLE_NAME,        XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ),
 
-            MAP_CONST_C(      PROPERTY_CONTROLBACKGROUND,
+            MAP_CONST_C_ASCII(      PROPERTY_CONTROLBACKGROUND,
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
-            MAP_CONST_C(      PROPERTY_VERTICALALIGN,   STYLE,    VERTICAL_ALIGN,       XML_RPT_ALGINMENT, 0 ),
-            MAP_CONST_C(      PROPERTY_CONTROLBACKGROUNDTRANSPARENT,
+            MAP_CONST_C_ASCII(      PROPERTY_VERTICALALIGN,   STYLE,    VERTICAL_ALIGN,       XML_RPT_ALGINMENT, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_CONTROLBACKGROUNDTRANSPARENT,
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
-            MAP_CONST_P(      PROPERTY_CONTROLBACKGROUND,
+            MAP_CONST_P_ASCII(      PROPERTY_CONTROLBACKGROUND,
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
-            MAP_CONST_P(      PROPERTY_CONTROLBACKGROUNDTRANSPARENT,
+            MAP_CONST_P_ASCII(      PROPERTY_CONTROLBACKGROUNDTRANSPARENT,
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
             MAP_CONST_C_ASCII(      "BorderLeft",       FO,     BORDER_LEFT,           XML_TYPE_BORDER, 0 ),
             MAP_CONST_C_ASCII(      "BorderRight",      FO,     BORDER_RIGHT,          XML_TYPE_BORDER, 0 ),
@@ -140,13 +139,13 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _
     {
         static const XMLPropertyMapEntry s_aXMLCellStylesProperties[] =
         {
-            MAP_CONST_C(      PROPERTY_FORMATKEY,      STYLE,     DATA_STYLE_NAME,        XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ),
+            MAP_CONST_C_ASCII(      PROPERTY_FORMATKEY,      STYLE,     DATA_STYLE_NAME,        XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ),
 
-            MAP_CONST_C(      PROPERTY_CONTROLBACKGROUND,
+            MAP_CONST_C_ASCII(      PROPERTY_CONTROLBACKGROUND,
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
-            MAP_CONST_C(      PROPERTY_CONTROLBACKGROUNDTRANSPARENT,
+            MAP_CONST_C_ASCII(      PROPERTY_CONTROLBACKGROUNDTRANSPARENT,
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
-            MAP_CONST_C(      PROPERTY_VERTICALALIGN,
+            MAP_CONST_C_ASCII(      PROPERTY_VERTICALALIGN,
                                                 STYLE,    VERTICAL_ALIGN,       XML_RPT_ALGINMENT, 0 ),
             MAP_CONST_C_ASCII(      "BorderLeft",       FO,     BORDER_LEFT,           XML_TYPE_BORDER, 0 ),
             MAP_CONST_C_ASCII(      "BorderRight",      FO,     BORDER_RIGHT,          XML_TYPE_BORDER, 0 ),
@@ -162,8 +161,8 @@ const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps()
 {
     static const XMLPropertyMapEntry aXMLTableStylesProperties[] =
     {
-        MAP_CONST_T(  PROPERTY_BACKCOLOR,      FO,     BACKGROUND_COLOR,        XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
-        MAP_CONST_T(  PROPERTY_BACKTRANSPARENT,FO,     BACKGROUND_COLOR,        XML_TYPE_ISTRANSPARENT | MID_FLAG_MERGE_ATTRIBUTE, 0 ),
+        MAP_CONST_T_ASCII(  PROPERTY_BACKCOLOR,      FO,     BACKGROUND_COLOR,        XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
+        MAP_CONST_T_ASCII(  PROPERTY_BACKTRANSPARENT,FO,     BACKGROUND_COLOR,        XML_TYPE_ISTRANSPARENT | MID_FLAG_MERGE_ATTRIBUTE, 0 ),
         MAP_END()
     };
     return aXMLTableStylesProperties;
@@ -261,22 +260,22 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,
         ::com::sun::star::awt::FontDescriptor aFont;
         static comphelper::PropertyMapEntry pMap[] =
         {
-            {PROPERTY_FONTNAME.ascii,         static_cast<sal_uInt16>(PROPERTY_FONTNAME.length),          PROPERTY_ID_FONTNAME,           &::getCppuType(&aFont.Name)         ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARFONTHEIGHT.ascii,   static_cast<sal_uInt16>(PROPERTY_CHARFONTHEIGHT.length),    PROPERTY_ID_FONTHEIGHT,         &::getCppuType(&aFont.Height)       ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTWIDTH.ascii,        static_cast<sal_uInt16>(PROPERTY_FONTWIDTH.length),         PROPERTY_ID_FONTWIDTH,          &::getCppuType(&aFont.Width)        ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTSTYLENAME.ascii,    static_cast<sal_uInt16>(PROPERTY_FONTSTYLENAME.length),     PROPERTY_ID_FONTSTYLENAME,      &::getCppuType(&aFont.StyleName)    ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTFAMILY.ascii,       static_cast<sal_uInt16>(PROPERTY_FONTFAMILY.length),        PROPERTY_ID_FONTFAMILY,         &::getCppuType(&aFont.Family)       ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTCHARSET.ascii,      static_cast<sal_uInt16>(PROPERTY_FONTCHARSET.length),       PROPERTY_ID_FONTCHARSET,        &::getCppuType(&aFont.CharSet)      ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTPITCH.ascii,        static_cast<sal_uInt16>(PROPERTY_FONTPITCH.length),         PROPERTY_ID_FONTPITCH,          &::getCppuType(&aFont.Pitch)        ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTCHARWIDTH.ascii,    static_cast<sal_uInt16>(PROPERTY_FONTCHARWIDTH.length),     PROPERTY_ID_FONTCHARWIDTH,      &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTWEIGHT.ascii,       static_cast<sal_uInt16>(PROPERTY_FONTWEIGHT.length),        PROPERTY_ID_FONTWEIGHT,         &::getCppuType(&aFont.Weight)       ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARPOSTURE.ascii,      static_cast<sal_uInt16>(PROPERTY_CHARPOSTURE.length),       PROPERTY_ID_FONTSLANT,          &::getCppuType(&aFont.Slant)        ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTUNDERLINE.ascii,    static_cast<sal_uInt16>(PROPERTY_FONTUNDERLINE.length),     PROPERTY_ID_FONTUNDERLINE,      &::getCppuType(&aFont.Underline)    ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARSTRIKEOUT.ascii,    static_cast<sal_uInt16>(PROPERTY_CHARSTRIKEOUT.length),     PROPERTY_ID_FONTSTRIKEOUT,      &::getCppuType(&aFont.Strikeout)    ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTORIENTATION.ascii,  static_cast<sal_uInt16>(PROPERTY_FONTORIENTATION.length),   PROPERTY_ID_FONTORIENTATION,    &::getCppuType(&aFont.Orientation)  ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTKERNING.ascii,      static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length),       PROPERTY_ID_FONTKERNING,        &::getCppuType(&aFont.Kerning)      ,PropertyAttribute::BOUND,0},
-            {PROPERTY_CHARWORDMODE.ascii,     static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length),      PROPERTY_ID_FONTWORDLINEMODE,   &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0},
-            {PROPERTY_FONTTYPE.ascii,         static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length),          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
@@ -324,10 +323,10 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet()
 {
     static comphelper::PropertyMapEntry pMap[] =
     {
-        {PROPERTY_BORDERLEFT.ascii,   static_cast<sal_uInt16>(PROPERTY_BORDERLEFT.length),        0,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
-        {PROPERTY_BORDERRIGHT.ascii,  static_cast<sal_uInt16>(PROPERTY_BORDERRIGHT.length),       1,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
-        {PROPERTY_BORDERTOP.ascii,    static_cast<sal_uInt16>(PROPERTY_BORDERTOP.length),         2,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
-        {PROPERTY_BORDERBOTTOM.ascii, static_cast<sal_uInt16>(PROPERTY_BORDERBOTTOM.length),      3,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
+        {PROPERTY_BORDERLEFT,   static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERLEFT)-1),        0,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
+        {PROPERTY_BORDERRIGHT,  static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERRIGHT)-1),       1,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
+        {PROPERTY_BORDERTOP,    static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERTOP)-1),         2,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
+        {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERBOTTOM)-1),      3,          &::getCppuType((const table::BorderLine*)0)         ,PropertyAttribute::BOUND,0},
         { NULL, 0, 0, NULL, 0, 0 }
     };
     return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
diff --git a/reportdesign/source/inc/constasciistring.hxx b/reportdesign/source/inc/constasciistring.hxx
deleted file mode 100644
index a7e5497a5be0..000000000000
--- a/reportdesign/source/inc/constasciistring.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _RPTSHARED_CONSTASCIISTRING_HXX_
-#define _RPTSHARED_CONSTASCIISTRING_HXX_
-
-#ifndef CONSTASCII_INCLUDED_INDIRECT
-#error "don't include this file directly! use stringconstants.hrc instead!"
-#endif
-
-// no namespaces. This file is included from several other files _within_ a namespace.
-
-//============================================================
-
-#define DECLARE_CONSTASCII_USTRING( name ) \
-    extern const ConstAsciiString name
-
-#define IMPLEMENT_CONSTASCII_USTRING( name, string ) \
-    const ConstAsciiString name = {RTL_CONSTASCII_STRINGPARAM(string)}
-
-#endif // _RPTSHARED_CONSTASCIISTRING_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/corestrings.hrc b/reportdesign/source/inc/corestrings.hrc
index 675f61a8fa76..2d5505b2afea 100644
--- a/reportdesign/source/inc/corestrings.hrc
+++ b/reportdesign/source/inc/corestrings.hrc
@@ -20,15 +20,10 @@
 #define REPORTDESIGN_SHARED_CORESTRINGS_HRC
 
 #include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-using comphelper::string::ConstAsciiString;
 
-namespace reportdesign
-{
 #define STRINGCONSTANTS_INCLUDED_INDIRECT
 #include "stringconstants.hrc"
 #undef STRINGCONSTANTS_INCLUDED_INDIRECT
-}
 
 #endif // REPORTDESIGN_SHARED_CORESTRINGS_HRC
 
diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc
index ef32cd0e8ea0..14e15c50b7ed 100644
--- a/reportdesign/source/inc/stringconstants.hrc
+++ b/reportdesign/source/inc/stringconstants.hrc
@@ -24,257 +24,248 @@
 #error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
 #endif
 
-#define CONSTASCII_INCLUDED_INDIRECT
-#include "constasciistring.hxx"
-#undef CONSTASCII_INCLUDED_INDIRECT
-
 //============================================================
 //= service names
 //============================================================
 
-DECLARE_CONSTASCII_USTRING(SERVICE_FIXEDTEXT);
-DECLARE_CONSTASCII_USTRING(SERVICE_FIXEDLINE);
-DECLARE_CONSTASCII_USTRING(SERVICE_FORMATTEDFIELD);
-DECLARE_CONSTASCII_USTRING(SERVICE_IMAGECONTROL);
-DECLARE_CONSTASCII_USTRING(SERVICE_FORMATCONDITION);
-DECLARE_CONSTASCII_USTRING(SERVICE_FUNCTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_REPORTDEFINITION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SHAPE);
-DECLARE_CONSTASCII_USTRING(SERVICE_SECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_GROUP);
-DECLARE_CONSTASCII_USTRING(SERVICE_OLEOBJECT);
+#define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText"
+#define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField"
+#define SERVICE_IMAGECONTROL "com.sun.star.report.ImageControl"
+#define SERVICE_FORMATCONDITION "com.sun.star.report.FormatCondition"
+#define SERVICE_FUNCTION "com.sun.star.report.Function"
+#define SERVICE_REPORTDEFINITION "com.sun.star.report.ReportDefinition"
+#define SERVICE_SHAPE "com.sun.star.report.Shape"
+#define SERVICE_FIXEDLINE "com.sun.star.report.FixedLine"
+#define SERVICE_SECTION "com.sun.star.report.Section"
+#define SERVICE_GROUP "com.sun.star.report.Group"
+#define SERVICE_OLEOBJECT "com.sun.star.report.OleObject"
 //============================================================
 //= property names
 //============================================================
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_VISIBLE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_NAME            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_HEIGHT          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKCOLOR       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CANGROW         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CANSHRINK       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPEATSECTION   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION);
-
-DECLARE_CONSTASCII_USTRING(PROPERTY_HEADER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EXPRESSION      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPON         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SORTASCENDING   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPS          );
-
-DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADER        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DETAIL              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CAPTION             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ORIENTATION         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERSIZE           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_HEADERON            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTERON            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONX           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONY           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATAFIELD           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PARAADJUST              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARRELIEF          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOLOR           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEURL            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL      );
+#define PROPERTY_VISIBLE "Visible"
+#define PROPERTY_NAME "Name"
+#define PROPERTY_HEIGHT "Height"
+#define PROPERTY_BACKCOLOR "BackColor"
+#define PROPERTY_BACKTRANSPARENT "BackTransparent"
+#define PROPERTY_CONTROLBACKGROUND "ControlBackground"
+#define PROPERTY_CONTROLBACKGROUNDTRANSPARENT "ControlBackgroundTransparent"
+#define PROPERTY_FORCENEWPAGE "ForceNewPage"
+#define PROPERTY_NEWROWORCOL "NewRowOrCol"
+#define PROPERTY_KEEPTOGETHER "KeepTogether"
+#define PROPERTY_CANGROW "CanGrow"
+#define PROPERTY_CANSHRINK "CanShrink"
+#define PROPERTY_REPEATSECTION "RepeatSection"
+#define PROPERTY_GROUP "Group"
+#define PROPERTY_REPORTDEFINITION "ReportDefinition"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TOPMARGIN           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN        );
+#define PROPERTY_HEADER "Header"
+#define PROPERTY_FOOTER "Footer"
+#define PROPERTY_GROUPINTERVAL "GroupInterval"
+#define PROPERTY_EXPRESSION "Expression"
+#define PROPERTY_GROUPON "GroupOn"
+#define PROPERTY_SORTASCENDING "SortAscending"
+#define PROPERTY_GROUPS "Groups"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWPAGE            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_MINHEIGHTNEWPAGE        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SHAPE                   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_STATE   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TIME_STATE  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_STATE  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARSET);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTFAMILY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTHEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTKERNING);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTNAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTPITCH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTSLANT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSTRIKEOUT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWIDTH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTTYPE);
+#define PROPERTY_MASTERFIELDS "MasterFields"
+#define PROPERTY_DETAILFIELDS "DetailFields"
+#define PROPERTY_REPORTHEADER "ReportHeader"
+#define PROPERTY_REPORTFOOTER "ReportFooter"
+#define PROPERTY_PAGEHEADER "PageHeader"
+#define PROPERTY_PAGEFOOTER "PageFooter"
+#define PROPERTY_DETAIL "Detail"
+#define PROPERTY_CAPTION "Caption"
+#define PROPERTY_BACKGRAPHICURL "BackGraphicURL"
+#define PROPERTY_COMMAND "Command"
+#define PROPERTY_BACKGRAPHICLOCATION "BackGraphicLocation"
+#define PROPERTY_ORIENTATION "Orientation"
+#define PROPERTY_PAPERFORMAT "PaperFormat"
+#define PROPERTY_PAPERSIZE "Size"
+#define PROPERTY_GROUPKEEPTOGETHER "GroupKeepTogether"
+#define PROPERTY_PAGEHEADEROPTION "PageHeaderOption"
+#define PROPERTY_PAGEFOOTEROPTION "PageFooterOption"
+#define PROPERTY_COMMANDTYPE "CommandType"
+#define PROPERTY_REPORTHEADERON "ReportHeaderOn"
+#define PROPERTY_REPORTFOOTERON "ReportFooterOn"
+#define PROPERTY_PAGEHEADERON "PageHeaderOn"
+#define PROPERTY_PAGEFOOTERON "PageFooterOn"
+#define PROPERTY_HEADERON "HeaderOn"
+#define PROPERTY_FOOTERON "FooterOn"
+#define PROPERTY_WIDTH "Width"
+#define PROPERTY_POSITIONX "PositionX"
+#define PROPERTY_POSITIONY "PositionY"
+#define PROPERTY_DATAFIELD "DataField"
+#define PROPERTY_PARAADJUST "ParaAdjust"
+#define PROPERTY_FONTDESCRIPTOR "FontDescriptor"
+#define PROPERTY_FONTDESCRIPTORASIAN "FontDescriptorAsian"
+#define PROPERTY_FONTDESCRIPTORCOMPLEX "FontDescriptorComplex"
+#define PROPERTY_CONTROLTEXTEMPHASISMARK "ControlTextEmphasis"
+#define PROPERTY_CHARRELIEF "CharRelief"
+#define PROPERTY_CHARCOLOR "CharColor"
+#define PROPERTY_VERTICALALIGN "VerticalAlign"
+#define PROPERTY_IMAGEPOSITION "ImagePosition"
+#define PROPERTY_IMAGEURL "ImageURL"
+#define PROPERTY_CHARUNDERLINECOLOR "CharUnderlineColor"
+#define PROPERTY_LABEL "Label"
+#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault"
+#define PROPERTY_EFFECTIVEMAX "EffectiveMax"
+#define PROPERTY_EFFECTIVEMIN "EffectiveMin"
+#define PROPERTY_FORMATKEY "FormatKey"
+#define PROPERTY_MAXTEXTLEN "MaxTextLen"
+#define PROPERTY_LISTSOURCE "ListSource"
+#define PROPERTY_FORMATSSUPPLIER "FormatsSupplier"
+#define PROPERTY_CONTROLBORDER "ControlBorder"
+#define PROPERTY_CONTROLBORDERCOLOR "ControlBorderColor"
+#define PROPERTY_BORDER "Border"
+#define PROPERTY_BORDERCOLOR "BorderColor"
+#define PROPERTY_DEFAULTCONTROL "DefaultControl"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED     );
+#define PROPERTY_LEFTMARGIN "LeftMargin"
+#define PROPERTY_RIGHTMARGIN "RightMargin"
+#define PROPERTY_TOPMARGIN "TopMargin"
+#define PROPERTY_BOTTOMMARGIN "BottomMargin"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATION        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH      );
+#define PROPERTY_PRINTREPEATEDVALUES "PrintRepeatedValues"
+#define PROPERTY_CONDITIONALPRINTEXPRESSION "ConditionalPrintExpression"
+#define PROPERTY_STARTNEWCOLUMN "StartNewColumn"
+#define PROPERTY_RESETPAGENUMBER "ResetPageNumber"
+#define PROPERTY_SHAPE "Shape"
+#define PROPERTY_PRINTWHENGROUPCHANGE "PrintWhenGroupChange"
+#define PROPERTY_STATE "State"
+#define PROPERTY_TIME_STATE "TimeState"
+#define PROPERTY_DATE_STATE "DateState"
+#define PROPERTY_TRISTATE "TriState"
+#define PROPERTY_LISTSOURCETYPE "ListSourceType"
+#define PROPERTY_FONTCHARWIDTH    "FontCharWidth"
+#define PROPERTY_FONTCHARSET      "CharFontCharSet"
+#define PROPERTY_FONTFAMILY       "CharFontFamily"
+#define PROPERTY_CHARFONTHEIGHT   "CharHeight"
+#define PROPERTY_FONTHEIGHT       "FontHeight"
+#define PROPERTY_FONTKERNING      "FontKerning"
+#define PROPERTY_FONT             "FontDescriptor"
+#define PROPERTY_FONTNAME         "FontName"
+#define PROPERTY_FONTORIENTATION  "CharRotation"
+#define PROPERTY_FONTPITCH        "CharFontPitch"
+#define PROPERTY_FONTSLANT        "FontSlant"
+#define PROPERTY_CHARSTRIKEOUT    "CharStrikeout"
+#define PROPERTY_FONTSTRIKEOUT    "FontStrikeout"
+#define PROPERTY_FONTSTYLENAME    "CharFontStyleName"
+#define PROPERTY_FONTUNDERLINE    "CharUnderline"
+#define PROPERTY_FONTWEIGHT       "CharWeight"
+#define PROPERTY_FONTWIDTH        "FontWidth"
+#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode"
+#define PROPERTY_FONTTYPE         "FontType"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMEASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINEASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTUREASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODEASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATIONASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHASIAN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARLOCALEASIAN);
+#define PROPERTY_ENABLED       "Enabled"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMECOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMECOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURECOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODECOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARLOCALECOMPLEX   );
+#define PROPERTY_CHAREMPHASIS     "CharEmphasis"
+#define PROPERTY_CHARFONTNAME     "CharFontName"
+#define PROPERTY_CHARFONTSTYLENAME "CharFontStyleName"
+#define PROPERTY_CHARFONTFAMILY   "CharFontFamily"
+#define PROPERTY_CHARFONTCHARSET  "CharFontCharSet"
+#define PROPERTY_CHARFONTPITCH    "CharFontPitch"
+#define PROPERTY_CHARHEIGHT       "CharHeight"
+#define PROPERTY_CHARUNDERLINE    "CharUnderline"
+#define PROPERTY_CHARWEIGHT       "CharWeight"
+#define PROPERTY_CHARPOSTURE      "CharPosture"
+#define PROPERTY_CHARWORDMODE     "CharWordMode"
+#define PROPERTY_CHARROTATION     "CharRotation"
+#define PROPERTY_CHARSCALEWIDTH   "CharScaleWidth"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SECTION             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING    );
+// Asian
+#define PROPERTY_CHAREMPHASISASIAN        "CharEmphasisAsian"
+#define PROPERTY_CHARFONTNAMEASIAN        "CharFontNameAsian"
+#define PROPERTY_CHARFONTSTYLENAMEASIAN   "CharFontStyleNameAsian"
+#define PROPERTY_CHARFONTFAMILYASIAN      "CharFontFamilyAsian"
+#define PROPERTY_CHARFONTCHARSETASIAN     "CharFontCharSetAsian"
+#define PROPERTY_CHARFONTPITCHASIAN       "CharFontPitchAsian"
+#define PROPERTY_CHARHEIGHTASIAN          "CharHeightAsian"
+#define PROPERTY_CHARUNDERLINEASIAN       "CharUnderlineAsian"
+#define PROPERTY_CHARWEIGHTASIAN          "CharWeightAsian"
+#define PROPERTY_CHARPOSTUREASIAN         "CharPostureAsian"
+#define PROPERTY_CHARWORDMODEASIAN        "CharWordModeAsian"
+#define PROPERTY_CHARROTATIONASIAN        "CharRotationAsian"
+#define PROPERTY_CHARSCALEWIDTHASIAN      "CharScaleWidthAsian"
+#define PROPERTY_CHARLOCALEASIAN           "CharLocaleAsian"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_MIMETYPE            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT                );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ZORDER              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_OPAQUE              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY );
+// Complex
+#define PROPERTY_CHAREMPHASISCOMPLEX      "CharEmphasisComplex"
+#define PROPERTY_CHARFONTNAMECOMPLEX      "CharFontNameComplex"
+#define PROPERTY_CHARFONTSTYLENAMECOMPLEX "CharFontStyleNameComplex"
+#define PROPERTY_CHARFONTFAMILYCOMPLEX    "CharFontFamilyComplex"
+#define PROPERTY_CHARFONTCHARSETCOMPLEX   "CharFontCharSetComplex"
+#define PROPERTY_CHARFONTPITCHCOMPLEX     "CharFontPitchComplex"
+#define PROPERTY_CHARHEIGHTCOMPLEX        "CharHeightComplex"
+#define PROPERTY_CHARUNDERLINECOMPLEX     "CharUnderlineComplex"
+#define PROPERTY_CHARWEIGHTCOMPLEX        "CharWeightComplex"
+#define PROPERTY_CHARPOSTURECOMPLEX       "CharPostureComplex"
+#define PROPERTY_CHARWORDMODECOMPLEX      "CharWordModeComplex"
+#define PROPERTY_CHARROTATIONCOMPLEX      "CharRotationComplex"
+#define PROPERTY_CHARSCALEWIDTHCOMPLEX    "CharScaleWidthComplex"
+#define PROPERTY_CHARLOCALECOMPLEX        "CharLocaleComplex"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE                );
+#define PROPERTY_STATUSINDICATOR  "StatusIndicator"
+#define PROPERTY_SECTION          "Section"
+#define PROPERTY_FILTER           "Filter"
+#define PROPERTY_ESCAPEPROCESSING "EscapeProcessing"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRESERVEIRI         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SCALEMODE           );
+#define PROPERTY_MULTILINE        "MultiLine"
+#define PROPERTY_ACTIVECONNECTION "ActiveConnection"
+#define PROPERTY_DATASOURCENAME   "DataSourceName"
+#define PROPERTY_FORMULA          "Formula"
+#define PROPERTY_INITIALFORMULA   "InitialFormula"
+#define PROPERTY_PREEVALUATED     "PreEvaluated"
+#define PROPERTY_DEEPTRAVERSING   "DeepTraversing"
+#define PROPERTY_MIMETYPE         "MimeType"
+#define PROPERTY_BACKGROUNDCOLOR  "BackgroundColor"
+#define PROPERTY_TEXT             "Text"
+#define PROPERTY_TEXTCOLOR        "TextColor"
+#define PROPERTY_TEXTLINECOLOR   "TextLineColor"
+#define PROPERTY_FONTRELIEF   "FontRelief"
+#define PROPERTY_FONTEMPHASISMARK "FontEmphasisMark"
+#define PROPERTY_ZORDER           "ZOrder"
+#define PROPERTY_OPAQUE           "Opaque"
+#define PROPERTY_TRANSFORMATION    "Transformation"
+#define PROPERTY_CUSTOMSHAPEENGINE "CustomShapeEngine"
+#define PROPERTY_CUSTOMSHAPEDATA   "CustomShapeData"
+#define PROPERTY_CUSTOMSHAPEGEOMETRY "CustomShapeGeometry"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINESTYLE           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINEDASH            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINETRANSPARENCE    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINEWIDTH           );
+#define PROPERTY_NUMBERINGTYPE     "NumberingType"
+#define PROPERTY_PAGESTYLELAYOUT   "PageStyleLayout"
+#define PROPERTY_ISLANDSCAPE       "IsLandscape"
+#define PROPERTY_ALIGN "Align"
+#define PROPERTY_TYPE  "Type"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFLASH           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARESCAPEMENTHEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARLOCALE          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARESCAPEMENT      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCASEMAP         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOMBINEISON     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOMBINEPREFIX   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOMBINESUFFIX   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHIDDEN          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSHADOWED        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCONTOURED       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_HYPERLINKURL        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_HYPERLINKTARGET     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_HYPERLINKNAME       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_VISITEDCHARSTYLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_UNVISITEDCHARSTYLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARKERNING         );
+#define PROPERTY_PRESERVEIRI  "PreserveIRI"
+#define PROPERTY_SCALEMODE  "ScaleMode"
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_ORDER               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_APPLYFILTER         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_MAXROWS             );
+#define PROPERTY_LINESTYLE  "LineStyle"
+#define PROPERTY_LINEDASH  "LineDash"
+#define PROPERTY_LINECOLOR  "LineColor"
+#define PROPERTY_LINETRANSPARENCE  "LineTransparence"
+#define PROPERTY_LINEWIDTH  "LineWidth"
 
-//============================================================
-//= service names
-//============================================================
+#define PROPERTY_CHARFLASH            "CharFlash"
+#define PROPERTY_CHARESCAPEMENTHEIGHT "CharEscapementHeight"
+#define PROPERTY_CHARLOCALE           "CharLocale"
+#define PROPERTY_CHARESCAPEMENT       "CharEscapement"
+#define PROPERTY_CHARCASEMAP          "CharCaseMap"
+#define PROPERTY_CHARCOMBINEISON      "CharCombineIsOn"
+#define PROPERTY_CHARCOMBINEPREFIX    "CharCombinePrefix"
+#define PROPERTY_CHARCOMBINESUFFIX    "CharCombineSuffix"
+#define PROPERTY_CHARHIDDEN           "CharHidden"
+#define PROPERTY_CHARSHADOWED         "CharShadowed"
+#define PROPERTY_CHARCONTOURED        "CharContoured"
+#define PROPERTY_CHARAUTOKERNING      "CharAutoKerning"
+#define PROPERTY_CHARKERNING          "CharKerning"
+#define PROPERTY_HYPERLINKURL "HyperLinkURL"
+#define PROPERTY_HYPERLINKTARGET "HyperLinkTarget"
+#define PROPERTY_HYPERLINKNAME "HyperLinkName"
+#define PROPERTY_VISITEDCHARSTYLENAME "VisitedCharStyleName"
+#define PROPERTY_UNVISITEDCHARSTYLENAME "UnvisitedCharStyleName"
+#define PROPERTY_ORDER                "Order"
+#define PROPERTY_APPLYFILTER          "ApplyFilter"
+#define PROPERTY_MAXROWS              "MaxRows"
 #endif // _REPORTDESIGN_STRINGCONSTANTS_HRC_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc
index efd960a03c16..84982b7aa7d9 100644
--- a/reportdesign/source/inc/uistrings.hrc
+++ b/reportdesign/source/inc/uistrings.hrc
@@ -20,51 +20,44 @@
 #define REPORTDESIGN_SHARED_UISTRINGS_HRC
 
 #include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-using comphelper::string::ConstAsciiString;
 
-namespace rptui
-{
 #define STRINGCONSTANTS_INCLUDED_INDIRECT
 #include "stringconstants.hrc"
 #undef STRINGCONSTANTS_INCLUDED_INDIRECT
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTNAME          );
-DECLARE_CONSTASCII_USTRING(CFG_REPORTDESIGNER           );
-DECLARE_CONSTASCII_USTRING(DBREPORTHEADER               );
-DECLARE_CONSTASCII_USTRING(DBREPORTFOOTER               );
-DECLARE_CONSTASCII_USTRING(DBPAGEHEADER                 );
-DECLARE_CONSTASCII_USTRING(DBPAGEFOOTER                 );
-DECLARE_CONSTASCII_USTRING(DBGROUPHEADER                );
-DECLARE_CONSTASCII_USTRING(DBGROUPFOOTER                );
-DECLARE_CONSTASCII_USTRING(DBCOLUMNHEADER               );
-DECLARE_CONSTASCII_USTRING(DBCOLUMNFOOTER               );
-DECLARE_CONSTASCII_USTRING(DBDETAIL                     );
-DECLARE_CONSTASCII_USTRING(REPORTCONTROLFORMAT          );
-DECLARE_CONSTASCII_USTRING(CURRENT_WINDOW               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCOLOR           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_POSITION            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME       );
-DECLARE_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULALIST         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SCOPE               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARTTYPE           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PREVIEW_COUNT       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TITLE               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_AREA                );
-
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILLCOLOR           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILLGRADIENT        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILLGRADIENTNAME    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILLHATCHNAME       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILLBITMAPNAME      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILLSTYLE           );
-DECLARE_CONSTASCII_USTRING(DBTEXTBOXBOUNDCONTENT        );
-
-}
+#define PROPERTY_REPORTNAME "ReportName"
+#define CFG_REPORTDESIGNER "SunReportBuilder"
+#define DBREPORTHEADER "ReportHeader"
+#define DBREPORTFOOTER "ReportFooter"
+#define DBPAGEHEADER "PageHeader"
+#define DBPAGEFOOTER "PageFooter"
+#define DBGROUPHEADER "GroupHeader"
+#define DBGROUPFOOTER "GroupFooter"
+#define DBCOLUMNHEADER "ColumnHeader"
+#define DBCOLUMNFOOTER "ColumnFooter"
+#define DBDETAIL "Detail"
+#define REPORTCONTROLFORMAT "ReportControlFormat"
+#define CURRENT_WINDOW "CurrentWindow"
+#define PROPERTY_FONTCOLOR "FontColor"
+#define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull"
+#define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal"
+#define PROPERTY_POSITION "Position"
+#define PROPERTY_FORMATKEYDATE "FormatKeyDate"
+#define PROPERTY_FORMATKEYTIME "FormatKeyTime"
+#define DBOVERLAPPEDCONTROL "OverlappedControl"
+#define PROPERTY_FORMULALIST "FormulaList"
+#define PROPERTY_SCOPE "Scope"
+#define PROPERTY_CHARTTYPE "ChartType"
+#define PROPERTY_PREVIEW_COUNT "RowLimit"
+#define PROPERTY_TITLE "Title"
+#define PROPERTY_AREA "Area"
+#define PROPERTY_FILLCOLOR "FillColor"
+#define PROPERTY_FILLGRADIENT "FillGradient"
+#define PROPERTY_FILLGRADIENTNAME "FillGradientName"
+#define PROPERTY_FILLHATCHNAME "FillHatchName"
+#define PROPERTY_FILLBITMAPNAME "FillBitmapName"
+#define PROPERTY_FILLSTYLE "FillStyle"
+#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent"
 
 #endif // REPORTDESIGN_SHARED_UISTRINGS_HRC
 
diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc
index 4258733636f2..e711043132c7 100644
--- a/reportdesign/source/inc/xmlstrings.hrc
+++ b/reportdesign/source/inc/xmlstrings.hrc
@@ -20,30 +20,23 @@
 #define REPORTDESIGN_SHARED_XMLSTRINGS_HRC
 
 #include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-using comphelper::string::ConstAsciiString;
 
-namespace rptxml
-{
 #define STRINGCONSTANTS_INCLUDED_INDIRECT
 #include "stringconstants.hrc"
 #undef STRINGCONSTANTS_INCLUDED_INDIRECT
 
-    //============================================================
-    //= XML
-    //============================================================
-    DECLARE_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER);
-    DECLARE_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER);
-    DECLARE_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER);
-    DECLARE_CONSTASCII_USTRING(SERVICE_IMPORTFILTER);
-    DECLARE_CONSTASCII_USTRING(SERVICE_METAIMPORTER);
-
-    DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERLEFT);
-    DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERRIGHT);
-    DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERTOP);
-    DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERBOTTOM);
-    DECLARE_CONSTASCII_USTRING(PROPERTY_OLDFORMAT);
-}
+//============================================================
+//= XML
+//============================================================
+#define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter"
+#define SERVICE_STYLESIMPORTER "com.sun.star.comp.Report.XMLOasisStylesImporter"
+#define SERVICE_CONTENTIMPORTER "com.sun.star.comp.Report.XMLOasisContentImporter"
+#define SERVICE_IMPORTFILTER "com.sun.star.document.ImportFilter"
+#define SERVICE_METAIMPORTER "com.sun.star.comp.Report.XMLOasisMetaImporter"
+#define PROPERTY_BORDERLEFT "BorderLeft"
+#define PROPERTY_BORDERRIGHT "BorderRight"
+#define PROPERTY_BORDERTOP "BorderTop"
+#define PROPERTY_BORDERBOTTOM "BorderBottom"
 
 #endif // REPORTDESIGN_SHARED_XMLSTRINGS_HRC
 
diff --git a/reportdesign/source/shared/corestrings.cxx b/reportdesign/source/shared/corestrings.cxx
deleted file mode 100644
index 7ddccb20fdb9..000000000000
--- a/reportdesign/source/shared/corestrings.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "corestrings.hrc"
-
-namespace reportdesign
-{
-#include "stringconstants.cxx"
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/shared/stringconstants.cxx b/reportdesign/source/shared/stringconstants.cxx
deleted file mode 100644
index c7f4bc584305..000000000000
--- a/reportdesign/source/shared/stringconstants.cxx
+++ /dev/null
@@ -1,268 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "stringconstants.hrc"
-
-//============================================================
-//= service names
-//============================================================
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDTEXT          , "com.sun.star.report.FixedText");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATTEDFIELD     , "com.sun.star.report.FormattedField");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMAGECONTROL       , "com.sun.star.report.ImageControl");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATCONDITION    , "com.sun.star.report.FormatCondition");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_FUNCTION           , "com.sun.star.report.Function");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_REPORTDEFINITION   , "com.sun.star.report.ReportDefinition");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SHAPE              , "com.sun.star.report.Shape");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDLINE          , "com.sun.star.report.FixedLine");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SECTION            , "com.sun.star.report.Section");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_GROUP              , "com.sun.star.report.Group");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_OLEOBJECT          , "com.sun.star.report.OleObject");
-
-//============================================================
-//= property names
-//============================================================
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VISIBLE           , "Visible");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME              , "Name");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEIGHT            , "Height");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKCOLOR         , "BackColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT   , "BackTransparent");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND , "ControlBackground");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT  , "ControlBackgroundTransparent");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE      , "ForceNewPage");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL       , "NewRowOrCol");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER      , "KeepTogether");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANGROW           , "CanGrow");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANSHRINK         , "CanShrink");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPEATSECTION     , "RepeatSection");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP             , "Group");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION  , "ReportDefinition");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADER            , "Header");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTER            , "Footer");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL     , "GroupInterval");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EXPRESSION        , "Expression");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPON           , "GroupOn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SORTASCENDING     , "SortAscending");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPS            , "Groups");
-
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS          , "MasterFields");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS          , "DetailFields");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADER          , "ReportHeader");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER          , "ReportFooter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADER            , "PageHeader");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER            , "PageFooter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAIL                , "Detail");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CAPTION               , "Caption");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL        , "BackGraphicURL");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND               , "Command");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION   , "BackGraphicLocation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIENTATION           , "Orientation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT           , "PaperFormat");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERSIZE             , "Size");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER     , "GroupKeepTogether");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION      , "PageHeaderOption");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION      , "PageFooterOption");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE           , "CommandType");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON        , "ReportHeaderOn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON        , "ReportFooterOn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON          , "PageHeaderOn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON          , "PageFooterOn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADERON              , "HeaderOn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTERON              , "FooterOn");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_WIDTH                 , "Width");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONX             , "PositionX");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONY             , "PositionY");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATAFIELD             , "DataField");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARAADJUST            , "ParaAdjust");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ALIGN                 , "Align");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR        , "FontDescriptor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN   , "FontDescriptorAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORCOMPLEX , "FontDescriptorComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK       , "ControlTextEmphasis");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARRELIEF            , "CharRelief");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOLOR             , "CharColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN         , "VerticalAlign");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION         , "ImagePosition");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEURL              , "ImageURL");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR    , "CharUnderlineColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LABEL                 , "Label");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT      , "EffectiveDefault");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX          , "EffectiveMax");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN          , "EffectiveMin");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEY             , "FormatKey");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN            , "MaxTextLen");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCE            , "ListSource");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER       , "FormatsSupplier");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER         , "ControlBorder");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR    , "ControlBorderColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER                , "Border");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR           , "BorderColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL        , "DefaultControl");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN            , "LeftMargin");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN           , "RightMargin");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TOPMARGIN             , "TopMargin");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN          , "BottomMargin");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES   , "PrintRepeatedValues");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION    , "ConditionalPrintExpression");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHAPE                 , "Shape");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN        , "StartNewColumn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER       , "ResetPageNumber");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE      , "PrintWhenGroupChange");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATE                 , "State");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TIME_STATE            , "TimeState");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATE_STATE            , "DateState");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE              , "TriState");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE        , "ListSourceType");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH,    "FontCharWidth");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET,      "CharFontCharSet");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY,       "CharFontFamily");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTHEIGHT,   "CharHeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT,       "FontHeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING,      "FontKerning");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONT,             "FontDescriptor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME,         "FontName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION,  "CharRotation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH,        "CharFontPitch");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT,        "FontSlant");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSTRIKEOUT,    "CharStrikeout");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT,    "FontStrikeout");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME,    "CharFontStyleName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE,    "CharUnderline");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT,       "CharWeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH,        "FontWidth");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE,         "FontType");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED   ,       "Enabled");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS,     "CharEmphasis");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME,     "CharFontName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME,"CharFontStyleName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY,   "CharFontFamily");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET,  "CharFontCharSet");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH,    "CharFontPitch");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT,       "CharHeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE,    "CharUnderline");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT,       "CharWeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE,      "CharPosture");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE,     "CharWordMode");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATION,     "CharRotation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH,   "CharScaleWidth");
-
-// Asian
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN,        "CharEmphasisAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN,        "CharFontNameAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMEASIAN,   "CharFontStyleNameAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYASIAN,      "CharFontFamilyAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETASIAN,     "CharFontCharSetAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHASIAN,       "CharFontPitchAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTASIAN,          "CharHeightAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINEASIAN,       "CharUnderlineAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTASIAN,          "CharWeightAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTUREASIAN,         "CharPostureAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODEASIAN,        "CharWordModeAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONASIAN,        "CharRotationAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHASIAN,      "CharScaleWidthAsian");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARLOCALEASIAN,           "CharLocaleAsian");
-
-// Complex
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISCOMPLEX,      "CharEmphasisComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMECOMPLEX,      "CharFontNameComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMECOMPLEX, "CharFontStyleNameComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYCOMPLEX,    "CharFontFamilyComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETCOMPLEX,   "CharFontCharSetComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHCOMPLEX,     "CharFontPitchComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTCOMPLEX,        "CharHeightComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOMPLEX,     "CharUnderlineComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTCOMPLEX,        "CharWeightComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURECOMPLEX,       "CharPostureComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODECOMPLEX,      "CharWordModeComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX,      "CharRotationComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX,    "CharScaleWidthComplex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARLOCALECOMPLEX,        "CharLocaleComplex");
-
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR,  "StatusIndicator");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SECTION,          "Section");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER,           "Filter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MULTILINE,        "MultiLine");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING, "EscapeProcessing");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION, "ActiveConnection");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME,   "DataSourceName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULA,          "Formula");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA,   "InitialFormula");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREEVALUATED,     "PreEvaluated");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING,   "DeepTraversing");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MIMETYPE,         "MimeType");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR,  "BackgroundColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXT,             "Text");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR,        "TextColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR ,   "TextLineColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTRELIEF    ,   "FontRelief");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK, "FontEmphasisMark");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ZORDER,           "ZOrder");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_OPAQUE,           "Opaque");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION,    "Transformation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE, "CustomShapeEngine");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA,   "CustomShapeData");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY,"CustomShapeGeometry");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE,     "NumberingType");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT,   "PageStyleLayout");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE,       "IsLandscape");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPE            ,  "Type");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LINESTYLE       ,  "LineStyle");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LINEDASH        ,  "LineDash");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LINECOLOR       ,  "LineColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LINETRANSPARENCE,  "LineTransparence");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LINEWIDTH       ,  "LineWidth");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRESERVEIRI     ,  "PreserveIRI");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCALEMODE       ,  "ScaleMode");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFLASH,            "CharFlash");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARESCAPEMENTHEIGHT, "CharEscapementHeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARLOCALE,           "CharLocale");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARESCAPEMENT,       "CharEscapement");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCASEMAP,          "CharCaseMap");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOMBINEISON,      "CharCombineIsOn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOMBINEPREFIX,    "CharCombinePrefix");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOMBINESUFFIX,    "CharCombineSuffix");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHIDDEN,           "CharHidden");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSHADOWED,         "CharShadowed");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCONTOURED,        "CharContoured");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING,      "CharAutoKerning");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARKERNING,          "CharKerning");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HYPERLINKURL        , "HyperLinkURL");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HYPERLINKTARGET     , "HyperLinkTarget");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HYPERLINKNAME       , "HyperLinkName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VISITEDCHARSTYLENAME, "VisitedCharStyleName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UNVISITEDCHARSTYLENAME, "UnvisitedCharStyleName");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORDER,                "Order");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYFILTER,          "ApplyFilter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXROWS,              "MaxRows");
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/shared/uistrings.cxx b/reportdesign/source/shared/uistrings.cxx
deleted file mode 100644
index ca421a344491..000000000000
--- a/reportdesign/source/shared/uistrings.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "uistrings.hrc"
-
-namespace rptui
-{
-
-#include "stringconstants.cxx"
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME            , "ReportName");
-    IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER             , "SunReportBuilder");
-    IMPLEMENT_CONSTASCII_USTRING(DBREPORTHEADER                 , "ReportHeader");
-    IMPLEMENT_CONSTASCII_USTRING(DBREPORTFOOTER                 , "ReportFooter");
-    IMPLEMENT_CONSTASCII_USTRING(DBPAGEHEADER                   , "PageHeader");
-    IMPLEMENT_CONSTASCII_USTRING(DBPAGEFOOTER                   , "PageFooter");
-    IMPLEMENT_CONSTASCII_USTRING(DBGROUPHEADER                  , "GroupHeader");
-    IMPLEMENT_CONSTASCII_USTRING(DBGROUPFOOTER                  , "GroupFooter");
-    IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNHEADER                 , "ColumnHeader");
-    IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNFOOTER                 , "ColumnFooter");
-    IMPLEMENT_CONSTASCII_USTRING(DBDETAIL                       , "Detail");
-    IMPLEMENT_CONSTASCII_USTRING(REPORTCONTROLFORMAT            , "ReportControlFormat");
-    IMPLEMENT_CONSTASCII_USTRING(CURRENT_WINDOW                 , "CurrentWindow");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCOLOR             , "FontColor");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL         , "ConvertEmptyToNull");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL        , "UseFilterValueProposal");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITION              , "Position");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE         , "FormatKeyDate");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME         , "FormatKeyTime");
-    IMPLEMENT_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL            , "OverlappedControl");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULALIST           , "FormulaList");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCOPE                 , "Scope");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARTTYPE             , "ChartType");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREVIEW_COUNT         , "RowLimit");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TITLE                 , "Title");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_AREA                  , "Area");
-
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLCOLOR             , "FillColor");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLGRADIENT          , "FillGradient");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLGRADIENTNAME      , "FillGradientName");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLHATCHNAME         , "FillHatchName");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLBITMAPNAME        , "FillBitmapName");
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLSTYLE             , "FillStyle");
-
-    IMPLEMENT_CONSTASCII_USTRING(DBTEXTBOXBOUNDCONTENT          , "TextBoxBoundContent");
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/shared/xmlstrings.cxx b/reportdesign/source/shared/xmlstrings.cxx
deleted file mode 100644
index 828354bd5ca3..000000000000
--- a/reportdesign/source/shared/xmlstrings.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "xmlstrings.hrc"
-
-namespace rptxml
-{
-#include "stringconstants.cxx"
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER           , "com.sun.star.comp.Report.XMLOasisSettingsImporter");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER             , "com.sun.star.comp.Report.XMLOasisStylesImporter");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER            , "com.sun.star.comp.Report.XMLOasisContentImporter");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER               , "com.sun.star.document.ImportFilter");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER               , "com.sun.star.comp.Report.XMLOasisMetaImporter");
-
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT                , "BorderLeft");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERRIGHT               , "BorderRight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERTOP                 , "BorderTop");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERBOTTOM              , "BorderBottom");
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 219860eabd33..6b4bb49a9736 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -375,10 +375,10 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope
         beans::Property aValue;
         static const OUString s_pProperties[] =
         {
-             PROPERTY_CHARTTYPE
-            ,PROPERTY_MASTERFIELDS
-            ,PROPERTY_DETAILFIELDS
-            ,PROPERTY_PREVIEW_COUNT
+             OUString(PROPERTY_CHARTTYPE)
+            ,OUString(PROPERTY_MASTERFIELDS)
+            ,OUString(PROPERTY_DETAILFIELDS)
+            ,OUString(PROPERTY_PREVIEW_COUNT)
         };
 
         for (size_t nPos = 0; nPos < sizeof(s_pProperties)/sizeof(s_pProperties[0]) ;++nPos )
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index d586521002aa..b469499f6f7c 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1280,39 +1280,39 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
 
     const OUString pIncludeProperties[] =
     {
-         PROPERTY_FORCENEWPAGE
-        ,PROPERTY_KEEPTOGETHER
-        ,PROPERTY_CANGROW
-        ,PROPERTY_CANSHRINK
-        ,PROPERTY_REPEATSECTION
-        ,PROPERTY_PRINTREPEATEDVALUES
-        ,PROPERTY_CONDITIONALPRINTEXPRESSION
-        ,PROPERTY_STARTNEWCOLUMN
-        ,PROPERTY_RESETPAGENUMBER
-        ,PROPERTY_PRINTWHENGROUPCHANGE
-        ,PROPERTY_VISIBLE
-        ,PROPERTY_PAGEHEADEROPTION
-        ,PROPERTY_PAGEFOOTEROPTION
+         OUString(PROPERTY_FORCENEWPAGE)
+        ,OUString(PROPERTY_KEEPTOGETHER)
+        ,OUString(PROPERTY_CANGROW)
+        ,OUString(PROPERTY_CANSHRINK)
+        ,OUString(PROPERTY_REPEATSECTION)
+        ,OUString(PROPERTY_PRINTREPEATEDVALUES)
+        ,OUString(PROPERTY_CONDITIONALPRINTEXPRESSION)
+        ,OUString(PROPERTY_STARTNEWCOLUMN)
+        ,OUString(PROPERTY_RESETPAGENUMBER)
+        ,OUString(PROPERTY_PRINTWHENGROUPCHANGE)
+        ,OUString(PROPERTY_VISIBLE)
+        ,OUString(PROPERTY_PAGEHEADEROPTION)
+        ,OUString(PROPERTY_PAGEFOOTEROPTION)
         ,OUString("ControlLabel")
-        ,PROPERTY_POSITIONX
-        ,PROPERTY_POSITIONY
-        ,PROPERTY_WIDTH
-        ,PROPERTY_HEIGHT
-        ,PROPERTY_PREEVALUATED
-        ,PROPERTY_DEEPTRAVERSING
-        ,PROPERTY_FORMULA
-        ,PROPERTY_INITIALFORMULA
-        ,PROPERTY_PRESERVEIRI
-        ,PROPERTY_DATAFIELD
-        ,PROPERTY_FONT
-        ,PROPERTY_BACKCOLOR
-        ,PROPERTY_BACKTRANSPARENT
-        ,PROPERTY_CONTROLBACKGROUND
-        ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
-        ,PROPERTY_LABEL
-        ,PROPERTY_MIMETYPE
-        ,PROPERTY_VERTICALALIGN
-        ,PROPERTY_PARAADJUST
+        ,OUString(PROPERTY_POSITIONX)
+        ,OUString(PROPERTY_POSITIONY)
+        ,OUString(PROPERTY_WIDTH)
+        ,OUString(PROPERTY_HEIGHT)
+        ,OUString(PROPERTY_PREEVALUATED)
+        ,OUString(PROPERTY_DEEPTRAVERSING)
+        ,OUString(PROPERTY_FORMULA)
+        ,OUString(PROPERTY_INITIALFORMULA)
+        ,OUString(PROPERTY_PRESERVEIRI)
+        ,OUString(PROPERTY_DATAFIELD)
+        ,OUString(PROPERTY_FONT)
+        ,OUString(PROPERTY_BACKCOLOR)
+        ,OUString(PROPERTY_BACKTRANSPARENT)
+        ,OUString(PROPERTY_CONTROLBACKGROUND)
+        ,OUString(PROPERTY_CONTROLBACKGROUNDTRANSPARENT)
+        ,OUString(PROPERTY_LABEL)
+        ,OUString(PROPERTY_MIMETYPE)
+        ,OUString(PROPERTY_VERTICALALIGN)
+        ,OUString(PROPERTY_PARAADJUST)
     };
     const uno::Reference < beans::XPropertySetInfo > xInfo = m_xReportComponent->getPropertySetInfo();
     const uno::Sequence< beans::Property> aSeq = xInfo->getProperties();
@@ -1390,7 +1390,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
 {
     if ( !_rxInspectorUI.is() )
         throw lang::NullPointerException();
-    if (PropertyName.equalsAsciiL(PROPERTY_FILTER.ascii, PROPERTY_FILTER.length))
+    if (PropertyName == PROPERTY_FILTER)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -1403,7 +1403,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
         }
         return eResult;
     }
-    else if (PropertyName.equalsAsciiL(PROPERTY_FONT.ascii, PROPERTY_FONT.length))
+    else if (PropertyName == PROPERTY_FONT)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -1420,10 +1420,10 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
         }
         return eResult;
     }
-    else if (      PropertyName.equalsAsciiL(PROPERTY_FORMULA.ascii, PROPERTY_FORMULA.length)
-                || PropertyName.equalsAsciiL(PROPERTY_INITIALFORMULA.ascii, PROPERTY_INITIALFORMULA.length)
-                || PropertyName.equalsAsciiL(PROPERTY_DATAFIELD.ascii, PROPERTY_DATAFIELD.length)
-                || PropertyName.equalsAsciiL(PROPERTY_CONDITIONALPRINTEXPRESSION.ascii, PROPERTY_CONDITIONALPRINTEXPRESSION.length))
+    else if (      PropertyName == PROPERTY_FORMULA
+                || PropertyName == PROPERTY_INITIALFORMULA
+                || PropertyName == PROPERTY_DATAFIELD
+                || PropertyName == PROPERTY_CONDITIONALPRINTEXPRESSION)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -1443,7 +1443,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
         }
         return eResult;
     }
-    else if (PropertyName.equalsAsciiL(PROPERTY_AREA.ascii, PROPERTY_AREA.length))
+    else if (PropertyName == PROPERTY_AREA)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index aa14f7c43db7..20cb41cdaebb 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -259,35 +259,35 @@ namespace rptui
                 OUString("ControlLabel"), /// TODO: has to be checked
                 OUString("LabelControl"),
                 OUString("Title"), // comment this out if you want to have title feature for charts
-                PROPERTY_MAXTEXTLEN,
-                PROPERTY_EFFECTIVEDEFAULT,
-                PROPERTY_EFFECTIVEMAX,
-                PROPERTY_EFFECTIVEMIN,
+                OUString(PROPERTY_MAXTEXTLEN),
+                OUString(PROPERTY_EFFECTIVEDEFAULT),
+                OUString(PROPERTY_EFFECTIVEMAX),
+                OUString(PROPERTY_EFFECTIVEMIN),
                 OUString("HideInactiveSelection"),
                 OUString("SubmitAction"),
                 OUString("InputRequired"),
                 OUString("VerticalAlign"),
-                PROPERTY_ALIGN,
-                PROPERTY_EMPTY_IS_NULL,
-                PROPERTY_FILTERPROPOSAL
-                ,PROPERTY_POSITIONX
-                ,PROPERTY_POSITIONY
-                ,PROPERTY_WIDTH
-                ,PROPERTY_HEIGHT
-                ,PROPERTY_FONT
-                ,PROPERTY_LABEL
-                ,PROPERTY_LINECOLOR
-                ,PROPERTY_BORDER
-                ,PROPERTY_BORDERCOLOR
-                ,PROPERTY_BACKTRANSPARENT
-                ,PROPERTY_CONTROLBACKGROUND
-                ,PROPERTY_BACKGROUNDCOLOR
-                ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
-                ,PROPERTY_FORMULALIST
-                ,PROPERTY_SCOPE
-                ,PROPERTY_TYPE
-                ,PROPERTY_DATASOURCENAME
-                ,PROPERTY_VERTICALALIGN
+                OUString(PROPERTY_ALIGN),
+                OUString(PROPERTY_EMPTY_IS_NULL),
+                OUString(PROPERTY_FILTERPROPOSAL)
+                ,OUString(PROPERTY_POSITIONX)
+                ,OUString(PROPERTY_POSITIONY)
+                ,OUString(PROPERTY_WIDTH)
+                ,OUString(PROPERTY_HEIGHT)
+                ,OUString(PROPERTY_FONT)
+                ,OUString(PROPERTY_LABEL)
+                ,OUString(PROPERTY_LINECOLOR)
+                ,OUString(PROPERTY_BORDER)
+                ,OUString(PROPERTY_BORDERCOLOR)
+                ,OUString(PROPERTY_BACKTRANSPARENT)
+                ,OUString(PROPERTY_CONTROLBACKGROUND)
+                ,OUString(PROPERTY_BACKGROUNDCOLOR)
+                ,OUString(PROPERTY_CONTROLBACKGROUNDTRANSPARENT)
+                ,OUString(PROPERTY_FORMULALIST)
+                ,OUString(PROPERTY_SCOPE)
+                ,OUString(PROPERTY_TYPE)
+                ,OUString(PROPERTY_DATASOURCENAME)
+                ,OUString(PROPERTY_VERTICALALIGN)
         };
 
         beans::Property* pPropsIter = aProps.getArray();
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 9d2103a33f4a..43f67fcb4123 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -537,9 +537,9 @@ namespace
                 sal_uInt16 nWhich;
                 OUString sPropertyName;
         };
-        const Items pItems[] = { {ITEMID_LANGUAGE,PROPERTY_CHARLOCALE}
-                                ,{ITEMID_LANGUAGE_ASIAN,PROPERTY_CHARLOCALEASIAN}
-                                ,{ITEMID_LANGUAGE_COMPLEX,PROPERTY_CHARLOCALECOMPLEX}
+        const Items pItems[] = { {ITEMID_LANGUAGE,OUString(PROPERTY_CHARLOCALE)}
+                                ,{ITEMID_LANGUAGE_ASIAN,OUString(PROPERTY_CHARLOCALEASIAN)}
+                                ,{ITEMID_LANGUAGE_COMPLEX,OUString(PROPERTY_CHARLOCALECOMPLEX)}
         };
         for(size_t k = 0; k < sizeof(pItems)/sizeof(pItems[0]);++k)
         {
@@ -807,28 +807,28 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat
             _rxReportControlFormat->setCharFontNameComplex( sTemp );
         }
 
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARSHADOWED.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharShadowed );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCONTOURED.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharContoured );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARUNDERLINECOLOR.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharUnderlineColor );
-        lcl_applyFontAttribute( aSettings, PROPERTY_PARAADJUST.ascii, _rxReportControlFormat, &report::XReportControlFormat::setParaAdjust );
-        lcl_applyFontAttribute( aSettings, PROPERTY_VERTICALALIGN.ascii, _rxReportControlFormat, &report::XReportControlFormat::setVerticalAlign );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARRELIEF.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharRelief );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARHIDDEN.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharHidden );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARAUTOKERNING.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharAutoKerning );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CONTROLBACKGROUND.ascii, _rxReportControlFormat, &report::XReportControlFormat::setControlBackground );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARFLASH.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharFlash );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHAREMPHASIS.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharEmphasis );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOMBINEISON.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharCombineIsOn );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOMBINEPREFIX.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharCombinePrefix );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOMBINESUFFIX.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharCombineSuffix );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOLOR.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharColor );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARKERNING.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharKerning );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCASEMAP.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharCaseMap );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARLOCALE.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharLocale );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARESCAPEMENT.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharEscapement );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARESCAPEMENTHEIGHT.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharEscapementHeight );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARLOCALEASIAN.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharLocaleAsian );
-        lcl_applyFontAttribute( aSettings, PROPERTY_CHARLOCALECOMPLEX.ascii, _rxReportControlFormat, &report::XReportControlFormat::setCharLocaleComplex );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARSHADOWED, _rxReportControlFormat, &report::XReportControlFormat::setCharShadowed );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCONTOURED, _rxReportControlFormat, &report::XReportControlFormat::setCharContoured );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARUNDERLINECOLOR, _rxReportControlFormat, &report::XReportControlFormat::setCharUnderlineColor );
+        lcl_applyFontAttribute( aSettings, PROPERTY_PARAADJUST, _rxReportControlFormat, &report::XReportControlFormat::setParaAdjust );
+        lcl_applyFontAttribute( aSettings, PROPERTY_VERTICALALIGN, _rxReportControlFormat, &report::XReportControlFormat::setVerticalAlign );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARRELIEF, _rxReportControlFormat, &report::XReportControlFormat::setCharRelief );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARHIDDEN, _rxReportControlFormat, &report::XReportControlFormat::setCharHidden );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARAUTOKERNING, _rxReportControlFormat, &report::XReportControlFormat::setCharAutoKerning );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CONTROLBACKGROUND, _rxReportControlFormat, &report::XReportControlFormat::setControlBackground );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARFLASH, _rxReportControlFormat, &report::XReportControlFormat::setCharFlash );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHAREMPHASIS, _rxReportControlFormat, &report::XReportControlFormat::setCharEmphasis );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOMBINEISON, _rxReportControlFormat, &report::XReportControlFormat::setCharCombineIsOn );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOMBINEPREFIX, _rxReportControlFormat, &report::XReportControlFormat::setCharCombinePrefix );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOMBINESUFFIX, _rxReportControlFormat, &report::XReportControlFormat::setCharCombineSuffix );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCOLOR, _rxReportControlFormat, &report::XReportControlFormat::setCharColor );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARKERNING, _rxReportControlFormat, &report::XReportControlFormat::setCharKerning );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARCASEMAP, _rxReportControlFormat, &report::XReportControlFormat::setCharCaseMap );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARLOCALE, _rxReportControlFormat, &report::XReportControlFormat::setCharLocale );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARESCAPEMENT, _rxReportControlFormat, &report::XReportControlFormat::setCharEscapement );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARESCAPEMENTHEIGHT, _rxReportControlFormat, &report::XReportControlFormat::setCharEscapementHeight );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARLOCALEASIAN, _rxReportControlFormat, &report::XReportControlFormat::setCharLocaleAsian );
+        lcl_applyFontAttribute( aSettings, PROPERTY_CHARLOCALECOMPLEX, _rxReportControlFormat, &report::XReportControlFormat::setCharLocaleComplex );
     }
     catch( const uno::Exception& )
     {
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 25e52f886078..bd4fde87764b 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3177,14 +3177,14 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
         uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo();
         uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo();
 
-        const OUString sProps[] = {   PROPERTY_NAME
-                                            ,PROPERTY_FONTDESCRIPTOR
-                                            ,PROPERTY_FONTDESCRIPTORASIAN
-                                            ,PROPERTY_FONTDESCRIPTORCOMPLEX
-                                            ,PROPERTY_ORIENTATION
-                                            ,PROPERTY_BORDER
-                                            ,PROPERTY_FORMATSSUPPLIER
-                                            ,PROPERTY_BACKGROUNDCOLOR
+        const OUString sProps[] = {   OUString(PROPERTY_NAME)
+                                            ,OUString(PROPERTY_FONTDESCRIPTOR)
+                                            ,OUString(PROPERTY_FONTDESCRIPTORASIAN)
+                                            ,OUString(PROPERTY_FONTDESCRIPTORCOMPLEX)
+                                            ,OUString(PROPERTY_ORIENTATION)
+                                            ,OUString(PROPERTY_BORDER)
+                                            ,OUString(PROPERTY_FORMATSSUPPLIER)
+                                            ,OUString(PROPERTY_BACKGROUNDCOLOR)
         };
         for(size_t i = 0; i < sizeof (sProps) / sizeof (sProps[0]); ++i)
         {
@@ -3480,11 +3480,11 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
 
                         uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo();
                         uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo();
-                        const OUString sProps[] = {   PROPERTY_FONTDESCRIPTOR
-                                                            ,PROPERTY_FONTDESCRIPTORASIAN
-                                                            ,PROPERTY_FONTDESCRIPTORCOMPLEX
-                                                            ,PROPERTY_BORDER
-                                                            ,PROPERTY_BACKGROUNDCOLOR
+                        const OUString sProps[] = {   OUString(PROPERTY_FONTDESCRIPTOR)
+                                                            ,OUString(PROPERTY_FONTDESCRIPTORASIAN)
+                                                            ,OUString(PROPERTY_FONTDESCRIPTORCOMPLEX)
+                                                            ,OUString(PROPERTY_BORDER)
+                                                            ,OUString(PROPERTY_BACKGROUNDCOLOR)
                         };
                         for(size_t k = 0; k < sizeof(sProps)/sizeof(sProps[0]);++k)
                         {
@@ -3650,9 +3650,9 @@ void OReportController::changeZOrder(sal_Int32 _nId)
 // -----------------------------------------------------------------------------
 void OReportController::listen(const bool _bAdd)
 {
-    const OUString aProps [] = {    PROPERTY_REPORTHEADERON,PROPERTY_REPORTFOOTERON
-                                            ,PROPERTY_PAGEHEADERON,PROPERTY_PAGEFOOTERON
-                                            ,PROPERTY_COMMAND, PROPERTY_COMMANDTYPE,PROPERTY_CAPTION
+    const OUString aProps [] = {    OUString(PROPERTY_REPORTHEADERON),OUString(PROPERTY_REPORTFOOTERON)
+                                            ,OUString(PROPERTY_PAGEHEADERON),OUString(PROPERTY_PAGEFOOTERON)
+                                            ,OUString(PROPERTY_COMMAND), OUString(PROPERTY_COMMANDTYPE),OUString(PROPERTY_CAPTION)
     };
 
     void (SAL_CALL XPropertySet::*pPropertyListenerAction)( const OUString&, const uno::Reference< XPropertyChangeListener >& ) =
@@ -3703,8 +3703,8 @@ void OReportController::listen(const bool _bAdd)
     for (sal_Int32 i=0;i<nCount ; ++i)
     {
         uno::Reference< report::XGroup > xGroup(xGroups->getByIndex(i),uno::UNO_QUERY);
-        (xGroup.get()->*pPropertyListenerAction)( PROPERTY_HEADERON, static_cast< XPropertyChangeListener* >( this ) );
-        (xGroup.get()->*pPropertyListenerAction)( PROPERTY_FOOTERON, static_cast< XPropertyChangeListener* >( this ) );
+        (xGroup.get()->*pPropertyListenerAction)( OUString(PROPERTY_HEADERON), static_cast< XPropertyChangeListener* >( this ) );
+        (xGroup.get()->*pPropertyListenerAction)( OUString(PROPERTY_FOOTERON), static_cast< XPropertyChangeListener* >( this ) );
 
         (rUndoEnv.*pElementUndoFunction)( xGroup );
         (rUndoEnv.*pElementUndoFunction)( xGroup->getFunctions() );