[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Niklas Johansson]

 vcl/source/window/layout.cxx |    2 +-
 vcl/source/window/msgbox.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9826dec6f6021dba9859458acb0eb04520e5979a
Author: Niklas Johansson <sleeping.pillow at gmail.com>
Date:   Tue Nov 5 11:19:06 2013 +0100

    Resolves: fdo#70588 MultiLineEdits don't need WB_WORDBREAK set
    
    and inherits from Edit which reuses that same bit for password
    
    Change-Id: I8add146fdbc1b3402b5409f01f75c620da25a313
    Reviewed-on: https://gerrit.libreoffice.org/6579
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit af93243d06d81e996c1fae92190bc9622503e25b)
    Reviewed-on: https://gerrit.libreoffice.org/6589
    Reviewed-by: Niklas Johansson <sleeping.pillow at gmail.com>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 64787d2..9b1d56f 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1821,7 +1821,7 @@ short MessageDialog::Execute()
         m_pImage->set_valign(VCL_ALIGN_START);
         m_pImage->Show();
 
-        WinBits nWinStyle = WB_LEFT | WB_VCENTER | WB_WORDBREAK | WB_NOLABEL | WB_NOTABSTOP;
+        WinBits nWinStyle = WB_LEFT | WB_VCENTER | WB_NOLABEL | WB_NOTABSTOP;
 
         m_pPrimaryMessage = new VclMultiLineEdit(m_pGrid, nWinStyle);
         m_pPrimaryMessage->SetPaintTransparent(true);
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 9e27767..28ad892 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -234,7 +234,7 @@ void MessBox::ImplPosControls()
     long            nMaxWidth = GetDesktopRectPixel().GetWidth()-8;
     long            nMaxLineWidth;
     long            nWidth;
-    WinBits         nWinStyle = WB_LEFT | WB_WORDBREAK | WB_NOLABEL;
+    WinBits         nWinStyle = WB_LEFT | WB_NOLABEL;
     sal_uInt16          nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | TEXT_DRAW_LEFT;
 
     delete mpVCLMultiLineEdit;