diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 17:44:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 08:55:56 +0100 |
| commit | 7af733d9ef65fddd12ef5fae82808ba2f7f608df (patch) | |
| tree | 360afc7f8c5b7963730885255f631c9896f683b4 /lotuswordpro | |
| parent | 05f5c4d4d6addf5321a40595f598e55dce376f6f (diff) | |
tweak assert so comment appears in abort message
Change-Id: Ibf78e5cd1620f0b61cae030e3870be4a6f87e71d
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.cxx | 2 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawline.cxx | 2 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawobj.cxx | 2 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/xfilter/xfframe.cxx | 2 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/xfilter/xfimage.cxx | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index a44d0ae8c73f..825648a5c91e 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -611,14 +611,12 @@ void LwpParaStyle::ApplyTab(XFParaStyle *pParaStyle, LwpTabOverride *pTabOverRid LwpObjectID& rTabRackID = pTabOverRide->GetTabRackID(); if(rTabRackID.IsNull()) { - //assert(false); return; } LwpTabRack* pTabRack = dynamic_cast<LwpTabRack*>(rTabRackID.obj().get()); if(!pTabRack) { - //assert(false); return; } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx index 3ac859b58ec2..cfdc590c4f21 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx @@ -70,7 +70,7 @@ void XFDrawLine::ToXml(IXFStream *pStrm) if( !GetStyleName().isEmpty() ) pAttrList->AddAttribute( "draw:style-name", GetStyleName() ); - assert(!m_strName.isEmpty()); //name should not be null. + assert(!m_strName.isEmpty() && "name should not be null."); if( !m_strName.isEmpty() ) pAttrList->AddAttribute( "draw:name", m_strName ); //anchor type: diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx index f769e2eb1ec3..c66391360480 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx @@ -82,7 +82,7 @@ void XFDrawObject::ToXml(IXFStream *pStrm) if( !GetStyleName().isEmpty() ) pAttrList->AddAttribute( "draw:style-name", GetStyleName() ); - assert(!m_strName.isEmpty()); //name should not be null. + assert(!m_strName.isEmpty() && "name should not be null."); if( !m_strName.isEmpty() ) pAttrList->AddAttribute( "draw:name", m_strName ); //anchor type: diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx index 2af0994cc62f..6cb2dde102fc 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx @@ -140,7 +140,7 @@ void XFFrame::StartFrame(IXFStream *pStrm) if( !GetStyleName().isEmpty() ) pAttrList->AddAttribute( "draw:style-name", GetStyleName() ); - assert(!m_strName.isEmpty()); //name should not be null. + assert(!m_strName.isEmpty() && "name should not be null."); if( !m_strName.isEmpty() && m_isTextBox == false) pAttrList->AddAttribute( "draw:name", m_strName ); //anchor type: diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx index 6315833c4043..b8ae90fbe48e 100644 --- a/lotuswordpro/source/filter/xfilter/xfimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx @@ -93,7 +93,7 @@ void XFImage::ToXml(IXFStream *pStrm) if( !GetStyleName().isEmpty() ) pAttrList->AddAttribute( "draw:style-name", GetStyleName() ); - assert(!m_strName.isEmpty()); //name should not be null. + assert(!m_strName.isEmpty() && "name should not be null."); if( !m_strName.isEmpty() ) pAttrList->AddAttribute( "draw:name", m_strName ); //anchor type: |