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

[Takeshi Abe]

 starmath/source/rect.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3bec0fd8cd191c47ab94602470193ef56a05f444
Author: Takeshi Abe <t...@fixedpoint.jp>
Date:   Mon Feb 13 23:23:11 2017 +0900

    starmath: This condition always holds
    
    Change-Id: I6d47676dc71644766fdaea7033c53efa0bf9b549
    Reviewed-on: https://gerrit.libreoffice.org/34212
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Takeshi Abe <t...@fixedpoint.jp>

diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 54ceb6e..511f4f6 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -480,11 +480,12 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, 
RectCopyMBL eCopyMode)
     if (!HasAlignInfo())
         CopyAlignInfo(rRect);
     else if (rRect.HasAlignInfo())
-    {   nAlignT = std::min(GetAlignT(), rRect.GetAlignT());
+    {
+        assert(HasAlignInfo());
+        nAlignT = std::min(GetAlignT(), rRect.GetAlignT());
         nAlignB = std::max(GetAlignB(), rRect.GetAlignB());
         nHiAttrFence = std::min(GetHiAttrFence(), rRect.GetHiAttrFence());
         nLoAttrFence = std::max(GetLoAttrFence(), rRect.GetLoAttrFence());
-        OSL_ENSURE(HasAlignInfo(), "Sm: ooops...");
 
         switch (eCopyMode)
         {   case RectCopyMBL::This:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits