ByteString->rtl::OString

desktop/source/app/cmdlinehelp.cxx

@@ -156,7 +156,7 @@ namespace desktop
         sal_Int32 n = comphelper::string::getTokenCount(aHelpMessage_left, '\n');
         rtl::OString bsLeft(rtl::OUStringToOString(aHelpMessage_left,
             RTL_TEXTENCODING_ASCII_US));
-        ByteString bsRight(rtl::OUStringToOString(aHelpMessage_right,
+        rtl::OString bsRight(rtl::OUStringToOString(aHelpMessage_right,
             RTL_TEXTENCODING_ASCII_US));
         for ( sal_Int32 i = 0; i < n; ++i )
         {

desktop/source/app/lockfile.hxx

@@ -42,17 +42,16 @@
  */
 
 #include "sal/types.h"
+#include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
 
-class ByteString;
-
 #define LOCKFILE_SUFFIX   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.lock" ) )
-#define LOCKFILE_GROUP    ByteString( "Lockdata" )
-#define LOCKFILE_USERKEY  ByteString( "User" )
-#define LOCKFILE_HOSTKEY  ByteString( "Host" )
-#define LOCKFILE_STAMPKEY ByteString( "Stamp" )
-#define LOCKFILE_TIMEKEY  ByteString( "Time" )
-#define LOCKFILE_IPCKEY   ByteString( "IPCServer" )
+#define LOCKFILE_GROUP    rtl::OString(RTL_CONSTASCII_STRINGPARAM( "Lockdata" ) )
+#define LOCKFILE_USERKEY  rtl::OString(RTL_CONSTASCII_STRINGPARAM( "User" ) )
+#define LOCKFILE_HOSTKEY  rtl::OString(RTL_CONSTASCII_STRINGPARAM( "Host" ) )
+#define LOCKFILE_STAMPKEY rtl::OString(RTL_CONSTASCII_STRINGPARAM( "Stamp" ) )
+#define LOCKFILE_TIMEKEY  rtl::OString(RTL_CONSTASCII_STRINGPARAM( "Time" ) )
+#define LOCKFILE_IPCKEY   rtl::OString(RTL_CONSTASCII_STRINGPARAM( "IPCServer" ) )
 
 namespace desktop {
 

desktop/source/app/lockfile2.cxx

@@ -42,10 +42,10 @@ bool Lockfile_execWarning( Lockfile * that )
     String aLockname = that->m_aLockname;
     Config aConfig(aLockname);
     aConfig.SetGroup( LOCKFILE_GROUP );
-    ByteString aHost  = aConfig.ReadKey( LOCKFILE_HOSTKEY );
-    ByteString aUser  = aConfig.ReadKey( LOCKFILE_USERKEY );
-    ByteString aStamp = aConfig.ReadKey( LOCKFILE_STAMPKEY );
-    ByteString aTime  = aConfig.ReadKey( LOCKFILE_TIMEKEY );
+    rtl::OString aHost  = aConfig.ReadKey( LOCKFILE_HOSTKEY );
+    rtl::OString aUser  = aConfig.ReadKey( LOCKFILE_USERKEY );
+    rtl::OString aStamp = aConfig.ReadKey( LOCKFILE_STAMPKEY );
+    rtl::OString aTime  = aConfig.ReadKey( LOCKFILE_TIMEKEY );
 
     // display warning and return response
     QueryBox aBox( NULL, DesktopResId( QBX_USERDATALOCKED ) );

desktop/source/deployment/registry/component/dp_component.cxx

@@ -794,7 +794,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
                 // xxx todo: probe and evaluate component xml description
 
                 INetContentTypeParameter const * param = params.find(
-                    ByteString("platform") );
+                    rtl::OString(RTL_CONSTASCII_STRINGPARAM("platform")));
                 bool bPlatformFits(param == 0);
                 String aPlatform;
                 if (!bPlatformFits) // platform is specified, we have to check
@@ -805,7 +805,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
                 // If the package is being removed, do not care whether
                 // platform fits. We won't be using it anyway.
                 if (bPlatformFits || bRemoved) {
-                    param = params.find( ByteString("type") );
+                    param = params.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type")));
                     if (param != 0)
                     {
                         String const & value = param->m_sValue;
@@ -839,7 +839,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
                          "vnd.sun.star.uno-components"))
             {
                 INetContentTypeParameter const * param = params.find(
-                    ByteString("platform") );
+                    rtl::OString(RTL_CONSTASCII_STRINGPARAM("platform")));
                 if (param == 0 || platform_fits( param->m_sValue )) {
                     return new BackendImpl::ComponentsPackageImpl(
                         this, url, name, m_xComponentsTypeInfo, bRemoved,
@@ -850,7 +850,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
                          "vnd.sun.star.uno-typelibrary"))
             {
                 INetContentTypeParameter const * param = params.find(
-                    ByteString("type") );
+                    rtl::OString(RTL_CONSTASCII_STRINGPARAM("type")));
                 if (param != 0) {
                     String const & value = param->m_sValue;
                     if (value.EqualsIgnoreCaseAscii("RDB"))

desktop/source/deployment/registry/package/dp_package.cxx

@@ -1479,7 +1479,7 @@ void BackendImpl::PackageImpl::scanBundle(
             continue;
 
         INetContentTypeParameter const * param = params.find(
-            ByteString("platform") );
+            rtl::OString(RTL_CONSTASCII_STRINGPARAM("platform")));
         if (param != 0 && !platform_fits( param->m_sValue ))
             continue;
         const OUString url( makeURL( packageRootURL, fullPath ) );
@@ -1490,7 +1490,7 @@ void BackendImpl::PackageImpl::scanBundle(
                 "vnd.sun.star.package-bundle-description"))
         {
             // check locale:
-            param = params.find( ByteString("locale") );
+            param = params.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("locale")));
             if (param == 0) {
                 if (descrFile.isEmpty())
                     descrFile = url;