Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *().

1 files changed, 11 insertions, 12 deletions

diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 45ef143e64ca..2966cfe8ab76 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -104,7 +104,7 @@ static char *
 OUStringToGnome( const rtl::OUString &str )
 {
     rtl::OString aTempStr = rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 );
-    return g_strdup( (const sal_Char *) aTempStr );
+    return g_strdup( aTempStr.getStr() );
 }
 
 static rtl::OUString
@@ -409,7 +409,7 @@ uno::Any SAL_CALL Content::execute(
         aCommand.Argument >>= bDeletePhysical;
 
         ::rtl::OString aURI = getOURI();
-        GnomeVFSResult result = gnome_vfs_unlink ((const sal_Char *) aURI);
+        GnomeVFSResult result = gnome_vfs_unlink (aURI.getStr());
 
         if (result != GNOME_VFS_OK)
             cancelCommandExecution( result, xEnv, sal_True );
@@ -640,7 +640,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
             ::rtl::OString aURI = getOURI();
             gnome_vfs_get_file_info
-                ( (const sal_Char *)aURI, fileInfo,
+                ( aURI.getStr(), fileInfo,
                         GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS );
 
             if (fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ACCESS) {
@@ -741,7 +741,7 @@ Content::doSetFileInfo( const GnomeVFSFileInfo *newInfo,
     // The simple approach:
     if( setMask != GNOME_VFS_SET_FILE_INFO_NONE )
         result = gnome_vfs_set_file_info // missed a const in the API there
-            ( (const sal_Char *) aURI, (GnomeVFSFileInfo *)newInfo, setMask );
+            ( aURI.getStr(), (GnomeVFSFileInfo *)newInfo, setMask );
 
     if ( result == GNOME_VFS_ERROR_NOT_SUPPORTED &&
          ( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) ) {
@@ -752,7 +752,7 @@ Content::doSetFileInfo( const GnomeVFSFileInfo *newInfo,
 
         char *newURI = OUStringToGnome( makeNewURL( newInfo->name ) );
 
-        result = gnome_vfs_move ((const sal_Char *)aURI, newURI, FALSE);
+        result = gnome_vfs_move (aURI.getStr(), newURI, FALSE);
 
         g_free (newURI);
     }
@@ -964,7 +964,7 @@ void Content::insert(
 #ifdef DEBUG
         g_warning ("Make directory");
 #endif
-        result = gnome_vfs_make_directory( (const sal_Char *) aURI, perm );
+        result = gnome_vfs_make_directory( aURI.getStr(), perm );
 
         if( result != GNOME_VFS_OK )
             cancelCommandExecution( result, xEnv, sal_True );
@@ -988,8 +988,7 @@ void Content::insert(
     result = GNOME_VFS_OK;
     if ( bReplaceExisting ) {
         Authentication aAuth( xEnv );
-        result = gnome_vfs_open( &handle, (const sal_Char *)aURI,
-                     GNOME_VFS_OPEN_WRITE );
+        result = gnome_vfs_open( &handle, aURI.getStr(), GNOME_VFS_OPEN_WRITE );
     }
 
     if ( result != GNOME_VFS_OK ) {
@@ -1000,7 +999,7 @@ void Content::insert(
              ( GNOME_VFS_PERM_GROUP_WRITE | GNOME_VFS_PERM_GROUP_READ ) );
 
         result = gnome_vfs_create
-            ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_WRITE, TRUE, perm );
+            ( &handle, aURI.getStr(), GNOME_VFS_OPEN_WRITE, TRUE, perm );
     }
 
     if( result != GNOME_VFS_OK )
@@ -1140,7 +1139,7 @@ Content::getInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv )
         ::rtl::OString aURI = getOURI();
         Authentication aAuth( xEnv );
         result = gnome_vfs_get_file_info
-            ( (const sal_Char *)aURI, &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
+            ( aURI.getStr(), &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
         if (result != GNOME_VFS_OK)
             gnome_vfs_file_info_clear( &m_info );
     } else
@@ -1459,7 +1458,7 @@ Content::createTempStream(
         cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv );
 
     result = gnome_vfs_open
-        ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_READ );
+        ( &handle, aURI.getStr(), GNOME_VFS_OPEN_READ );
     if (result != GNOME_VFS_OK)
         cancelCommandExecution( result, xEnv );
 
@@ -1488,7 +1487,7 @@ Content::createInputStream(
         return createTempStream( xEnv );
 
     result = gnome_vfs_open
-        ( &handle, (const sal_Char *)aURI,
+        ( &handle, aURI.getStr(),
           (GnomeVFSOpenMode) (GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM ) );
 
     if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE ||