summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2012-08-02 12:05:06 +0200
committerPetr Mladek <pmladek@suse.cz>2012-08-02 15:38:28 +0200
commit0e79ad05e76bed420383156aaafcad08d5e34fa8 (patch)
treefaaf9284d7b3fcd1f56edfb8043696358648b46f /editeng
parentd5345bfb40d6e33087fd053cc220308a2bc2945e (diff)
some tweaks in RTF filter
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/rtf/svxrtf.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 45fd74be14de..5aa1a3fcf008 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -28,6 +28,7 @@
#include <ctype.h>
+#include <tools/diagnose_ex.h>
#include <rtl/tencinfo.h>
#include <svl/itemiter.hxx>
#include <svl/whiter.hxx>
@@ -1254,7 +1255,8 @@ bool SvxRTFParser::UncompressableStackEntry(const SvxRTFItemStackType &) const
void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
{
- DBG_ASSERT( pChildList, "There is no child list" );
+ ENSURE_OR_RETURN_VOID(pChildList, "Compress: no ChildList" );
+ ENSURE_OR_RETURN_VOID(pChildList->Count(), "Compress: ChildList empty");
sal_uInt16 n;
SvxRTFItemStackType* pTmp = (*pChildList)[0];