[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - editeng/source

[Caolán McNamara (via logerrit)]

 editeng/source/items/svxfont.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 403de153e12fced8f0564b400b4f434a8101b259
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Aug 21 13:19:36 2023 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Aug 28 21:46:28 2023 +0200

    character preview is drawing two overlines for Small Caps
    
    we already handle the underline and strikethrough case, so add
    the overline case here too
    
    Change-Id: I9ca0a5623a559e0cde07437439aa372e3c517159
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155894
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit 19281c62b5e315da422318dbc9d4ba619a6eeab5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155927
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 5b19e17f37f53f769b84f3747a50c5092d162616)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156000
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index b484a645a7f6..1372869442f2 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -818,8 +818,10 @@ void SvxDoDrawCapital::Do( const OUString &_rTxt, const 
sal_Int32 _nIdx,
 
     // Set the desired font
     FontLineStyle eUnder = pFont->GetUnderline();
+    FontLineStyle eOver = pFont->GetOverline();
     FontStrikeout eStrike = pFont->GetStrikeout();
     pFont->SetUnderline( LINESTYLE_NONE );
+    pFont->SetOverline( LINESTYLE_NONE );
     pFont->SetStrikeout( STRIKEOUT_NONE );
     if ( !bUpper )
     {
@@ -840,6 +842,7 @@ void SvxDoDrawCapital::Do( const OUString &_rTxt, const 
sal_Int32 _nIdx,
 
     // Restore Font
     pFont->SetUnderline( eUnder );
+    pFont->SetOverline( eOver );
     pFont->SetStrikeout( eStrike );
     if ( !bUpper )
         pFont->SetPropr( nProp );