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

Change-Id: I85fedf6f3db0ffa59eaafe94d370b05660468c24

5 files changed, 265 insertions, 332 deletions

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