diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 18:50:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 18:50:04 +0100 |
| commit | 1a6bf8c433b128606af043a01a1366eab00b3d68 (patch) | |
| tree | 446ad553d122fad153e3a28a52770dd7bd671e82 /sw/source/core/doc/fmtcol.cxx | |
| parent | 2b20a3ef7a0b2ff030945d679b897c2062d7e0ff (diff) | |
| parent | c16ba8a04fd4599e439e7e039705e41691c43acb (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sw/inc/SwNumberTree.hxx
sw/inc/calbck.hxx
sw/inc/tox.hxx
sw/inc/viscrs.hxx
sw/source/core/doc/docnum.cxx
sw/source/core/docnode/finalthreadmanager.cxx
sw/source/core/docnode/ndnum.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/except/errhdl.cxx
sw/source/core/fields/chpfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/ole/ndole.cxx
sw/source/core/text/makefile.mk
sw/source/core/txtnode/txtedt.cxx
sw/source/filter/basflt/fltini.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8num.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/filter/xml/xmltbli.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/srcedtw.cxx
Diffstat (limited to 'sw/source/core/doc/fmtcol.cxx')
| -rw-r--r-- | sw/source/core/doc/fmtcol.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 3ff512d8eb2f..26504c1c17a2 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -70,7 +70,7 @@ namespace TxtFmtCollFunc if ( !pTxtFmtColl ) { #if OSL_DEBUG_LEVEL > 1 - ASSERT( false, + OSL_ENSURE( false, "<TxtFmtCollFunc::CheckTxtFmtCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTxtFmtColl>" ); #endif return; @@ -501,7 +501,7 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const } pColl = dynamic_cast<const SwTxtFmtColl*>(pColl->DerivedFrom()); - ASSERT( pColl, + OSL_ENSURE( pColl, "<SwTxtFmtColl::AreListLevelIndentsApplicable()> - something wrong in paragraph style hierarchy. The applied list style is not found." ); } } @@ -661,7 +661,7 @@ void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls ) //#outline level, zhaojianwei void SwTxtFmtColl::SetAttrOutlineLevel( int nLevel) { - ASSERT( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtFmtColl: Level Out Of Range" ); + OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtFmtColl: Level Out Of Range" ); SetFmtAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL, static_cast<UINT16>(nLevel) ) ); } @@ -673,7 +673,7 @@ int SwTxtFmtColl::GetAttrOutlineLevel() const int SwTxtFmtColl::GetAssignedOutlineStyleLevel() const { - ASSERT( IsAssignedToListLevelOfOutlineStyle(), + OSL_ENSURE( IsAssignedToListLevelOfOutlineStyle(), "<SwTxtFmtColl::GetAssignedOutlineStyleLevel()> - misuse of method"); return GetAttrOutlineLevel() - 1; } |