targeted string re-work

Change-Id: I6eb2242506ef2d230770e513579caf4455ec37d5

1 files changed, 21 insertions, 21 deletions

diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index c60320f81a8d..b2fa80c0cd16 100644
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -43,11 +43,11 @@ using ::rtl::OUString;
 
 namespace syssh = SystemShell;
 
-const OUString SXW_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.writer"));
-const OUString SXC_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.calc"));
-const OUString SXI_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.impress"));
-const OUString SXD_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.draw"));
-const OUString SXM_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.math"));
+const OUString SXW_MIME_TYPE("application/vnd.sun.xml.writer");
+const OUString SXC_MIME_TYPE("application/vnd.sun.xml.calc");
+const OUString SXI_MIME_TYPE("application/vnd.sun.xml.impress");
+const OUString SXD_MIME_TYPE("application/vnd.sun.xml.draw");
+const OUString SXM_MIME_TYPE("application/vnd.sun.xml.math");
 
 class Test_AddToRecentDocs : public CppUnit::TestFixture
 {
@@ -63,19 +63,19 @@ public:
         system("rm $HOME/.recently-used");
         system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
 
-        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
+        rtl::OUString url("file:///home_athene/test.sxw");
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxc"));
+        url = rtl::OUString("file:///home_athene/test.sxc");
         syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxi"));
+        url = rtl::OUString("file:///home_athene/test.sxi");
         syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxd"));
+        url = rtl::OUString("file:///home_athene/test.sxd");
         syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxm"));
+        url = rtl::OUString("file:///home_athene/test.sxm");
         syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
     }
 
@@ -85,7 +85,7 @@ public:
         system("rm $HOME/.recently-used");
         system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n<RecentItem>\n<URI>file:///home/federico/gedit2.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
 
-        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
+        rtl::OUString url("file:///home_athene/test.sxw");
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
     }
 
@@ -94,19 +94,19 @@ public:
     {
         int ret = system("rm $HOME/.recently-used");
 
-        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
+        rtl::OUString url("file:///home_athene/test.sxw");
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxc"));
+        url = rtl::OUString("file:///home_athene/test.sxc");
         syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxi"));
+        url = rtl::OUString("file:///home_athene/test.sxi");
         syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxd"));
+        url = rtl::OUString("file:///home_athene/test.sxd");
         syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
 
-        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxm"));
+        url = rtl::OUString("file:///home_athene/test.sxm");
         syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
 
         ret = system("ls $HOME/.recently-used");
@@ -124,9 +124,9 @@ public:
 
         if ((recently_used_url.getLength() > 0) &&
             ('/' != recently_used_url.pData->buffer[recently_used_url.getLength() - 1]))
-            recently_used_url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+            recently_used_url += rtl::OUString("/");
 
-        recently_used_url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".recently-used"));
+        recently_used_url += rtl::OUString(".recently-used");
         return recently_used_url;
     }
 
@@ -156,7 +156,7 @@ public:
         memset(cnt_before, 0, sizeof(cnt_before));
         read_recently_used(cnt_before, sizeof(cnt_before));
 
-        OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
+        OUString url("file:///home_athene/test.sxw");
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
         char cnt_after[128];
@@ -175,7 +175,7 @@ public:
         sprintf(cmd, "echo '%s' > $HOME/.recently-used", xml_unknown);
         system(cmd);
 
-        OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
+        OUString url("file:///home_athene/test.sxw");
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
         char buffer[256];
@@ -191,7 +191,7 @@ public:
         system("rm $HOME/.recently-used");
         system("touch $HOME/.recently-used");
 
-        OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
+        OUString url("file:///home_athene/test.sxw");
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
         char buffer[256];