diff options
Diffstat (limited to 'sw/source/core/layout/atrfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 297 |
1 files changed, 150 insertions, 147 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index d95185064f6b..f984ddb85a04 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,7 +124,7 @@ TYPEINIT2(SwFmtFooter, SfxPoolItem, SwClient ); TYPEINIT2(SwFmtPageDesc, SfxPoolItem, SwClient ); TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem); -/* -----------------19.05.98 09:26------------------- +/* -------------------------------------------------- * Umwandlung fuer QueryValue * --------------------------------------------------*/ sal_Int16 lcl_RelToINT(sal_Int16 eRelation) @@ -236,7 +237,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) // abschalten! (Bug 31069) ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); - ASSERT( pNode, "Ein grosses Problem." ); + OSL_ENSURE( pNode, "Ein grosses Problem." ); pDoc->DeleteSection( pNode ); } delete pFmt; @@ -267,7 +268,7 @@ SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy ) int SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return( eFrmHeightType == ((SwFmtFrmSize&)rAttr).eFrmHeightType && eFrmWidthType == ((SwFmtFrmSize&)rAttr).eFrmWidthType && aSize == ((SwFmtFrmSize&)rAttr).GetSize()&& @@ -280,11 +281,7 @@ SfxPoolItem* SwFmtFrmSize::Clone( SfxItemPool* ) const return new SwFmtFrmSize( *this ); } - -/* -----------------24.04.98 11:36------------------- - * - * --------------------------------------------------*/ -sal_Bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -339,24 +336,21 @@ sal_Bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= (sal_Int16)GetWidthSizeType(); break; } - return sal_True; + return true; } -/* -----------------24.04.98 11:36------------------- - * - * --------------------------------------------------*/ -sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_FRMSIZE_SIZE: { awt::Size aVal; if(!(rVal >>= aVal)) - bRet = sal_False; + bRet = false; else { Size aTmp(aVal.Width, aVal.Height); @@ -368,7 +362,7 @@ sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(aTmp.Height() && aTmp.Width()) aSize = aTmp; else - bRet = sal_False; + bRet = false; } } break; @@ -379,7 +373,7 @@ sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(nSet >= 0 && nSet <= 0xfe) SetHeightPercent((sal_uInt8)nSet); else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_REL_WIDTH: @@ -389,7 +383,7 @@ sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(nSet >= 0 && nSet <= 0xfe) SetWidthPercent((sal_uInt8)nSet); else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH: @@ -437,7 +431,7 @@ sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) aSize.Height() = nHg; } else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_SIZE_TYPE: @@ -448,7 +442,7 @@ sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SetHeightSizeType((SwFrmSize)nType); } else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_IS_AUTO_HEIGHT: @@ -465,11 +459,11 @@ sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SetWidthSizeType((SwFrmSize)nType); } else - bRet = sal_False; + bRet = false; } break; default: - bRet = sal_False; + bRet = false; } return bRet; } @@ -523,7 +517,7 @@ SwFmtHeader::SwFmtHeader( sal_Bool bOn ) int SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( GetRegisteredIn() == ((SwFmtHeader&)rAttr).GetRegisteredIn() && bActive == ((SwFmtHeader&)rAttr).IsActive() ); } @@ -575,7 +569,7 @@ void SwFmtFooter::RegisterToFormat( SwFmt& rFmt ) int SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( GetRegisteredIn() == ((SwFmtFooter&)rAttr).GetRegisteredIn() && bActive == ((SwFmtFooter&)rAttr).IsActive() ); } @@ -614,7 +608,7 @@ void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx ) int SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); if( (long)pStartNode ^ (long)((SwFmtCntnt&)rAttr).pStartNode ) return 0; if( pStartNode ) @@ -657,7 +651,7 @@ bool SwFmtPageDesc::KnowsPageDesc() const int SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( pDefinedIn == ((SwFmtPageDesc&)rAttr).pDefinedIn ) && ( nNumOffset == ((SwFmtPageDesc&)rAttr).nNumOffset ) && ( GetPageDesc() == ((SwFmtPageDesc&)rAttr).GetPageDesc() ); @@ -685,7 +679,7 @@ void SwFmtPageDesc::SwClientNotify( const SwModify&, const SfxHint& rHint ) ((SwFmt*)pMod)->SetFmtAttr( aDfltDesc ); else { - DBG_ERROR( "What kind of SwModify is this?" ); + OSL_FAIL( "What kind of SwModify is this?" ); RegisterToPageDesc( *pDesc ); } } @@ -713,19 +707,19 @@ void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) //mich also bei meinem Format aus. //Dabei werden ich Deletet!!! if( IS_TYPE( SwFmt, pDefinedIn )) -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 { sal_Bool bDel = ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC ); - ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." ); + OSL_ENSURE( bDel, ";-) FmtPageDesc nicht zerstoert." ); } #else ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC ); #endif else if( IS_TYPE( SwCntntNode, pDefinedIn )) -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 { sal_Bool bDel = ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC ); - ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." ); + OSL_ENSURE( bDel, ";-) FmtPageDesc nicht zerstoert." ); } #else ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC ); @@ -737,11 +731,11 @@ void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } } -sal_Bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_PAGEDESC_PAGENUMOFFSET: @@ -762,13 +756,13 @@ sal_Bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } -sal_Bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -781,7 +775,7 @@ sal_Bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(rVal >>= nOffset) SetNumOffset( nOffset ); else - bRet = sal_False; + bRet = false; } break; @@ -791,8 +785,8 @@ sal_Bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) * Der Pointer waere aber ueber den Namen nur vom Dokument zu erfragen. */ default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } @@ -821,6 +815,7 @@ sal_Bool SwColumn::operator==( const SwColumn &rCmp ) SwFmtCol::SwFmtCol( const SwFmtCol& rCpy ) : SfxPoolItem( RES_COL ), + eLineStyle( rCpy.eLineStyle ), nLineWidth( rCpy.nLineWidth), aLineColor( rCpy.aLineColor), nLineHeight( rCpy.GetLineHeight() ), @@ -840,6 +835,7 @@ SwFmtCol::~SwFmtCol() {} SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy ) { + eLineStyle = rCpy.eLineStyle; nLineWidth = rCpy.nLineWidth; aLineColor = rCpy.aLineColor; nLineHeight = rCpy.GetLineHeight(); @@ -859,6 +855,7 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy ) SwFmtCol::SwFmtCol() : SfxPoolItem( RES_COL ), + eLineStyle( NO_STYLE ), nLineWidth(0), nLineHeight( 100 ), eAdj( COLADJ_NONE ), @@ -869,9 +866,10 @@ SwFmtCol::SwFmtCol() int SwFmtCol::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); const SwFmtCol &rCmp = (const SwFmtCol&)rAttr; - if( !(nLineWidth == rCmp.nLineWidth && + if( !(eLineStyle == rCmp.eLineStyle && + nLineWidth == rCmp.nLineWidth && aLineColor == rCmp.aLineColor && nLineHeight == rCmp.GetLineHeight() && eAdj == rCmp.GetLineAdj() && @@ -967,7 +965,7 @@ void SwFmtCol::SetOrtho( sal_Bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const { - ASSERT( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." ); + OSL_ENSURE( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." ); if ( nWidth != nAct ) { long nW = aColumns[nCol]->GetWishWidth(); @@ -981,7 +979,7 @@ sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const sal_uInt16 SwFmtCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const { - ASSERT( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." ); + OSL_ENSURE( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." ); sal_uInt16 nRet = CalcColWidth( nCol, nAct ); SwColumn *pCol = aColumns[nCol]; nRet = nRet - pCol->GetLeft(); @@ -1043,30 +1041,30 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ) } } -sal_Bool SwFmtCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; if(MID_COLUMN_SEPARATOR_LINE == nMemberId) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } else { uno::Reference< text::XTextColumns > xCols = new SwXTextColumns(*this); rVal.setValue(&xCols, ::getCppuType((uno::Reference< text::XTextColumns>*)0)); } - return sal_True; + return true; } -sal_Bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_False; + bool bRet = false; if(MID_COLUMN_SEPARATOR_LINE == nMemberId) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } else { @@ -1093,7 +1091,7 @@ sal_Bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) pCol->SetRight( static_cast<sal_uInt16>(MM100_TO_TWIP(pArray[i].RightMargin)) ); aColumns.Insert(pCol, i); } - bRet = sal_True; + bRet = true; nWidth = nWidthSum; bOrtho = sal_False; @@ -1111,6 +1109,14 @@ sal_Bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) nLineWidth = pSwColums->GetSepLineWidth(); aLineColor.SetColor(pSwColums->GetSepLineColor()); nLineHeight = pSwColums->GetSepLineHeightRelative(); + switch ( pSwColums->GetSepLineStyle() ) + { + default: + case 0: eLineStyle = NO_STYLE; break; + case 1: eLineStyle = SOLID; break; + case 2: eLineStyle = DOTTED; break; + case 3: eLineStyle = DASHED; break; + } if(!pSwColums->GetSepLineIsOn()) eAdj = COLADJ_NONE; else switch(pSwColums->GetSepLineVertAlign()) @@ -1118,7 +1124,7 @@ sal_Bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case 0: eAdj = COLADJ_TOP; break; //VerticalAlignment_TOP case 1: eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM - default: ASSERT( !this, "unknown alignment" ); break; + default: OSL_ENSURE( !this, "unknown alignment" ); break; } } } @@ -1146,7 +1152,7 @@ SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) : int SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( GetValue() == ((SwFmtSurround&)rAttr).GetValue() && bAnchorOnly== ((SwFmtSurround&)rAttr).bAnchorOnly && bContour== ((SwFmtSurround&)rAttr).bContour && @@ -1164,11 +1170,11 @@ sal_uInt16 SwFmtSurround::GetValueCount() const } -sal_Bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_SURROUND_SURROUNDTYPE: @@ -1193,17 +1199,17 @@ sal_Bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } -sal_Bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_SURROUND_SURROUNDTYPE: @@ -1228,8 +1234,8 @@ sal_Bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SetOutside( *(sal_Bool*)rVal.getValue() ); break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } @@ -1247,7 +1253,7 @@ SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert, int SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( nYPos == ((SwFmtVertOrient&)rAttr).nYPos && eOrient == ((SwFmtVertOrient&)rAttr).eOrient && eRelation == ((SwFmtVertOrient&)rAttr).eRelation ); @@ -1258,11 +1264,11 @@ SfxPoolItem* SwFmtVertOrient::Clone( SfxItemPool* ) const return new SwFmtVertOrient( nYPos, eOrient, eRelation ); } -sal_Bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_VERTORIENT_ORIENT: @@ -1291,17 +1297,17 @@ sal_Bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons rVal <<= (sal_Int32)TWIP_TO_MM100(GetPos()); break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } -sal_Bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_VERTORIENT_ORIENT: @@ -1338,8 +1344,8 @@ sal_Bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } @@ -1360,7 +1366,7 @@ SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori, int SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( nXPos == ((SwFmtHoriOrient&)rAttr).nXPos && eOrient == ((SwFmtHoriOrient&)rAttr).eOrient && eRelation == ((SwFmtHoriOrient&)rAttr).eRelation && @@ -1372,11 +1378,11 @@ SfxPoolItem* SwFmtHoriOrient::Clone( SfxItemPool* ) const return new SwFmtHoriOrient( nXPos, eOrient, eRelation, bPosToggle ); } -sal_Bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_HORIORIENT_ORIENT: @@ -1413,17 +1419,17 @@ sal_Bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons } break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } -sal_Bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_HORIORIENT_ORIENT: @@ -1454,7 +1460,7 @@ sal_Bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nVal = 0; if(!(rVal >>= nVal)) - bRet = sal_False; + bRet = false; if(bConvert) nVal = MM100_TO_TWIP(nVal); SetPos( nVal ); @@ -1464,8 +1470,8 @@ sal_Bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SetPosToggle( *(sal_Bool*)rVal.getValue()); break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } @@ -1528,7 +1534,7 @@ SwFmtAnchor& SwFmtAnchor::operator=(const SwFmtAnchor& rAnchor) int SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); // OD 2004-05-05 #i28701# - Note: <mnOrder> hasn't to be considered. return ( nAnchorId == ((SwFmtAnchor&)rAttr).GetAnchorId() && nPageNum == ((SwFmtAnchor&)rAttr).GetPageNum() && @@ -1554,14 +1560,11 @@ sal_uInt32 SwFmtAnchor::GetOrder() const return mnOrder; } -/*-----------------16.02.98 15:21------------------- - ---------------------------------------------------*/ -sal_Bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_ANCHOR_ANCHORTYPE: @@ -1605,17 +1608,17 @@ sal_Bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } -sal_Bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_ANCHOR_ANCHORTYPE: @@ -1669,14 +1672,14 @@ sal_Bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } } else - bRet = sal_False; + bRet = false; } break; case MID_ANCHOR_ANCHORFRAME: //no break here!; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } @@ -1709,7 +1712,7 @@ SwFmtURL::~SwFmtURL() int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); const SwFmtURL &rCmp = (SwFmtURL&)rAttr; sal_Bool bRet = bIsServerMap == rCmp.IsServerMap() && sURL == rCmp.GetURL() && @@ -1744,11 +1747,11 @@ void SwFmtURL::SetMap( const ImageMap *pM ) } extern const SvEventDescription* lcl_GetSupportedMacroItems(); -sal_Bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_URL_URL: @@ -1789,17 +1792,17 @@ sal_Bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } -sal_Bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_URL_URL: @@ -1835,15 +1838,15 @@ sal_Bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bRet = SvUnoImageMap_fillImageMap( xCont, *pMap ); } else - bRet = sal_False; + bRet = false; } break; case MID_URL_SERVERMAP: bIsServerMap = *(sal_Bool*)rVal.getValue(); break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } @@ -1906,7 +1909,7 @@ int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const sSuffix == rAttr.sSuffix; } -sal_Bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) @@ -1935,12 +1938,12 @@ sal_Bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) case MID_SUFFIX : rVal <<= OUString(sSuffix); break; default: return sal_False; } - return sal_True; + return true; } -sal_Bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { - sal_Bool bRet = sal_True; + bool bRet = true; nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) { @@ -1969,7 +1972,7 @@ sal_Bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberI if(nVal >= 0) nOffset = nVal; else - bRet = sal_False; + bRet = false; } break; case MID_OWN_NUM : @@ -1991,7 +1994,7 @@ sal_Bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberI SVX_NUM_CHARS_LOWER_LETTER_N == nVal )) aFmt.SetNumberingType(nVal); else - bRet = sal_False; + bRet = false; } break; case MID_PREFIX : @@ -2006,7 +2009,7 @@ sal_Bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberI sSuffix = sVal; } break; - default: bRet = sal_False; + default: bRet = false; } return bRet; } @@ -2035,7 +2038,7 @@ SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* ) const int SwFmtChain::operator==( const SfxPoolItem &rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return GetPrev() == ((SwFmtChain&)rAttr).GetPrev() && GetNext() == ((SwFmtChain&)rAttr).GetNext(); @@ -2072,11 +2075,11 @@ void SwFmtChain::SetNext( SwFlyFrmFmt *pFmt ) ((SwModify*)aNext.GetRegisteredIn())->Remove( &aNext ); } -sal_Bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; XubString aRet; switch ( nMemberId ) { @@ -2089,8 +2092,8 @@ sal_Bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const aRet = GetNext()->GetName(); break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } rVal <<= OUString(aRet); return bRet; @@ -2114,7 +2117,7 @@ SwFmtLineNumber::~SwFmtLineNumber() int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return nStartValue == ((SwFmtLineNumber&)rAttr).GetStartValue() && bCountLines == ((SwFmtLineNumber&)rAttr).IsCount(); @@ -2125,11 +2128,11 @@ SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* ) const return new SwFmtLineNumber( *this ); } -sal_Bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_LINENUMBER_COUNT: @@ -2142,17 +2145,17 @@ sal_Bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons rVal <<= (sal_Int32)GetStartValue(); break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } -sal_Bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_LINENUMBER_COUNT: @@ -2164,12 +2167,12 @@ sal_Bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(rVal >>= nVal) SetStartValue( nVal ); else - bRet = sal_False; + bRet = false; } break; default: - ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + OSL_ENSURE( !this, "unknown MemberId" ); + bRet = false; } return bRet; } @@ -2192,7 +2195,7 @@ SwTextGridItem::~SwTextGridItem() int SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return eGridType == ((SwTextGridItem&)rAttr).GetGridType() && nLines == ((SwTextGridItem&)rAttr).GetLines() && nBaseHeight == ((SwTextGridItem&)rAttr).GetBaseHeight() && @@ -2228,9 +2231,9 @@ SwTextGridItem& SwTextGridItem::operator=( const SwTextGridItem& rCpy ) return *this; } -sal_Bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { - sal_Bool bRet = sal_True; + bool bRet = true; switch( nMemberId & ~CONVERT_TWIPS ) { @@ -2277,8 +2280,8 @@ sal_Bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= text::TextGridMode::LINES_AND_CHARS; break; default: - DBG_ERROR("unknown SwTextGrid value"); - bRet = sal_False; + OSL_FAIL("unknown SwTextGrid value"); + bRet = false; break; } break; @@ -2292,17 +2295,17 @@ sal_Bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; default: - DBG_ERROR("Unknown SwTextGridItem member"); - bRet = sal_False; + OSL_FAIL("Unknown SwTextGridItem member"); + bRet = false; break; } return bRet; } -sal_Bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { - sal_Bool bRet = sal_True; + bool bRet = true; switch( nMemberId & ~CONVERT_TWIPS ) { case MID_GRID_COLOR: @@ -2320,7 +2323,7 @@ sal_Bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if( bRet && (nTmp >= 0) ) SetLines( (sal_uInt16)nTmp ); else - bRet = sal_False; + bRet = false; } break; case MID_GRID_RUBY_BELOW: @@ -2349,7 +2352,7 @@ sal_Bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) else SetRubyHeight( (sal_uInt16)nTmp ); else - bRet = sal_False; + bRet = false; } break; case MID_GRID_TYPE: @@ -2370,7 +2373,7 @@ sal_Bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SetGridType( GRID_LINES_CHARS ); break; default: - bRet = sal_False; + bRet = false; break; } } @@ -2386,8 +2389,8 @@ sal_Bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) break; } default: - DBG_ERROR("Unknown SwTextGridItem member"); - bRet = sal_False; + OSL_FAIL("Unknown SwTextGridItem member"); + bRet = false; } return bRet; @@ -2538,7 +2541,7 @@ void SwFrmFmt::DelFrms() void SwFrmFmt::MakeFrms() { - ASSERT( !this, "Sorry not implemented." ); + OSL_ENSURE( !this, "Sorry not implemented." ); } @@ -2666,7 +2669,7 @@ sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const } if( n >= rFmts.Count() ) { - ASSERT( !this, "Fly-Section aber kein Format gefunden" ); + OSL_ENSURE( !this, "Fly-Section aber kein Format gefunden" ); return sal_False; } } @@ -2894,7 +2897,7 @@ void SwFlyFrmFmt::MakeFrms() pFly = new SwFlyInCntFrm( this, pFrm, pFrm ); break; default: - ASSERT( !this, "Neuer Ankertyp" ) + OSL_ENSURE( !this, "Neuer Ankertyp" ); break; } pFrm->AppendFly( pFly ); @@ -2946,7 +2949,7 @@ sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const void SwFlyFrmFmt::SetObjTitle( const String& rTitle, bool bBroadcast ) { SdrObject* pMasterObject = FindSdrObject(); - ASSERT( pMasterObject, + OSL_ENSURE( pMasterObject, "<SwNoTxtNode::SetObjTitle(..)> - missing <SdrObject> instance" ); if ( !pMasterObject ) { @@ -2969,7 +2972,7 @@ void SwFlyFrmFmt::SetObjTitle( const String& rTitle, bool bBroadcast ) const String SwFlyFrmFmt::GetObjTitle() const { const SdrObject* pMasterObject = FindSdrObject(); - ASSERT( pMasterObject, + OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::GetObjTitle(..)> - missing <SdrObject> instance" ); if ( !pMasterObject ) { @@ -2982,7 +2985,7 @@ const String SwFlyFrmFmt::GetObjTitle() const void SwFlyFrmFmt::SetObjDescription( const String& rDescription, bool bBroadcast ) { SdrObject* pMasterObject = FindSdrObject(); - ASSERT( pMasterObject, + OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::SetDescription(..)> - missing <SdrObject> instance" ); if ( !pMasterObject ) { @@ -3005,7 +3008,7 @@ void SwFlyFrmFmt::SetObjDescription( const String& rDescription, bool bBroadcast const String SwFlyFrmFmt::GetObjDescription() const { const SdrObject* pMasterObject = FindSdrObject(); - ASSERT( pMasterObject, + OSL_ENSURE( pMasterObject, "<SwNoTxtNode::GetDescription(..)> - missing <SdrObject> instance" ); if ( !pMasterObject ) { @@ -3199,8 +3202,7 @@ void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) break; default: { - ASSERT( false, - "<SwDrawFrmFmt::SetPositionLayoutDir(..)> - invalid attribute value." ); + OSL_FAIL( "<SwDrawFrmFmt::SetPositionLayoutDir(..)> - invalid attribute value." ); } } } @@ -3294,3 +3296,4 @@ IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint, return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |