INTEGRATION: CWS mozab04 (1.5.2); FILE MERGED

2004/04/13 09:15:18 windly 1.5.2.1: #1000# replace createFromAscii to RTL_CONSTASCII_USTRINGPARAM

1 files changed, 40 insertions, 40 deletions

diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 1199a5c1db6d..e33273f910a5 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MColumnAlias.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2004-03-17 10:40:30 $
+ *  last change: $Author: hjs $ $Date: 2004-06-25 18:26:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,43 +85,43 @@ using namespace ::com::sun::star::container;
 
 static const ::rtl::OUString sProgrammaticNames[] =
 {
-    ::rtl::OUString::createFromAscii("FirstName"),
-    ::rtl::OUString::createFromAscii("LastName"),
-    ::rtl::OUString::createFromAscii("DisplayName"),
-    ::rtl::OUString::createFromAscii("NickName"),
-    ::rtl::OUString::createFromAscii("PrimaryEmail"),
-    ::rtl::OUString::createFromAscii("SecondEmail"),
-    ::rtl::OUString::createFromAscii("PreferMailFormat"),
-    ::rtl::OUString::createFromAscii("WorkPhone"),
-    ::rtl::OUString::createFromAscii("HomePhone"),
-    ::rtl::OUString::createFromAscii("FaxNumber"),
-    ::rtl::OUString::createFromAscii("PagerNumber"),
-    ::rtl::OUString::createFromAscii("CellularNumber"),
-    ::rtl::OUString::createFromAscii("HomeAddress"),
-    ::rtl::OUString::createFromAscii("HomeAddress2"),
-    ::rtl::OUString::createFromAscii("HomeCity"),
-    ::rtl::OUString::createFromAscii("HomeState"),
-    ::rtl::OUString::createFromAscii("HomeZipCode"),
-    ::rtl::OUString::createFromAscii("HomeCountry"),
-    ::rtl::OUString::createFromAscii("WorkAddress"),
-    ::rtl::OUString::createFromAscii("WorkAddress2"),
-    ::rtl::OUString::createFromAscii("WorkCity"),
-    ::rtl::OUString::createFromAscii("WorkState"),
-    ::rtl::OUString::createFromAscii("WorkZipCode"),
-    ::rtl::OUString::createFromAscii("WorkCountry"),
-    ::rtl::OUString::createFromAscii("JobTitle"),
-    ::rtl::OUString::createFromAscii("Department"),
-    ::rtl::OUString::createFromAscii("Company"),
-    ::rtl::OUString::createFromAscii("WebPage1"),
-    ::rtl::OUString::createFromAscii("WebPage2"),
-    ::rtl::OUString::createFromAscii("BirthYear"),
-    ::rtl::OUString::createFromAscii("BirthMonth"),
-    ::rtl::OUString::createFromAscii("BirthDay"),
-    ::rtl::OUString::createFromAscii("Custom1"),
-    ::rtl::OUString::createFromAscii("Custom2"),
-    ::rtl::OUString::createFromAscii("Custom3"),
-    ::rtl::OUString::createFromAscii("Custom4"),
-    ::rtl::OUString::createFromAscii("Notes")
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FirstName")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LastName")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DisplayName")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NickName")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PrimaryEmail")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SecondEmail")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PreferMailFormat")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WorkPhone")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HomePhone")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FaxNumber")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PagerNumber")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellularNumber")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HomeAddress")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HomeAddress2")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HomeCity")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HomeState")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HomeZipCode")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HomeCountry")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WorkAddress")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WorkAddress2")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WorkCity")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WorkState")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WorkZipCode")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WorkCountry")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("JobTitle")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Department")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Company")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WebPage1")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WebPage2")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BirthYear")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BirthMonth")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BirthDay")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom1")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom2")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom3")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom4")),
+    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Notes"))
 };
 //------------------------------------------------------------------------------
 OColumnAlias::OColumnAlias()
@@ -159,7 +159,7 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference<
         {
             //.............................................................
             Reference< XNameAccess > xAliasesNode;
-            xDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii("ColumnAliases") ) >>= xAliasesNode;
+            xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xAliasesNode;
             OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" );
 
             // this is a set of string nodes