[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/sfx2

Caolán McNamara caolanm at redhat.com
Wed Sep 4 02:33:32 PDT 2013


 include/sfx2/passwd.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d83630190890969d6a668205d058c69983875a8c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 4 10:31:18 2013 +0100

    revert stray OUString->String conversion
    
    introduced accidentally by a8af548c3be5a42cec7177c60c6d421d2dbc35b4
    
    Change-Id: Ib99e5373a14e95f331ef9f00b9b392633f02d700

diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index b0efa7b..1f10c74 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -73,7 +73,7 @@ private:
     void            SetPasswdText();
 
 public:
-    SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL);
+    SfxPasswordDialog(Window* pParent, const String* pGroupText = NULL);
 
     String GetUser() const
     {


More information about the Libreoffice-commits mailing list