[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - filter/source sfx2/inc sfx2/source

[Kohei Yoshida]

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

New commits:
commit 2a5f20470513da71adb9ba8d1fae5bee777d7389
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.
    
    Conflicts:
    	sfx2/inc/sfx2/passwd.hxx
    
    Change-Id: Ife2d3a7b508ba2e077018d11478ad680d18d3f0d

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 03de749..ab9bbb8 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1246,6 +1246,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 2e07153..f86275f 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -97,6 +97,8 @@ public:
     void            ShowExtras( sal_uInt16 nExtras ) { mnExtras = nExtras; }
     void            AllowAsciiOnly( bool i_bAsciiOnly = true ) { 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 681d368..eee8eaa 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -222,6 +222,11 @@ void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
     EditModifyHdl( NULL );
 }
 
+void SfxPasswordDialog::ShowMinLengthText(bool bShow)
+{
+    maMinLengthFT.Show(bShow);
+}
+
 // -----------------------------------------------------------------------
 
 short SfxPasswordDialog::Execute()