[Libreoffice-commits] core.git: starmath/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed May 8 20:52:07 UTC 2019


 starmath/source/node.cxx |    1 -
 starmath/source/rect.cxx |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit a9412aaf6b3b64c22b15ec6a83b995f2be78a319
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 8 12:47:57 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 8 22:50:58 2019 +0200

    crashtesting: many asserts in SmTextNode::Prepare
    
    e.g fdo58094-1.mml
    
    since...
    
    commit 13894996601daf10d133f4a71eb0b26794d782bc
    Date:   Sat May 4 21:46:31 2019 +0200
    
        handle empty Rectangle better in starmath
    
    Change-Id: I01d11352b8bc9f6dcf6d6565fa41b84d549f620f
    Reviewed-on: https://gerrit.libreoffice.org/71963
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index fcdcbbdb2e07..eab5ff5ac1a7 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2064,7 +2064,6 @@ void SmTextNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell, i
         SetRectHorAlign( RectHorAlign::Left );
 
     maText = GetToken().aText;
-    assert(!maText.isEmpty());
     GetFont() = rFormat.GetFont(GetFontDesc());
 
     if (IsItalic( GetFont() ))
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 113cf4998a65..ab32022aac2a 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -38,7 +38,6 @@ bool SmGetGlyphBoundRect(const vcl::RenderContext &rDev,
     // basically the same as 'GetTextBoundRect' (in class 'OutputDevice')
     // but with a string as argument.
 {
-    assert(!rText.isEmpty());
     // handle special case first
     if (rText.isEmpty())
     {
@@ -184,7 +183,6 @@ SmRect::SmRect(const OutputDevice &rDev, const SmFormat *pFormat,
     : aTopLeft(0, 0)
     , aSize(rDev.GetTextWidth(rText), rDev.GetTextHeight())
 {
-    assert(!rText.isEmpty());
     const FontMetric  aFM (rDev.GetFontMetric());
     bool              bIsMath  = aFM.GetFamilyName().equalsIgnoreAsciiCase( FONTNAME_MATH );
     bool              bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);


More information about the Libreoffice-commits mailing list