[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - filter/source sfx2/inc sfx2/source

[Kohei Yoshida]

 filter/source/pdf/impdialog.cxx |    1 +
 sfx2/inc/sfx2/passwd.hxx        |    3 +++
 sfx2/source/dialog/passwd.cxx   |    5 +++++
 3 files changed, 9 insertions(+)

New commits:
commit f26d3e43e8ead5c978a7efd1c7a84c8cd0a2758b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Jan 31 10:06:07 2013 -0500

    bnc#437516: Hide minimum password info in the password dialog.
    
    When launching it from the Security tab of the PDF Options dialog
    during PDF export.
    
    Change-Id: Ife2d3a7b508ba2e077018d11478ad680d18d3f0d
    Reviewed-on: https://gerrit.libreoffice.org/1946
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 870209f..1304c5e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1288,6 +1288,7 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl)
 {
     SfxPasswordDialog aPwdDialog( this, &msUserPwdTitle );
     aPwdDialog.SetMinLen( 0 );
+    aPwdDialog.ShowMinLengthText(false);
     aPwdDialog.ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 | SHOWEXTRAS_CONFIRM2 );
     aPwdDialog.SetText( maStrSetPwd );
     aPwdDialog.SetGroup2Text( msOwnerPwdTitle );
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 856916a..1f10c74 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -112,6 +112,9 @@ public:
     {
         mbAsciiOnly = i_bAsciiOnly;
     }
+
+    void ShowMinLengthText(bool bShow);
+
     virtual short Execute();
 };
 
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 39b4096..40d6d08 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -148,6 +148,11 @@ void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
     EditModifyHdl( NULL );
 }
 
+void SfxPasswordDialog::ShowMinLengthText(bool bShow)
+{
+    mpMinLengthFT->Show(bShow);
+}
+
 // -----------------------------------------------------------------------
 
 short SfxPasswordDialog::Execute()