Removed RTL_CONSTASCII_USTRINGPARAM in unotools

Change-Id: I516ea0e5457e9dc1cc9ac42f86fa1a5b4641078a

unotools/inc/unotools/compatibility.hxx

@@ -49,21 +49,21 @@ enum CompatibilityOptions
     @descr          The method GetList() returns a list of property values.
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
-#define COMPATIBILITY_PROPERTYNAME_NAME                     OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) )
-#define COMPATIBILITY_PROPERTYNAME_MODULE                   OUString( RTL_CONSTASCII_USTRINGPARAM( "Module" ) )
-#define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS            OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePrinterMetrics" ) )
-#define COMPATIBILITY_PROPERTYNAME_ADDSPACING               OUString( RTL_CONSTASCII_USTRINGPARAM( "AddSpacing" ) )
-#define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES        OUString( RTL_CONSTASCII_USTRINGPARAM( "AddSpacingAtPages" ) )
-#define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS           OUString( RTL_CONSTASCII_USTRINGPARAM( "UseOurTabStopFormat" ) )
-#define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING             OUString( RTL_CONSTASCII_USTRINGPARAM( "NoExternalLeading" ) )
-#define COMPATIBILITY_PROPERTYNAME_USELINESPACING           OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLineSpacing" ) )
-#define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING          OUString( RTL_CONSTASCII_USTRINGPARAM( "AddTableSpacing" ) )
-#define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING     OUString( RTL_CONSTASCII_USTRINGPARAM( "UseObjectPositioning" ) )
-#define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING       OUString( RTL_CONSTASCII_USTRINGPARAM( "UseOurTextWrapping" ) )
-#define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE    OUString( RTL_CONSTASCII_USTRINGPARAM( "ConsiderWrappingStyle" ) )
-#define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE          OUString( RTL_CONSTASCII_USTRINGPARAM( "ExpandWordSpace" ) )
-
-#define COMPATIBILITY_DEFAULT_NAME                          OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) )
+#define COMPATIBILITY_PROPERTYNAME_NAME                     OUString( "Name" )
+#define COMPATIBILITY_PROPERTYNAME_MODULE                   OUString( "Module" )
+#define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS            OUString( "UsePrinterMetrics" )
+#define COMPATIBILITY_PROPERTYNAME_ADDSPACING               OUString( "AddSpacing" )
+#define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES        OUString( "AddSpacingAtPages" )
+#define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS           OUString( "UseOurTabStopFormat" )
+#define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING             OUString( "NoExternalLeading" )
+#define COMPATIBILITY_PROPERTYNAME_USELINESPACING           OUString( "UseLineSpacing" )
+#define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING          OUString( "AddTableSpacing" )
+#define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING     OUString( "UseObjectPositioning" )
+#define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING       OUString( "UseOurTextWrapping" )
+#define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE    OUString( "ConsiderWrappingStyle" )
+#define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE          OUString( "ExpandWordSpace" )
+
+#define COMPATIBILITY_DEFAULT_NAME                          OUString( "_default" )
 
 //_________________________________________________________________________________________________________________
 //  forward declarations

unotools/inc/unotools/dynamicmenuoptions.hxx

@@ -30,10 +30,10 @@
     @descr          The method GetList() returns a list of property values.
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
-#define DYNAMICMENU_PROPERTYNAME_URL                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"             ))
-#define DYNAMICMENU_PROPERTYNAME_TITLE                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"           ))
-#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageIdentifier" ))
-#define DYNAMICMENU_PROPERTYNAME_TARGETNAME             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetName"      ))
+#define DYNAMICMENU_PROPERTYNAME_URL                    OUString("URL")
+#define DYNAMICMENU_PROPERTYNAME_TITLE                  OUString("Title")
+#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER        OUString("ImageIdentifier")
+#define DYNAMICMENU_PROPERTYNAME_TARGETNAME             OUString("TargetName")
 
 /*-************************************************************************************************************//**
     @descr          You can use these enum values to specify right menu if you call our interface methods.

unotools/inc/unotools/fontcfg.hxx

@@ -207,9 +207,9 @@ public:
     const FontNameAttr* getSubstInfo(
                                      const String& rFontName,
                                      const com::sun::star::lang::Locale& rLocale =
-                                     com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) ),
-                                                                   rtl::OUString(),
-                                                                   rtl::OUString() )
+                                     com::sun::star::lang::Locale( OUString( "en" ),
+                                                                   OUString(),
+                                                                   OUString() )
                                      ) const;
     static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uLong& rType );
 };

unotools/inc/unotools/historyoptions.hxx

@@ -32,10 +32,10 @@
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
 
-#define HISTORY_PROPERTYNAME_URL            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"       ))
-#define HISTORY_PROPERTYNAME_FILTER         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Filter"    ))
-#define HISTORY_PROPERTYNAME_TITLE          ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"     ))
-#define HISTORY_PROPERTYNAME_PASSWORD       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password"  ))
+#define HISTORY_PROPERTYNAME_URL            OUString("URL")
+#define HISTORY_PROPERTYNAME_FILTER         OUString("Filter")
+#define HISTORY_PROPERTYNAME_TITLE          OUString("Title")
+#define HISTORY_PROPERTYNAME_PASSWORD       OUString("Password")
 
 /*-************************************************************************************************************//**
     @descr          You can use these enum values to specify right history if you call ouer interface methods.