[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/misc/outline.cxx |   27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

New commits:
commit 7f2322afea3b25bc45f438b8ae9d4977ac378c1c
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Feb 19 23:24:58 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Mar 7 18:18:28 2019 +0100

    tdf#123547: do the same as in lcl_DrawBullet from cui/numpages.cxx
    
    See bt https://bugs.documentfoundation.org/attachment.cgi?id=149389
    It seems the method from cui/numpages.cxx takes more things into account
    
    At least, it doesn't crash for the attachment of this tracker
    
    Change-Id: I05ca0b019ac483890bea4acdbb695d73b660e638
    Reviewed-on: https://gerrit.libreoffice.org/68033
    Tested-by: Jenkins
    (cherry picked from commit 684fcf2fce915f3e3e553c67fb57bdbfc8f159d5)
    Reviewed-on: https://gerrit.libreoffice.org/68843
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 112d35de150d..d4b3cce6bc8f 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -823,13 +823,30 @@ static long lcl_DrawBullet(vcl::RenderContext* pVDev, const SwNumFormat& rFormat
 {
     vcl::Font aTmpFont(pVDev->GetFont());
 
-    vcl::Font aFont(*rFormat.GetBulletFont());
-    aFont.SetFontSize(rSize);
+    // via Uno it's possible that no font has been set!
+    vcl::Font aFont(rFormat.GetBulletFont() ? *rFormat.GetBulletFont() : aTmpFont);
+    Size aTmpSize(rSize);
+    aTmpSize.setWidth( aTmpSize.Width() * ( rFormat.GetBulletRelSize()) );
+    aTmpSize.setWidth( aTmpSize.Width() / 100 ) ;
+    aTmpSize.setHeight( aTmpSize.Height() * ( rFormat.GetBulletRelSize()) );
+    aTmpSize.setHeight( aTmpSize.Height() / 100 ) ;
+    // in case of a height of zero it is drawn in original height
+    if(!aTmpSize.Height())
+        aTmpSize.setHeight( 1 );
+    aFont.SetFontSize(aTmpSize);
     aFont.SetTransparent(true);
-    pVDev->SetFont(aFont);
+    Color aBulletColor = rFormat.GetBulletColor();
+    if(aBulletColor == COL_AUTO)
+        aBulletColor = pVDev->GetFillColor().IsDark() ? COL_WHITE : COL_BLACK;
+    else if(aBulletColor == pVDev->GetFillColor())
+        aBulletColor.Invert();
+    aFont.SetColor(aBulletColor);
+    pVDev->SetFont( aFont );
     OUString aText(rFormat.GetBulletChar());
-    pVDev->DrawText(Point(nXStart, nYStart), aText);
-    const long nRet = pVDev->GetTextWidth(aText);
+    long nY = nYStart;
+    nY -= ((aTmpSize.Height() - rSize.Height())/ 2);
+    pVDev->DrawText( Point(nXStart, nY), aText );
+    long nRet = pVDev->GetTextWidth(aText);
 
     pVDev->SetFont(aTmpFont);
     return nRet;