diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:58:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:58:41 +0000 |
| commit | 6562ed1ea211e5921993a6662ff8feecba4961de (patch) | |
| tree | 3867f5cb978bfb75001cd988f51643f63270e9fc | |
| parent | d06d075c11112fe9d3597fe12a175d2361a25f2e (diff) | |
INTEGRATION: CWS dba31a (1.23.64); FILE MERGED
2008/07/30 12:08:01 fs 1.23.64.2: RESYNC: (1.23-1.24); FILE MERGED
2008/06/09 10:20:50 oj 1.23.64.1: #i88506# insert new flag to offer word boundary breaks
| -rw-r--r-- | vcl/source/control/fixed.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 44f46dc47c1f..a3b26de8314d 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fixed.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.25 $ * * This file is part of OpenOffice.org. * @@ -228,7 +228,11 @@ USHORT FixedText::ImplGetTextStyle( WinBits nWinStyle ) else nTextStyle |= TEXT_DRAW_TOP; if ( nWinStyle & WB_WORDBREAK ) + { nTextStyle |= TEXT_DRAW_WORDBREAK; + if ( nWinStyle & WB_HYPHENATION ) + nTextStyle |= TEXT_DRAW_WORDBREAK_HYPHENATION; + } if ( nWinStyle & WB_NOLABEL ) nTextStyle &= ~TEXT_DRAW_MNEMONIC; |