vcl/source/window/msgbox.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
New commits: commit 607e387412606c92a2ebd6fcc1d41743f33a4a72 Author: Ivan Timofeev <[email protected]> Date: Sat Aug 11 19:44:14 2012 +0400 message boxes always showed one line of text restore the old code, use aTextInfo to determine the width, as before. (regression from 2854d8b17cb873a5d61e06f9570ac344f054d666) Change-Id: I91def4db307cb4d1af74d79831afa3b9fd68bcbc diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 2c20bab..8f82b27 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -327,10 +327,8 @@ void MessBox::ImplPosControls() } // Style fuer VCLMultiLineEdit ermitteln - mpVCLMultiLineEdit = new VCLMultiLineEdit( this, nWinStyle ); - mpVCLMultiLineEdit->SetText( aMessText ); - aMEditSize = mpVCLMultiLineEdit->CalcMinimumSize(); - + aMEditSize.Width() = aTextInfo.GetMaxLineWidth()+1; + aMEditSize.Height() = aFormatRect.GetHeight(); aPageSize.Width() = aImageSize.Width(); if ( aMEditSize.Height() < aImageSize.Height() ) { @@ -400,7 +398,8 @@ void MessBox::ImplPosControls() mpCheckBox->Show(); } - + mpVCLMultiLineEdit = new VCLMultiLineEdit( this, nWinStyle ); + mpVCLMultiLineEdit->SetText( aMessText ); mpVCLMultiLineEdit->SetPosSizePixel( aTextPos, aMEditSize ); mpVCLMultiLineEdit->Show(); mpVCLMultiLineEdit->SetPaintTransparent(sal_True); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
