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

[Takeshi Abe]

 starmath/source/mathmlexport.cxx |    4 ++--
 starmath/source/ooxmlexport.cxx  |    2 +-
 starmath/source/rtfexport.cxx    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 252773f2bcd12660875ba72df744054a6e55b253
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Aug 9 18:25:46 2016 +0900

    Expect 3 subnodes for SmBinVerNode/SmBinHorNode/SmBinDiagonalNode
    
    Change-Id: Ib57b60f6b469b3018c5fb30a7a293089bd35e446
    Reviewed-on: https://gerrit.libreoffice.org/28001
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 6abd5be..0567181 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -668,7 +668,7 @@ void SmXMLExport::ExportExpression(const SmNode *pNode, int nLevel,
 
 void SmXMLExport::ExportBinaryVertical(const SmNode *pNode, int nLevel)
 {
-    OSL_ENSURE(pNode->GetNumSubNodes()==3,"Bad Fraction");
+    assert(pNode->GetNumSubNodes() == 3);
     const SmNode *pNum = pNode->GetSubNode(0);
     const SmNode *pDenom = pNode->GetSubNode(2);
     if (pNum->GetType() == NALIGN && pNum->GetToken().eType != TALIGNC)
@@ -692,7 +692,7 @@ void SmXMLExport::ExportBinaryVertical(const SmNode *pNode, int nLevel)
 
 void SmXMLExport::ExportBinaryDiagonal(const SmNode *pNode, int nLevel)
 {
-    OSL_ENSURE(pNode->GetNumSubNodes()==3, "Bad Slash");
+    assert(pNode->GetNumSubNodes() == 3);
 
     if (pNode->GetToken().eType == TWIDESLASH)
     {
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index b387bd6..23529eb 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -140,7 +140,7 @@ void SmOoxmlExport::HandleFractions( const SmNode* pNode, int nLevel, const char
         m_pSerializer->singleElementNS( XML_m, XML_type, FSNS( XML_m, XML_val ), type, FSEND );
         m_pSerializer->endElementNS( XML_m, XML_fPr );
     }
-    OSL_ASSERT( pNode->GetNumSubNodes() == 3 );
+    assert( pNode->GetNumSubNodes() == 3 );
     m_pSerializer->startElementNS( XML_m, XML_num, FSEND );
     HandleNode( pNode->GetSubNode( 0 ), nLevel + 1 );
     m_pSerializer->endElementNS( XML_m, XML_num );
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index d8f9428..b0e947d 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -77,7 +77,7 @@ void SmRtfExport::HandleFractions(const SmNode* pNode, int nLevel, const char* t
         m_pBuffer->append("}"); // mtype
         m_pBuffer->append("}"); // mfPr
     }
-    OSL_ASSERT(pNode->GetNumSubNodes() == 3);
+    assert(pNode->GetNumSubNodes() == 3);
     m_pBuffer->append("{" LO_STRING_SVTOOLS_RTF_MNUM " ");
     HandleNode(pNode->GetSubNode(0), nLevel + 1);
     m_pBuffer->append("}"); // mnum