convert include/sfx2/passwd.hxx from String to OUString

Change-Id: I0c290baa3aa6cb09455109f243e06bb6938aca8f

4 files changed, 12 insertions, 12 deletions

diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index b0efa7bc147c..21c5e0107fe1 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -60,9 +60,9 @@ private:
 
     OKButton*       mpOKBtn;
 
-    String          maMinLenPwdStr;
-    String          maEmptyPwdStr;
-    String          maMainPwdStr;
+    OUString        maMinLenPwdStr;
+    OUString        maEmptyPwdStr;
+    OUString        maMainPwdStr;
     sal_uInt16      mnMinLen;
     sal_uInt16      mnExtras;
 
@@ -75,27 +75,27 @@ private:
 public:
     SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL);
 
-    String GetUser() const
+    OUString GetUser() const
     {
         return mpUserED->GetText();
     }
-    String GetPassword() const
+    OUString GetPassword() const
     {
         return mpPassword1ED->GetText();
     }
-    String GetConfirm() const
+    OUString GetConfirm() const
     {
         return mpConfirm1ED->GetText();
     }
-    String GetPassword2() const
+    OUString GetPassword2() const
     {
         return mpPassword2ED->GetText();
     }
-    String GetConfirm2() const
+    OUString GetConfirm2() const
     {
         return mpConfirm2ED->GetText();
     }
-    void SetGroup2Text(const String& i_rText)
+    void SetGroup2Text(const OUString& i_rText)
     {
         mpPassword2Box->set_label(i_rText);
     }
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index a9a0fe5bc5b0..2aa8122fac1a 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -134,7 +134,7 @@ void SfxPasswordDialog::SetPasswdText( )
     else
     {
         maMainPwdStr = maMinLenPwdStr;
-        maMainPwdStr.SearchAndReplace( OUString("$(MINLEN)"), OUString::number((sal_Int32) mnMinLen ), 0);
+        maMainPwdStr = maMainPwdStr.replaceAll( "$(MINLEN)", OUString::number((sal_Int32) mnMinLen ) );
         mpMinLengthFT->SetText(maMainPwdStr);
     }
 }
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 46f33f5edfa4..334ad5499e68 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -103,7 +103,7 @@ static short lcl_GetPassword(
     aPasswdDlg.SetMinLen( 1 );
     if (bProtect)
         aPasswdDlg.ShowExtras( SHOWEXTRAS_CONFIRM );
-    if (RET_OK == aPasswdDlg.Execute() && aPasswdDlg.GetPassword().Len() > 0)
+    if (RET_OK == aPasswdDlg.Execute() && !aPasswdDlg.GetPassword().isEmpty())
     {
         rPassword = aPasswdDlg.GetPassword();
         bRes = true;
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 8006173ee04e..a79e1aacec43 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -312,7 +312,7 @@ throw (RuntimeException)
             aPasswdDlg.SetMinLen(0);
             if(!aPasswdDlg.Execute())
                 return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
-            msPassword = aPasswdDlg.GetPassword().GetBuffer();
+            msPassword = aPasswdDlg.GetPassword().getStr();
             aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8);
             if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
                 break;