summaryrefslogtreecommitdiff
path: root/lotuswordpro/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-04-12 16:57:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-04-12 16:57:13 +0100
commite0a5984d718678e6cff9724ceab6ca1d4b816dfe (patch)
treed53de479d36ea0d4cce3e89214e876379018588d /lotuswordpro/source
parentac7eaa69bf7327b1321a8b87179fc6faa8ce78e7 (diff)
asserts aren't helpful to me here
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r--lotuswordpro/source/filter/bencont.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpobjstrm.cxx5
-rw-r--r--lotuswordpro/source/filter/xfilter/xftabstyle.cxx1
3 files changed, 2 insertions, 6 deletions
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 1e1bd6a0f101..27b274867162 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -509,7 +509,7 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p
nLen += GetSvStreamSize(pS) ;
}
- assert(nLen > 0);
+ OSL_ENSURE(nLen > 0, "expected a non-0 length");
char * pBuf = new char[nLen];
assert(pBuf != NULL);
char * pPointer = pBuf;
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 2b7df1fae742..a86438d21293 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -269,14 +269,11 @@ sal_uInt8 LwpObjectStream::QuickReaduInt8()
*/
void LwpObjectStream::SkipExtra()
{
- sal_uInt16 extra;
+ sal_uInt16 extra(0);
QuickRead(&extra, sizeof(extra));
while (extra != 0)
- {
- assert(false);
QuickRead(&extra, sizeof(extra));
- }
}
/**
* @descr check if extra bytes
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
index 678ba81cda4d..1189fc425a8f 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
@@ -67,7 +67,6 @@ XFTabStyle::XFTabStyle()
void XFTabStyle::ToXml(IXFStream *pStrm)
{
- assert(m_fLength>0);
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();