[Libreoffice-commits] core.git: ucb/source

[Vitaliy Anderson]

 ucb/source/ucp/webdav-neon/NeonSession.cxx |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit c12035df53f5031bd9f1840153b67e6189f3dea3
Author: Vitaliy Anderson <vanderson at smartru.com>
Date:   Thu Mar 30 17:11:32 2017 +0300

    NeonSession_NeonAuth(): avoid redundant OUString->OString conversion
    
    Change-Id: I6b8515c25d58a88a040d4e08e36ffbd442228828
    Reviewed-on: https://gerrit.libreoffice.org/35915
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 7e21205e6b59..8f6a625ccfee 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -311,27 +311,23 @@ extern "C" int NeonSession_NeonAuth( void *       inUserData,
                             thePassWord,
                             bCanUseSystemCreds);
 
-    OString aUser(
-        OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) );
+    OString aUser( OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) );
     if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) )
     {
         SAL_WARN( "ucb.ucp.webdav", "NeonSession_NeonAuth - username too long!" );
         return -1;
     }
 
-    OString aPass(
-        OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) );
+    OString aPass( OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) );
     if ( aPass.getLength() > ( NE_ABUFSIZ - 1 ) )
     {
         SAL_WARN( "ucb.ucp.webdav", "NeonSession_NeonAuth - password too long!" );
         return -1;
     }
 
-    strcpy( inoutUserName, // #100211# - checked
-            OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
-    strcpy( inoutPassWord, // #100211# - checked
-            OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() );
+    // #100211# - checked
+    strcpy( inoutUserName, aUser.getStr() );
+    strcpy( inoutPassWord, aPass.getStr() );
 
     return theRetVal;
 }