summaryrefslogtreecommitdiff
path: root/svl/qa/complex/ConfigItems
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-22 22:32:51 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-22 22:32:51 +0100
commit8c779305bca6b2ca4badadb1ed0c89dc092f287f (patch)
tree8e5318e2afbd3df93df72c5e8d89374add889f1c /svl/qa/complex/ConfigItems
parentbd80ff75a216d6494a1de64896856f4bbccc52ff (diff)
RTL_CONSTASCII_USTRINGPARAM in libs-gui 07
Diffstat (limited to 'svl/qa/complex/ConfigItems')
-rw-r--r--svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx18
-rw-r--r--svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx76
-rw-r--r--svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx26
-rw-r--r--svl/qa/complex/ConfigItems/helper/UserOptTest.cxx72
4 files changed, 96 insertions, 96 deletions
diff --git a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index 4ee8ce09289f..3f44d5a8dd9c 100644
--- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
@@ -47,13 +47,13 @@ namespace css = ::com::sun::star;
namespace svl{
//=============================================================================
-static const ::rtl::OUString PROP_TEST = ::rtl::OUString::createFromAscii("Test");
-static const ::rtl::OUString TEST_PICKLIST = ::rtl::OUString::createFromAscii("checkPicklist");
-static const ::rtl::OUString TEST_URLHISTORY = ::rtl::OUString::createFromAscii("checkURLHistory");
-static const ::rtl::OUString TEST_HELPBOOKMARKS = ::rtl::OUString::createFromAscii("checkHelpBookmarks");
-static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS = ::rtl::OUString::createFromAscii("checkAccessibilityOptions");
-static const ::rtl::OUString TEST_PRINTOPTIONS = ::rtl::OUString::createFromAscii("checkPrintOptions");
-static const ::rtl::OUString TEST_USEROPTIONS = ::rtl::OUString::createFromAscii("checkUserOptions");
+static const ::rtl::OUString PROP_TEST (RTL_CONSTASCII_USTRINGPARAM("Test"));
+static const ::rtl::OUString TEST_PICKLIST (RTL_CONSTASCII_USTRINGPARAM("checkPicklist"));
+static const ::rtl::OUString TEST_URLHISTORY (RTL_CONSTASCII_USTRINGPARAM("checkURLHistory"));
+static const ::rtl::OUString TEST_HELPBOOKMARKS (RTL_CONSTASCII_USTRINGPARAM("checkHelpBookmarks"));
+static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS (RTL_CONSTASCII_USTRINGPARAM("checkAccessibilityOptions"));
+static const ::rtl::OUString TEST_PRINTOPTIONS (RTL_CONSTASCII_USTRINGPARAM("checkPrintOptions"));
+static const ::rtl::OUString TEST_USEROPTIONS (RTL_CONSTASCII_USTRINGPARAM("checkUserOptions"));
//=============================================================================
class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob ,
@@ -189,14 +189,14 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::getSupportedServi
//=============================================================================
::rtl::OUString SAL_CALL ConfigItemTest::st_getImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.svl.ConfigItemTest");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svl.ConfigItemTest"));
}
//=============================================================================
css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::st_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > lServices(1);
- lServices[0] = ::rtl::OUString::createFromAscii("com.sun.star.test.ConfigItems");
+ lServices[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.ConfigItems"));
return lServices;
}
diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index a304a508b3fb..7bf855c7e4a3 100644
--- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
@@ -42,14 +42,14 @@
namespace css = ::com::sun::star;
//=============================================================================
-static const ::rtl::OUString MESSAGE_CLEAR_FAILED = ::rtl::OUString::createFromAscii("Clearing the list failed.");
-static const ::rtl::OUString MESSAGE_SETSIZE_FAILED = ::rtl::OUString::createFromAscii("Setting a new size for a list failed.");
-static const ::rtl::OUString MESSAGE_MISS_HISTORY = ::rtl::OUString::createFromAscii("Could not get config access to history list inside config.");
-static const ::rtl::OUString MESSAGE_MISS_ITEMLIST = ::rtl::OUString::createFromAscii("Could not get config access to item list inside config.");
-static const ::rtl::OUString MESSAGE_MISS_ORDERLIST = ::rtl::OUString::createFromAscii("Could not get config access to order list inside config.");
-static const ::rtl::OUString MESSAGE_MISS_ITEM = ::rtl::OUString::createFromAscii("Could not locate item.");
-static const ::rtl::OUString MESSAGE_UNEXPECTED_ITEM = ::rtl::OUString::createFromAscii("Found an unexpected item.");
-static const ::rtl::OUString MESSAGE_WRONG_ORDER = ::rtl::OUString::createFromAscii("Wrong order in history list.");
+static const ::rtl::OUString MESSAGE_CLEAR_FAILED (RTL_CONSTASCII_USTRINGPARAM("Clearing the list failed."));
+static const ::rtl::OUString MESSAGE_SETSIZE_FAILED (RTL_CONSTASCII_USTRINGPARAM("Setting a new size for a list failed."));
+static const ::rtl::OUString MESSAGE_MISS_HISTORY (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to history list inside config."));
+static const ::rtl::OUString MESSAGE_MISS_ITEMLIST (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to item list inside config."));
+static const ::rtl::OUString MESSAGE_MISS_ORDERLIST (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to order list inside config."));
+static const ::rtl::OUString MESSAGE_MISS_ITEM (RTL_CONSTASCII_USTRINGPARAM("Could not locate item."));
+static const ::rtl::OUString MESSAGE_UNEXPECTED_ITEM (RTL_CONSTASCII_USTRINGPARAM("Found an unexpected item."));
+static const ::rtl::OUString MESSAGE_WRONG_ORDER (RTL_CONSTASCII_USTRINGPARAM("Wrong order in history list."));
//=============================================================================
HistoryOptTest::HistoryOptTest()
@@ -662,10 +662,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
{
impl_clearList(s_sPickList);
aHistoryOpt.AppendItem( ePICKLIST ,
- ::rtl::OUString::createFromAscii("file:///c/test1"),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii("") );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( ePICKLIST );
if ( aHistoryList.getLength()==0 )
@@ -677,10 +677,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
{
impl_clearList(s_sURLHistory);
aHistoryOpt.AppendItem( eHISTORY ,
- ::rtl::OUString::createFromAscii("file:///c/test1"),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii("") );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( eHISTORY );
if ( aHistoryList.getLength()==0 )
@@ -692,10 +692,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
{
impl_clearList(s_sHelpBookmarks);
aHistoryOpt.AppendItem( eHELPBOOKMARKS ,
- ::rtl::OUString::createFromAscii("file:///c/test1"),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii("") );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( eHELPBOOKMARKS );
if ( aHistoryList.getLength()==0 )
@@ -714,15 +714,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
for (sal_Int32 i=0; i<nListSize; ++i)
aHistoryOpt.AppendItem( ePICKLIST ,
::rtl::OUString::valueOf(i),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii("") );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
aHistoryOpt.AppendItem( ePICKLIST ,
::rtl::OUString::valueOf(nListSize),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii("") );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
}
else if (sList.equalsAscii("URLHistory"))
@@ -733,15 +733,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
for (sal_Int32 i=0; i<nListSize; ++i)
aHistoryOpt.AppendItem( eHISTORY ,
::rtl::OUString::valueOf(i),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii("") );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
aHistoryOpt.AppendItem( eHISTORY ,
::rtl::OUString::valueOf(nListSize),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii(""),
- ::rtl::OUString::createFromAscii("") );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
}
else if (sList.equalsAscii("HelpBookmarks"))
@@ -752,15 +752,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
//for (sal_Int32 i=0; i<nListSize; ++i)
// aHistoryOpt.AppendItem( eHELPBOOKMARKS ,
// ::rtl::OUString::valueOf(i),
- // ::rtl::OUString::createFromAscii(""),
- // ::rtl::OUString::createFromAscii(""),
- // ::rtl::OUString::createFromAscii("") );
+ // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
//aHistoryOpt.AppendItem( eHELPBOOKMARKS ,
// ::rtl::OUString::valueOf(nListSize),
- // ::rtl::OUString::createFromAscii(""),
- // ::rtl::OUString::createFromAscii(""),
- // ::rtl::OUString::createFromAscii("") );
+ // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
}
}
diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
index e2ef940cbde6..fddc466417bb 100644
--- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
@@ -36,24 +36,24 @@
namespace css = ::com::sun::star;
// using test only
-#define ROOTNODE_PRINTOPTION rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option")
-#define PROPERTYNAME_REDUCETRANSPARENCY rtl::OUString::createFromAscii("ReduceTransparency")
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE rtl::OUString::createFromAscii("ReducedTransparencyMode")
-#define PROPERTYNAME_REDUCEGRADIENTS rtl::OUString::createFromAscii("ReduceGradients")
-#define PROPERTYNAME_REDUCEDGRADIENTMODE rtl::OUString::createFromAscii("ReducedGradientMode")
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT rtl::OUString::createFromAscii("ReducedGradientStepCount")
-#define PROPERTYNAME_REDUCEBITMAPS rtl::OUString::createFromAscii("ReduceBitmaps")
-#define PROPERTYNAME_REDUCEDBITMAPMODE rtl::OUString::createFromAscii("ReducedBitmapMode")
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION rtl::OUString::createFromAscii("ReducedBitmapResolution")
-#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY rtl::OUString::createFromAscii("ReducedBitmapIncludesTransparency")
-#define PROPERTYNAME_CONVERTTOGREYSCALES rtl::OUString::createFromAscii("ConvertToGreyscales")
+#define ROOTNODE_PRINTOPTION rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option"))
+#define PROPERTYNAME_REDUCETRANSPARENCY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
+#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
+#define PROPERTYNAME_REDUCEGRADIENTS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
+#define PROPERTYNAME_REDUCEDGRADIENTMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
+#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount"))
+#define PROPERTYNAME_REDUCEBITMAPS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps"))
+#define PROPERTYNAME_REDUCEDBITMAPMODE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode"))
+#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution"))
+#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapIncludesTransparency"))
+#define PROPERTYNAME_CONVERTTOGREYSCALES rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales"))
PrintOptTest::PrintOptTest()
{
m_xCfg = css::uno::Reference< css::container::XNameAccess >(
::comphelper::ConfigurationHelper::openConfig(
::utl::getProcessServiceFactory(),
- rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")),
::comphelper::ConfigurationHelper::E_STANDARD),
css::uno::UNO_QUERY);
@@ -62,7 +62,7 @@ PrintOptTest::PrintOptTest()
//UniString sTmp = UniString("printer");
//xub_StrLen nTokenCount = sTmp.GetTokenCount('/');
//sTmp = sTmp.GetToken(nTokenCount - 1, '/');
- m_xCfg->getByName(rtl::OUString::createFromAscii("Printer")) >>= m_xNode;
+ m_xCfg->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Printer"))) >>= m_xNode;
}
}
diff --git a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
index 571d5bb9e3ed..c1e03e915ed2 100644
--- a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
@@ -31,24 +31,24 @@
namespace css = ::com::sun::star;
//=============================================================================
-static const ::rtl::OUString MESSAGE_SETCOMPANY_FAILED = ::rtl::OUString::createFromAscii("set company failed") ;
-static const ::rtl::OUString MESSAGE_SETFIRSTNAME_FAILED = ::rtl::OUString::createFromAscii("set firstname failed") ;
-static const ::rtl::OUString MESSAGE_SETLASTNAME_FAILED = ::rtl::OUString::createFromAscii("set lastname failed") ;
-static const ::rtl::OUString MESSAGE_SETID_FAILED = ::rtl::OUString::createFromAscii("set ID failed") ;
-static const ::rtl::OUString MESSAGE_SETSTREET_FAILED = ::rtl::OUString::createFromAscii("set street failed") ;
-static const ::rtl::OUString MESSAGE_SETCITY_FAILED = ::rtl::OUString::createFromAscii("set city failed") ;
-static const ::rtl::OUString MESSAGE_SETSTATE_FAILED = ::rtl::OUString::createFromAscii("set state failed") ;
-static const ::rtl::OUString MESSAGE_SETZIP_FAILED = ::rtl::OUString::createFromAscii("set zip failed") ;
-static const ::rtl::OUString MESSAGE_SETCOUNTRY_FAILED = ::rtl::OUString::createFromAscii("set country failed") ;
-static const ::rtl::OUString MESSAGE_SETPOSITION_FAILED = ::rtl::OUString::createFromAscii("set position failed") ;
-static const ::rtl::OUString MESSAGE_SETTITLE_FAILED = ::rtl::OUString::createFromAscii("set title failed") ;
-static const ::rtl::OUString MESSAGE_SETTELEPHONEHOME_FAILED = ::rtl::OUString::createFromAscii("set telephonehome failed") ;
-static const ::rtl::OUString MESSAGE_SETTELEPHONEWORK_FAILED = ::rtl::OUString::createFromAscii("set telephonework failed") ;
-static const ::rtl::OUString MESSAGE_SETFAX_FAILED = ::rtl::OUString::createFromAscii("set fax failed") ;
-static const ::rtl::OUString MESSAGE_SETEMAIL_FAILED = ::rtl::OUString::createFromAscii("set email failed") ;
-static const ::rtl::OUString MESSAGE_SETCUSTOMERNUMBER_FAILED = ::rtl::OUString::createFromAscii("set customernumber failed");
-static const ::rtl::OUString MESSAGE_SETFATHERSNAME_FAILED = ::rtl::OUString::createFromAscii("set fathersname failed") ;
-static const ::rtl::OUString MESSAGE_SETAPARTMENT_FAILED = ::rtl::OUString::createFromAscii("set apartment failed") ;
+static const ::rtl::OUString MESSAGE_SETCOMPANY_FAILED (RTL_CONSTASCII_USTRINGPARAM("set company failed")) ;
+static const ::rtl::OUString MESSAGE_SETFIRSTNAME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set firstname failed")) ;
+static const ::rtl::OUString MESSAGE_SETLASTNAME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set lastname failed")) ;
+static const ::rtl::OUString MESSAGE_SETID_FAILED (RTL_CONSTASCII_USTRINGPARAM("set ID failed")) ;
+static const ::rtl::OUString MESSAGE_SETSTREET_FAILED (RTL_CONSTASCII_USTRINGPARAM("set street failed")) ;
+static const ::rtl::OUString MESSAGE_SETCITY_FAILED (RTL_CONSTASCII_USTRINGPARAM("set city failed")) ;
+static const ::rtl::OUString MESSAGE_SETSTATE_FAILED (RTL_CONSTASCII_USTRINGPARAM("set state failed")) ;
+static const ::rtl::OUString MESSAGE_SETZIP_FAILED (RTL_CONSTASCII_USTRINGPARAM("set zip failed")) ;
+static const ::rtl::OUString MESSAGE_SETCOUNTRY_FAILED (RTL_CONSTASCII_USTRINGPARAM("set country failed")) ;
+static const ::rtl::OUString MESSAGE_SETPOSITION_FAILED (RTL_CONSTASCII_USTRINGPARAM("set position failed")) ;
+static const ::rtl::OUString MESSAGE_SETTITLE_FAILED (RTL_CONSTASCII_USTRINGPARAM("set title failed")) ;
+static const ::rtl::OUString MESSAGE_SETTELEPHONEHOME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set telephonehome failed")) ;
+static const ::rtl::OUString MESSAGE_SETTELEPHONEWORK_FAILED (RTL_CONSTASCII_USTRINGPARAM("set telephonework failed")) ;
+static const ::rtl::OUString MESSAGE_SETFAX_FAILED (RTL_CONSTASCII_USTRINGPARAM("set fax failed")) ;
+static const ::rtl::OUString MESSAGE_SETEMAIL_FAILED (RTL_CONSTASCII_USTRINGPARAM("set email failed")) ;
+static const ::rtl::OUString MESSAGE_SETCUSTOMERNUMBER_FAILED (RTL_CONSTASCII_USTRINGPARAM("set customernumber failed"));
+static const ::rtl::OUString MESSAGE_SETFATHERSNAME_FAILED (RTL_CONSTASCII_USTRINGPARAM("set fathersname failed")) ;
+static const ::rtl::OUString MESSAGE_SETAPARTMENT_FAILED (RTL_CONSTASCII_USTRINGPARAM("set apartment failed")) ;
//=============================================================================
@@ -84,24 +84,24 @@ void UserOptTest::impl_checkUserData()
impl_checkSetFathersName( ::rtl::OUString() );
impl_checkSetApartment( ::rtl::OUString() );
- impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") );
- impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") );
- impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") );
- impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") );
- impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") );
- impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") );
- impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") );
- impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") );
- impl_checkSetCountry( ::rtl::OUString::createFromAscii("China") );
- impl_checkSetPosition( ::rtl::OUString::createFromAscii("Engineer") );
- impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") );
- impl_checkSetTelephoneHome( ::rtl::OUString::createFromAscii("010-51570010") );
- impl_checkSetTelephoneWork( ::rtl::OUString::createFromAscii("010-51570010") );
- impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") );
- impl_checkSetEmail( ::rtl::OUString::createFromAscii("wuy@redflag2000.cn") );
- //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") );
- impl_checkSetFathersName( ::rtl::OUString::createFromAscii("father") );
- impl_checkSetApartment( ::rtl::OUString::createFromAscii("apartment") );
+ impl_checkSetCompany( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedFlag2000")) );
+ impl_checkSetFirstName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Yan")) );
+ impl_checkSetLastName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wu")) );
+ impl_checkSetID( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wuy")) );
+ impl_checkSetStreet( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SouthFifthRing")) );
+ impl_checkSetCity( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Beijing")) );
+ impl_checkSetState( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Beijing")) );
+ impl_checkSetZip( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100176")) );
+ impl_checkSetCountry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("China")) );
+ impl_checkSetPosition( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Engineer")) );
+ impl_checkSetTitle( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Software Engineer")) );
+ impl_checkSetTelephoneHome( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) );
+ impl_checkSetTelephoneWork( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) );
+ impl_checkSetFax( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) );
+ impl_checkSetEmail( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wuy@redflag2000.cn")) );
+ //impl_checkSetCustomerNumber( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("87654321")) );
+ impl_checkSetFathersName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("father")) );
+ impl_checkSetApartment( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("apartment")) );
}
void UserOptTest::impl_checkSetCompany( const ::rtl::OUString& sUserData )