cws tl78: #i109634# additional dialog parameter

4 files changed, 15 insertions, 8 deletions

diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 6f2f275c16fd..c73770e9a5a5 100755
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -135,7 +135,8 @@ struct PasswordToOpenModifyDialog_Impl
 //    DECL_LINK( ModifyHdl, Edit * );
     DECL_LINK( OkBtnClickHdl, OKButton * );
 
-    PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen );
+    PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent,
+            sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
     ~PasswordToOpenModifyDialog_Impl();
 };
 
@@ -143,7 +144,8 @@ struct PasswordToOpenModifyDialog_Impl
 PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         PasswordToOpenModifyDialog * pParent,
         sal_uInt16 nMinPasswdLen,
-        sal_uInt16 nMaxPasswdLen ) :
+        sal_uInt16 nMaxPasswdLen,
+        bool bIsPasswordToModify ) :
     m_pParent( pParent ),
     m_aFileEncryptionFL         ( pParent, CUI_RES( FL_FILE_ENCRYPTION ) ),
     m_aPasswdToOpenFT           ( pParent, CUI_RES( FT_PASSWD_TO_OPEN ) ),
@@ -202,6 +204,8 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
     m_aPasswdToOpenED.GrabFocus();
 
 //    ModifyHdl( NULL );
+
+    m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify );
 }
 
 
@@ -287,11 +291,12 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG
 PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(
         Window * pParent,
         sal_uInt16 nMinPasswdLen,
-        sal_uInt16 nMaxPasswdLen ) :
+        sal_uInt16 nMaxPasswdLen,
+        bool bIsPasswordToModify ) :
     SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) )
 {
     m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >(
-            new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen ) );
+            new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) );
 
     FreeResource();
 }
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 2330c8f6ac02..bb3983e02d56 100755
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1970,9 +1970,9 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind
 
 AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog(
     Window * pParent,
-    sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen )
+    sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify )
 {
-    PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen );
+    PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify );
     return new AbstractPasswordToOpenModifyDialog_Impl( pDlg );
 }
 
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 21af7a838417..efe7c0763d9d 100755
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -810,7 +810,7 @@ public:
 
     virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId );
 
-    virtual AbstractPasswordToOpenModifyDialog *    CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen  );
+    virtual AbstractPasswordToOpenModifyDialog *    CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
 };
 
 #endif
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index d28cc4548a59..337c9b84da11 100755
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -45,7 +45,9 @@ class PasswordToOpenModifyDialog : public SfxModalDialog
     PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & );
 
 public:
-    PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */);
+    PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen,
+            sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */,
+            bool bIsPasswordToModify );
     virtual ~PasswordToOpenModifyDialog();
 
     // AbstractPasswordToOpenModifyDialog