CWS-TOOLING: integrate CWS fwk92

2008-12-04 14:43:28 +0100 oc  r264844 : #i96788#
2008-12-03 02:15:17 +0100 fredrikh  r264734 : i96817
2008-12-02 16:42:46 +0100 tbo  r264720 : #i96763# changes to password dialog for framework, math, global
2008-11-26 16:26:28 +0100 mav  r264418 : #i93617# fix typo
2008-11-26 16:13:03 +0100 mav  r264411 : #i93617# fix the linux scenario
2008-11-25 17:58:01 +0100 mav  r264323 : #i93617# fix the windows problems
2008-11-25 17:51:33 +0100 mav  r264321 : #i93617# fix the windows problems
2008-11-21 16:01:18 +0100 mav  r264145 : #i78753# integrate the patch
2008-11-21 14:08:32 +0100 mav  r264136 : #i93617# integrate the patch
2008-11-21 13:01:56 +0100 mav  r264127 : #i82947# integrate the patch
2008-11-20 18:14:19 +0100 mav  r264092 : #i95793# look for import filter
2008-11-18 15:23:44 +0100 pb  r263776 : fix: #i92579# #i92583# SvxSecurity/SearchPage: more space for controls
2008-11-18 15:21:39 +0100 pb  r263774 : fix: #i92579# #i92583# SvxSecurity/SearchPage: more space for controls
2008-11-18 15:18:54 +0100 pb  r263772 : fix: #i92583# SvxSearchPage::InitControls_Impl() added
2008-11-18 15:16:07 +0100 pb  r263771 : fix: #i92579# columns calculated newly
2008-11-18 11:09:28 +0100 mav  r263751 : #i21923# small fixes
2008-11-17 17:22:04 +0100 mav  r263730 : #i21923# integrate the patch
2008-11-17 14:29:02 +0100 mav  r263723 : #i21923# integrate the patch
2008-11-13 16:46:08 +0100 mav  r263653 : #i88127# integrate the patch
2008-11-13 14:46:56 +0100 mav  r263645 : #i54638# integrate the patch
2008-11-11 13:11:03 +0100 pb  r263554 : fix: #i93142# disable maRecommReadOnlyCB on read-only documents
2008-11-10 13:30:58 +0100 pb  r263516 : fix: #i93833# Mozilla Plug-in -> Browser Plug-in
2008-11-10 13:29:10 +0100 pb  r263515 : fix: #i93833# Mozilla Plug-in -> Browser Plug-in
2008-11-10 06:10:11 +0100 pb  r263505 : fix: #i94937# now .uno.ExtendedHelp without image
2008-11-04 20:52:50 +0100 mav  r263337 : migrate cws fwk92 to svn

1 files changed, 45 insertions, 19 deletions

diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
index 93e221c13c1d..e9af0645619b 100644
--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@@ -61,7 +61,6 @@ IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
         String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
         ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
         aErrorBox.Execute();
-        aEDPasswordCrt.SetText( String() );
         aEDPasswordRepeat.SetText( String() );
         aEDPasswordCrt.GrabFocus();
     }
@@ -70,23 +69,19 @@ IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-PasswordCreateDialog::PasswordCreateDialog
-(
-    Window*                                     pParent,
-    ResMgr*                                     pResMgr
-) :
-
-    ModalDialog( pParent, ResId( DLG_UUI_PASSWORD_CRT, *pResMgr ) ),
-
-    aFTPasswordCrt      ( this, ResId( FT_PASSWORD_CRT, *pResMgr ) ),
-    aEDPasswordCrt      ( this, ResId( ED_PASSWORD_CRT, *pResMgr ) ),
-    aFTPasswordRepeat   ( this, ResId( FT_PASSWORD_REPEAT, *pResMgr ) ),
-    aEDPasswordRepeat   ( this, ResId( ED_PASSWORD_REPEAT, *pResMgr ) ),
-    aOKBtn                  ( this, ResId( BTN_PASSCRT_OK, *pResMgr ) ),
-    aCancelBtn              ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr ) ),
-    aHelpBtn                ( this, ResId( BTN_PASSCRT_HELP, *pResMgr ) ),
-    pResourceMgr            ( pResMgr ),
-    nMinLen(5)
+PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr )
+    :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD_CRT, *pResMgr ) )
+    ,aFTPasswordCrt           ( this, ResId( FT_PASSWORD_CRT, *pResMgr )             )
+    ,aEDPasswordCrt       ( this, ResId( ED_PASSWORD_CRT, *pResMgr )        )
+    ,aFTPasswordRepeat           ( this, ResId( FT_PASSWORD_REPEAT, *pResMgr )             )
+    ,aEDPasswordRepeat       ( this, ResId( ED_PASSWORD_REPEAT, *pResMgr )        )
+    ,aFTWarning           ( this, ResId( FT_PASSWORD_WARNING, *pResMgr )             )
+    ,aFixedLine1       ( this, ResId( FL_FIXED_LINE_1, *pResMgr )        )
+    ,aOKBtn   ( this, ResId( BTN_PASSCRT_OK, *pResMgr )    )
+    ,aCancelBtn   ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr )    )
+    ,aHelpBtn   ( this, ResId( BTN_PASSCRT_HELP, *pResMgr )    )
+    ,pResourceMgr           ( pResMgr )
+    ,nMinLen(5)
 {
     FreeResource();
 
@@ -94,5 +89,36 @@ PasswordCreateDialog::PasswordCreateDialog
     aEDPasswordCrt.SetModifyHdl( LINK( this, PasswordCreateDialog, EditHdl_Impl ) );
 
     aOKBtn.Enable( sal_False );
-};
 
+    long nLabelWidth = aFTWarning.GetSizePixel().Width();
+    long nLabelHeight = aFTWarning.GetSizePixel().Height();
+    long nTextWidth = aFTWarning.GetCtrlTextWidth( aFTWarning.GetText() );
+    long nTextHeight = aFTWarning.GetTextHeight();
+
+    Rectangle aLabelRect( aFTWarning.GetPosPixel(), aFTWarning.GetSizePixel() );
+    Rectangle aRect = aFTWarning.GetTextRect( aLabelRect, aFTWarning.GetText() );
+
+    long nNewLabelHeight = 0;
+    for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
+        nNewLabelHeight < aRect.GetHeight();
+        nNewLabelHeight += nTextHeight );
+
+    long nDelta = nNewLabelHeight - nLabelHeight;
+
+    Size aNewDlgSize = GetSizePixel();
+    aNewDlgSize.Height() += nDelta;
+    SetSizePixel( aNewDlgSize );
+
+    Size aNewWarningSize = aFTWarning.GetSizePixel();
+    aNewWarningSize.Height() = nNewLabelHeight;
+    aFTWarning.SetPosSizePixel( aFTWarning.GetPosPixel(), aNewWarningSize );
+
+    Window* pControls[] = { &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn };
+    const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] );
+    for ( int i = 0; i < nCCount; ++i )
+    {
+        Point aNewPos =(*pControls[i]).GetPosPixel();
+        aNewPos.Y() += nDelta;
+        pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
+    }
+}