String => OUString conversion of svl's PasswordHelper

Change-Id: I7e107c37c43a8c9d868b579a2c389de558594a77

svl/inc/svl/PasswordHelper.hxx

@@ -24,23 +24,21 @@
 #include "sal/types.h"
 #include "com/sun/star/uno/Sequence.hxx"
 
-class String;
-
 class SvPasswordHelper
 {
-    static void     GetHashPasswordLittleEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass);
-    static void     GetHashPasswordBigEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass);
+    static void     GetHashPasswordLittleEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
+    static void     GetHashPasswordBigEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
 
 public:
     SVL_DLLPUBLIC static void     GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen);
 
-    SVL_DLLPUBLIC static void     GetHashPassword(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass);
+    SVL_DLLPUBLIC static void     GetHashPassword(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
     /**
     Use this method to compare a given string with another given Hash value.
     This is necessary, because in older versions exists different hashs of the same string. They were endian dependent.
     We need this to handle old files. This method will compare against big and little endian. See #101326#
     */
-    SVL_DLLPUBLIC static bool     CompareHashPassword(const com::sun::star::uno::Sequence<sal_Int8>& rOldPassHash, const String& sNewPass);
+    SVL_DLLPUBLIC static bool     CompareHashPassword(const com::sun::star::uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass);
 };
 
 #endif

svl/qa/unit/svl.cxx

@@ -262,7 +262,7 @@ void Test::testNumberFormat()
         }
     }
 
-    xub_StrLen nPos;
+    sal_Int32 nPos;
     short nType = NUMBERFORMAT_DEFINED;
     sal_uInt32 nKey;
     OUString aCode;

svl/source/misc/PasswordHelper.cxx

@@ -20,7 +20,6 @@
 
 #include <svl/PasswordHelper.hxx>
 #include <rtl/digest.h>
-#include <tools/string.hxx>
 
 using namespace com::sun::star;
 
@@ -35,14 +34,14 @@ void SvPasswordHelper::GetHashPassword(uno::Sequence<sal_Int8>& rPassHash, const
     }
 }
 
-void SvPasswordHelper::GetHashPasswordLittleEndian(uno::Sequence<sal_Int8>& rPassHash, const String& sPass)
+void SvPasswordHelper::GetHashPasswordLittleEndian(uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass)
 {
-    xub_StrLen nSize(sPass.Len());
+    sal_Int32 nSize(sPass.getLength());
     sal_Char* pCharBuffer = new sal_Char[nSize * sizeof(sal_Unicode)];
 
-    for (xub_StrLen i = 0; i < nSize; ++i)
+    for (sal_Int32 i = 0; i < nSize; ++i)
     {
-        sal_Unicode ch(sPass.GetChar(i));
+        sal_Unicode ch(sPass[ i ]);
         pCharBuffer[2 * i] = static_cast< sal_Char >(ch & 0xFF);
         pCharBuffer[2 * i + 1] = static_cast< sal_Char >(ch >> 8);
     }
@@ -52,14 +51,14 @@ void SvPasswordHelper::GetHashPasswordLittleEndian(uno::Sequence<sal_Int8>& rPas
     delete[] pCharBuffer;
 }
 
-void SvPasswordHelper::GetHashPasswordBigEndian(uno::Sequence<sal_Int8>& rPassHash, const String& sPass)
+void SvPasswordHelper::GetHashPasswordBigEndian(uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass)
 {
-    xub_StrLen nSize(sPass.Len());
+    sal_Int32 nSize(sPass.getLength());
     sal_Char* pCharBuffer = new sal_Char[nSize * sizeof(sal_Unicode)];
 
-    for (xub_StrLen i = 0; i < nSize; ++i)
+    for (sal_Int32 i = 0; i < nSize; ++i)
     {
-        sal_Unicode ch(sPass.GetChar(i));
+        sal_Unicode ch(sPass[ i ]);
         pCharBuffer[2 * i] = static_cast< sal_Char >(ch >> 8);
         pCharBuffer[2 * i + 1] = static_cast< sal_Char >(ch & 0xFF);
     }
@@ -69,12 +68,12 @@ void SvPasswordHelper::GetHashPasswordBigEndian(uno::Sequence<sal_Int8>& rPassHa
     delete[] pCharBuffer;
 }
 
-void SvPasswordHelper::GetHashPassword(uno::Sequence<sal_Int8>& rPassHash, const String& sPass)
+void SvPasswordHelper::GetHashPassword(uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass)
 {
     GetHashPasswordLittleEndian(rPassHash, sPass);
 }
 
-bool SvPasswordHelper::CompareHashPassword(const uno::Sequence<sal_Int8>& rOldPassHash, const String& sNewPass)
+bool SvPasswordHelper::CompareHashPassword(const uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass)
 {
     bool bResult = false;