[Libreoffice-commits] core.git: include/tools vcl/source

[Caolán McNamara (via logerrit)]

 include/tools/wintypes.hxx   |    2 +-
 vcl/source/control/fixed.cxx |    4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit ee6548117e617be0a2d4e87671db43a4f97d0027
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 16 16:18:52 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Feb 16 21:16:13 2021 +0100

    WB_HYPHENATION is newly unused
    
    Change-Id: If1fd94b1a0f572fb1bc40f2098079408c9916ce1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110999
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 75557c48acfc..31d85c2ac0cc 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -162,7 +162,7 @@ WinBits const WB_HIDE =                 SAL_CONST_INT64(0x80000000);
 WinBits const WB_AUTOHSCROLL =          SAL_CONST_INT64(0x10000000);
 WinBits const WB_DOCKABLE =             SAL_CONST_INT64(0x20000000);
 WinBits const WB_AUTOVSCROLL =          SAL_CONST_INT64(0x40000000);
-WinBits const WB_HYPHENATION =          SAL_CONST_INT64(0x800000000) | WB_WORDBREAK;
+
 // #i93011# style bit for some child windows, that want their children checked for accelerators
 WinBits const WB_CHILDDLGCTRL =         SAL_CONST_INT64(0x100000000000);
 
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 0482c06f584f..370dabbe6234 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -121,11 +121,7 @@ DrawTextFlags FixedText::ImplGetTextStyle( WinBits nWinStyle )
     else
         nTextStyle |= DrawTextFlags::Top;
     if ( nWinStyle & WB_WORDBREAK )
-    {
         nTextStyle |= DrawTextFlags::WordBreak;
-        if ( (nWinStyle & WB_HYPHENATION ) == WB_HYPHENATION )
-            nTextStyle |= DrawTextFlags::WordBreakHyphenation;
-    }
     if ( nWinStyle & WB_NOLABEL )
         nTextStyle &= ~DrawTextFlags::Mnemonic;