diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
commit | ca39c0ee5fb571693f96fe32f55b814d74e5b756 (patch) | |
tree | 61059dca291da35c9eac7e275d0866598eeff2ee /sfx2/source/dialog | |
parent | 9e1f58bf469984c19cd60031074eb60da56453a2 (diff) | |
parent | d974d2ada8a61acf48fb0a9e3e4fa4744016dcda (diff) |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/passwd.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index c5e41227896a..41a5de5650f1 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -165,6 +165,9 @@ SfxPasswordDialog::SfxPasswordDialog( Window* pParent, const String* pGroupText // add second confirm line xEdits->addRow( &maConfirm2FT, &maConfirm2ED, -2, aEditSize ); + // add password length warning line + xEdits->addWindow( &maMinLengthFT ); + // add a FixedLine FixedLine* pLine = new FixedLine( this, 0 ); pLine->Show(); |