--- sfx2/inc/sfx2/passwd.hxx.orig	2007-08-30 13:37:21.000000000 -0400
+++ sfx2/inc/sfx2/passwd.hxx.orig	2007-08-30 15:00:41.000000000 -0400
@@ -74,6 +74,7 @@ 
 	Edit			maPasswordED;
 	FixedText		maConfirmFT;
 	Edit			maConfirmED;
+    FixedText		maMinLengthFT;
     FixedLine       maPasswordBox;
 
 	OKButton		maOKBtn;
@@ -82,12 +83,16 @@ 
 
 	String			maConfirmStr;
 	USHORT			mnMinLen;
+    String			maMinLenPwdStr;
+    String			maEmptyPwdStr;
+    String			maMainPwdStr;
 	USHORT			mnExtras;
 
 //#if 0 // _SOLAR__PRIVATE
 	DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* );
 	DECL_DLLPRIVATE_LINK( OKHdl, OKButton* );
 //#endif
+    void			SetPasswdText();
 
 public:
 	SfxPasswordDialog( Window* pParent, const String* pGroupText = NULL );
--- sfx2/source/dialog/passwd.cxx.orig	2007-08-30 13:37:07.000000000 -0400
+++ sfx2/source/dialog/passwd.cxx.orig	2007-08-30 14:05:12.000000000 -0400
@@ -100,6 +100,7 @@ 
 	maPasswordED	( this, SfxResId( ED_PASSWD_PASSWORD ) ),
 	maConfirmFT		( this, SfxResId( FT_PASSWD_CONFIRM ) ),
 	maConfirmED		( this, SfxResId( ED_PASSWD_CONFIRM ) ),
+    maMinLengthFT	( this, SfxResId( FT_PASSWD_MINLEN ) ),
 	maPasswordBox	( this, SfxResId( GB_PASSWD_PASSWORD ) ),
 	maOKBtn			( this, SfxResId( BTN_PASSWD_OK ) ),
 	maCancelBtn		( this, SfxResId( BTN_PASSWD_CANCEL ) ),
@@ -107,6 +108,9 @@ 
 	maConfirmStr	( 		SfxResId( STR_PASSWD_CONFIRM ) ),
 
 	mnMinLen		( 5 ),
+    maMinLenPwdStr	( SfxResId( STR_PASSWD_MIN_LEN ) ),
+    maEmptyPwdStr	( SfxResId( STR_PASSWD_EMPTY ) ),
+    maMainPwdStr    ( ),
 	mnExtras		( 0 )
 
 {
@@ -119,6 +123,25 @@ 
 
 	if ( pGroupText )
 		  maPasswordBox.SetText( *pGroupText );
+	
+//set the text to the pasword length
+	SetPasswdText();
+}
+
+// -----------------------------------------------------------------------
+
+void SfxPasswordDialog::SetPasswdText( )
+{
+//set the new string to the minimum password length
+	if( mnMinLen == 0 )
+		maMinLengthFT.SetText( maEmptyPwdStr );
+	else
+	{
+		maMainPwdStr = maMinLenPwdStr;
+		maMainPwdStr.SearchAndReplace( String::CreateFromAscii( "$(MINLEN)" ), String::CreateFromInt32((sal_Int32) mnMinLen ), 0);
+		maMinLengthFT.SetText( maMainPwdStr );
+		maMinLengthFT.Show();
+	}	
 }
 
 // -----------------------------------------------------------------------
@@ -126,6 +149,7 @@ 
 void SfxPasswordDialog::SetMinLen( USHORT nLen )
 {
 	mnMinLen = nLen;
+	SetPasswdText();
 	EditModifyHdl( NULL );
 }
 
@@ -176,8 +200,10 @@ 
 			aPos = maUserED.GetPosPixel();
 			maPasswordED.SetPosPixel( aPos );
 
+			aPos = maConfirmFT.GetPosPixel();
 			maConfirmFT.SetPosPixel( aPwdPos1 );
 			maConfirmED.SetPosPixel( aPwdPos2 );
+			maMinLengthFT.SetPosPixel(aPos);
 		}
 
 		Size aBoxSize = maPasswordBox.GetSizePixel();
@@ -44,12 +44,15 @@ 
 #define ED_PASSWD_PASSWORD 14
 #define FT_PASSWD_CONFIRM 15
 #define ED_PASSWD_CONFIRM 16
+#define FT_PASSWD_MINLEN 17
 
 #define BTN_PASSWD_OK 20
 #define BTN_PASSWD_CANCEL 21
 #define BTN_PASSWD_HELP 22
 
 #define STR_PASSWD_CONFIRM 30
+#define STR_PASSWD_MIN_LEN	31
+#define STR_PASSWD_EMPTY	32
 
 #endif
 
Index: sfx2/source/dialog/passwd.src
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/passwd.src,v
--- sfx2/source/dialog/passwd.src	23 Sep 2005 15:25:58 -0000	1.27
+++ sfx2/source/dialog/passwd.src	29 Jul 2006 11:50:09 -0000
@@ -91,6 +91,22 @@ ModalDialog DLG_PASSWD
 		Pos = MAP_APPFONT( 57, 44 );
 		Size = MAP_APPFONT( 75, 12 );
 	};
+	
+	String STR_PASSWD_MIN_LEN
+	{
+		Text [ en-US ] = "(Minimum $(MINLEN) characters)" ;
+	};
+	String STR_PASSWD_EMPTY
+	{
+		Text [ en-US ] = "(The password can be empty)" ;
+	};
+	
+	FixedText FT_PASSWD_MINLEN
+	{
+		Pos = MAP_APPFONT(12, 65 );
+		Size = MAP_APPFONT( 126, 10 );
+	};
+	
     FixedLine GB_PASSWD_PASSWORD
 	{
 		Pos = MAP_APPFONT( 6, 3 );