diff options
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editdoc.cxx | 6 | ||||
-rw-r--r-- | editeng/source/editeng/eerdll.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit5.cxx | 4 | ||||
-rw-r--r-- | editeng/source/items/paraitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 10 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 2 | ||||
-rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 12 | ||||
-rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 116 | ||||
-rw-r--r-- | editeng/source/uno/unofored.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unoipset.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 20 |
13 files changed, 94 insertions, 94 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 728badf93a14..51ba58791968 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -920,7 +920,7 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map nSourceWhich = nW; } - if ( rSource.GetItemState( nSourceWhich, sal_False ) == SFX_ITEM_ON ) + if ( rSource.GetItemState( nSourceWhich, false ) == SFX_ITEM_ON ) { MapUnit eSourceUnit = pSourceUnit ? *pSourceUnit : (MapUnit)pSourcePool->GetMetric( nSourceWhich ); MapUnit eDestUnit = pDestUnit ? *pDestUnit : (MapUnit)pDestPool->GetMetric( nWhich ); @@ -1812,7 +1812,7 @@ const SfxPoolItem& ContentAttribs::GetItem( sal_uInt16 nWhich ) const { // Hard paragraph attributes take precedence! const SfxItemSet* pTakeFrom = &aAttribSet; - if ( pStyle && ( aAttribSet.GetItemState( nWhich, sal_False ) != SFX_ITEM_ON ) ) + if ( pStyle && ( aAttribSet.GetItemState( nWhich, false ) != SFX_ITEM_ON ) ) pTakeFrom = &pStyle->GetItemSet(); return pTakeFrom->Get( nWhich ); @@ -1821,7 +1821,7 @@ const SfxPoolItem& ContentAttribs::GetItem( sal_uInt16 nWhich ) const bool ContentAttribs::HasItem( sal_uInt16 nWhich ) const { bool bHasItem = false; - if ( aAttribSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_ON ) + if ( aAttribSet.GetItemState( nWhich, false ) == SFX_ITEM_ON ) bHasItem = true; else if ( pStyle && pStyle->GetItemSet().GetItemState( nWhich ) == SFX_ITEM_ON ) bHasItem = true; diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index b5a5c9a2a457..f383cafdcf81 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -89,7 +89,7 @@ GlobalEditData::~GlobalEditData() // Destroy DefItems... // Or simply keep them, since at end of excecution?! if ( ppDefItems ) - SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, sal_True ); + SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, true ); } SfxPoolItem** GlobalEditData::GetDefItems() diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index ce5bbcf010ba..80ed9b0f1117 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -309,7 +309,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) sal_uInt16 aFntHeightIems[3] = { EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT_CJK, EE_CHAR_FONTHEIGHT_CTL }; for (size_t i = 0; i < SAL_N_ELEMENTS(aFntHeightIems); ++i) { - if (SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( aFntHeightIems[i], sal_False, &pItem )) + if (SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( aFntHeightIems[i], false, &pItem )) { sal_uInt32 nHeight = ((SvxFontHeightItem*)pItem)->GetHeight(); long nNewHeight; @@ -321,7 +321,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) } } - if( SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( EE_CHAR_ESCAPEMENT, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( EE_CHAR_ESCAPEMENT, false, &pItem )) { // die richtige long nEsc = ((SvxEscapementItem*)pItem)->GetEsc(); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 854c6edff3f0..0c93fab9433f 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -237,7 +237,7 @@ void ImpEditEngine::InitDoc(bool bKeepParaAttribs) for ( sal_Int32 n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ ) { if ( aEditDoc[n]->GetStyleSheet() ) - EndListening( *aEditDoc[n]->GetStyleSheet(), sal_False ); + EndListening( *aEditDoc[n]->GetStyleSheet(), false ); } if ( bKeepParaAttribs ) @@ -2465,7 +2465,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara ) { aEditDoc.RemoveItemsFromPool(*pNode); if ( pNode->GetStyleSheet() ) - EndListening( *pNode->GetStyleSheet(), sal_False ); + EndListening( *pNode->GetStyleSheet(), false ); delete pNode; } } diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 3c6938ea92f6..447ea2300b16 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -87,10 +87,10 @@ void ImpEditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle ) pNode->GetContentAttribs().GetItems() ) ); } if ( pCurStyle ) - EndListening( *pCurStyle, sal_False ); + EndListening( *pCurStyle, false ); pNode->SetStyleSheet( pStyle, aStatus.UseCharAttribs() ); if ( pStyle ) - StartListening( *pStyle, sal_False ); + StartListening( *pStyle, false ); ParaAttribsChanged( pNode ); } FormatAndUpdate(); diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 3ecd59d08b45..65e78e97dc57 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -1178,7 +1178,7 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) if( bStoreDefTabs ) { const SvxTabStopItem& rDefTab = (const SvxTabStopItem &) - pPool->GetDefaultItem( pPool->GetWhich( SID_ATTR_TABSTOP, sal_False ) ); + pPool->GetDefaultItem( pPool->GetWhich( SID_ATTR_TABSTOP, false ) ); nDefDist = sal_uInt16( rDefTab.maTabStops.front().GetTabPos() ); const sal_Int32 nPos = nTabs > 0 ? (*this)[nTabs-1].GetTabPos() : 0; nCount = (sal_uInt16)(nPos / nDefDist); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 19110d8028d4..e447103636d7 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -600,7 +600,7 @@ bool SvxPostureItem::HasBoolValue() const // ----------------------------------------------------------------------- -sal_Bool SvxPostureItem::GetBoolValue() const +bool SvxPostureItem::GetBoolValue() const { return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE ); } @@ -630,7 +630,7 @@ bool SvxWeightItem::HasBoolValue() const // ----------------------------------------------------------------------- -sal_Bool SvxWeightItem::GetBoolValue() const +bool SvxWeightItem::GetBoolValue() const { return (FontWeight)GetValue() >= WEIGHT_BOLD; } @@ -1285,7 +1285,7 @@ bool SvxTextLineItem::HasBoolValue() const // ----------------------------------------------------------------------- -sal_Bool SvxTextLineItem::GetBoolValue() const +bool SvxTextLineItem::GetBoolValue() const { return (FontUnderline)GetValue() != UNDERLINE_NONE; } @@ -1515,7 +1515,7 @@ bool SvxCrossedOutItem::HasBoolValue() const // ----------------------------------------------------------------------- -sal_Bool SvxCrossedOutItem::GetBoolValue() const +bool SvxCrossedOutItem::GetBoolValue() const { return (FontStrikeout)GetValue() != STRIKEOUT_NONE; } @@ -3513,7 +3513,7 @@ const SfxPoolItem* SvxScriptSetItem::GetItemOfScriptSet( const SfxItemSet& rSet, sal_uInt16 nId ) { const SfxPoolItem* pI; - SfxItemState eSt = rSet.GetItemState( nId, sal_False, &pI ); + SfxItemState eSt = rSet.GetItemState( nId, false, &pI ); if( SFX_ITEM_SET != eSt ) pI = SFX_ITEM_DEFAULT == eSt ? &rSet.Get( nId ) : 0; return pI; diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index c6add09ddb46..e0e39ad3acbd 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1057,7 +1057,7 @@ void OutlinerView::ApplyBulletsNumbering( // Get old bullet space. { const SfxPoolItem* pPoolItem=NULL; - SfxItemState eState = rAttrs.GetItemState(EE_PARA_NUMBULLET, sal_False, &pPoolItem); + SfxItemState eState = rAttrs.GetItemState(EE_PARA_NUMBULLET, false, &pPoolItem); if (eState != SFX_ITEM_SET) { // Use default value when has not contain bullet item. diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 023a12f5d20d..920a5a76cdd6 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -805,7 +805,7 @@ ATTR_SETUNDERLINE: SvxUnderlineItem aUL( UNDERLINE_SINGLE, PLAINID->nUnderline ); const SfxPoolItem* pItem; if( SFX_ITEM_SET == pSet->GetItemState( - PLAINID->nUnderline, sal_False, &pItem ) ) + PLAINID->nUnderline, false, &pItem ) ) { // is switched off ? if( UNDERLINE_NONE == @@ -900,7 +900,7 @@ ATTR_SETOVERLINE: SvxOverlineItem aOL( UNDERLINE_SINGLE, PLAINID->nOverline ); const SfxPoolItem* pItem; if( SFX_ITEM_SET == pSet->GetItemState( - PLAINID->nOverline, sal_False, &pItem ) ) + PLAINID->nOverline, false, &pItem ) ) { // is switched off ? if( UNDERLINE_NONE == @@ -1399,7 +1399,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, // then read the border attribute SvxBoxItem aAttr( PARDID->nBox ); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, false, &pItem ) ) aAttr = *(SvxBoxItem*)pItem; SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0 ); // Simple plain line @@ -1774,19 +1774,19 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet ) else if( !pAkt->aAttrSet.GetParent() ) { if( SFX_ITEM_SET == - pDfltSet->GetItemState( *pPtr, sal_False, &pDef )) + pDfltSet->GetItemState( *pPtr, false, &pDef )) pAkt->aAttrSet.Put( *pDef ); else pAkt->aAttrSet.ClearItem( *pPtr ); } else if( SFX_ITEM_SET == pAkt->aAttrSet.GetParent()-> - GetItemState( *pPtr, sal_True, &pItem ) && + GetItemState( *pPtr, true, &pItem ) && *( pDef = &pDfltSet->Get( *pPtr )) != *pItem ) pAkt->aAttrSet.Put( *pDef ); else { if( SFX_ITEM_SET == - pDfltSet->GetItemState( *pPtr, sal_False, &pDef )) + pDfltSet->GetItemState( *pPtr, false, &pDef )) pAkt->aAttrSet.Put( *pDef ); else pAkt->aAttrSet.ClearItem( *pPtr ); diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index d5cc5ab85197..e20eb82a28eb 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -864,7 +864,7 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType ) for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() ) { if( SFX_WHICH_MAX > nWhich && - SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) && + SFX_ITEM_SET == rSet.GetItemState( nWhich, false, &pItem ) && rPool.GetDefaultItem( nWhich ) == *pItem ) rSet.ClearItem( nWhich ); // delete } @@ -878,14 +878,14 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType ) const SfxPoolItem* pSItem; for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() ) { - if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, sal_True, &pSItem )) + if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, true, &pSItem )) { - if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) + if( SFX_ITEM_SET == rSet.GetItemState( nWhich, false, &pItem ) && *pItem == *pSItem ) rSet.ClearItem( nWhich ); // delete } else if( SFX_WHICH_MAX > nWhich && - SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) && + SFX_ITEM_SET == rSet.GetItemState( nWhich, false, &pItem ) && rPool.GetDefaultItem( nWhich ) == *pItem ) rSet.ClearItem( nWhich ); // delete } @@ -916,7 +916,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack while( true ) { if( SFX_ITEM_SET == pAkt->aAttrSet.GetItemState( - pItem->Which(), sal_False, &pGet ) && + pItem->Which(), false, &pGet ) && *pItem == *pGet ) pOld->aAttrSet.ClearItem( pItem->Which() ); @@ -1290,7 +1290,7 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser ) do { sal_uInt16 nWhich = aIter.GetCurItem()->Which(); if( SFX_ITEM_SET != pTmp->aAttrSet.GetItemState( nWhich, - sal_False, &pItem ) || *pItem != *aIter.GetCurItem() ) + false, &pItem ) || *pItem != *aIter.GetCurItem() ) aMrgSet.ClearItem( nWhich ); if( aIter.IsAtEnd() ) @@ -1337,7 +1337,7 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults ) SfxItemIter aIter( rDefaults ); do { sal_uInt16 nWhich = aIter.GetCurItem()->Which(); - if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, sal_False )) + if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, false )) aAttrSet.Put( *aIter.GetCurItem() ); if( aIter.IsAtEnd() ) @@ -1350,62 +1350,62 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults ) RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool& rPool ) { - nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, sal_False ); - nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, sal_False ); - nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, sal_False ); - nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, sal_False ); - nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, sal_False ); - nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, sal_False ); - nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, sal_False ); - nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, sal_False ); - nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, sal_False ); - nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, sal_False ); - nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, sal_False ); - nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, sal_False ); - nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, sal_False ); - nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, sal_False ); - nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, sal_False ); - nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, sal_False ); - nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, sal_False ); - - nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, sal_False ); - nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, sal_False ); - nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, sal_False ); - nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, sal_False ); - nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, sal_False ); - nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, sal_False ); - nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, sal_False ); - nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, sal_False ); - nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, sal_False ); - nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, sal_False ); - nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, sal_False ); - nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, sal_False ); + nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, false ); + nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, false ); + nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, false ); + nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, false ); + nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, false ); + nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, false ); + nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, false ); + nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, false ); + nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, false ); + nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, false ); + nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, false ); + nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, false ); + nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, false ); + nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, false ); + nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, false ); + nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, false ); + nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, false ); + + nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, false ); + nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, false ); + nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, false ); + nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, false ); + nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, false ); + nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, false ); + nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, false ); + nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, false ); + nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, false ); + nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, false ); + nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, false ); + nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, false ); nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, sal_False ); - nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, sal_False ); - nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, sal_False ); - nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, sal_False ); - nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, sal_False ); + nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, false ); + nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, false ); + nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, false ); + nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, false ); } RTFPardAttrMapIds ::RTFPardAttrMapIds ( const SfxItemPool& rPool ) { - nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, sal_False ); - nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, sal_False ); - nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, sal_False ); - nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, sal_False ); - nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, sal_False ); - nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, sal_False ); - nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, sal_False ); - nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, sal_False ); - nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, sal_False ); - nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, sal_False ); - nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, sal_False ); - nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, sal_False ); - nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, sal_False ); - nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, sal_False ); - nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, sal_False ); - nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, sal_False ); - nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, sal_False ); + nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, false ); + nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, false ); + nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, false ); + nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, false ); + nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, false ); + nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, false ); + nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, false ); + nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, false ); + nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, false ); + nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, false ); + nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, false ); + nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, false ); + nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, false ); + nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, false ); + nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, false ); + nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, false ); + nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, false ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 6b91f88ddf23..4b6774dc46c9 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -96,7 +96,7 @@ SfxItemSet SvxEditEngineForwarder::GetParaAttribs( sal_Int32 nPara ) const sal_uInt16 nWhich = EE_PARA_START; while( nWhich <= EE_PARA_END ) { - if( aSet.GetItemState( nWhich, sal_True ) != SFX_ITEM_ON ) + if( aSet.GetItemState( nWhich, true ) != SFX_ITEM_ON ) { if( rEditEngine.HasParaAttrib( nPara, nWhich ) ) aSet.Put( rEditEngine.GetParaAttrib( nPara, nWhich ) ); diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index fe955ba8d969..4363c54cb1df 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -158,7 +158,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa // Get item const SfxPoolItem* pItem = 0; - SfxItemState eState = rSet.GetItemState( pMap->nWID, sal_True, &pItem ); + SfxItemState eState = rSet.GetItemState( pMap->nWID, true, &pItem ); SfxItemPool* pPool = rSet.GetPool(); // Put UnoAny in the item value @@ -228,7 +228,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* if(aSet.Count()) { const SfxPoolItem* pItem = NULL; - SfxItemState eState = aSet.GetItemState( pMap->nWID, sal_True, &pItem ); + SfxItemState eState = aSet.GetItemState( pMap->nWID, true, &pItem ); if(eState >= SFX_ITEM_DEFAULT && pItem) { pItem->QueryValue( aVal, nMemberId ); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 1e28f16422dc..0461b378073d 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -643,7 +643,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM switch( pMap->nWID ) { case EE_FEATURE_FIELD: - if ( rSet.GetItemState( EE_FEATURE_FIELD, sal_False ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( EE_FEATURE_FIELD, false ) == SFX_ITEM_SET ) { SvxFieldItem* pItem = (SvxFieldItem*)rSet.GetItem( EE_FEATURE_FIELD ); const SvxFieldData* pData = pItem->GetField(); @@ -665,7 +665,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM break; case WID_PORTIONTYPE: - if ( rSet.GetItemState( EE_FEATURE_FIELD, sal_False ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( EE_FEATURE_FIELD, false ) == SFX_ITEM_SET ) { OUString aType("TextField"); rAny <<= aType; @@ -698,10 +698,10 @@ sal_Bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const S case EE_PARA_NUMBULLET: { - if((rSet.GetItemState( EE_PARA_NUMBULLET, sal_True ) & (SFX_ITEM_SET|SFX_ITEM_DEFAULT)) == 0) + if((rSet.GetItemState( EE_PARA_NUMBULLET, true ) & (SFX_ITEM_SET|SFX_ITEM_DEFAULT)) == 0) throw uno::RuntimeException(); - SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)rSet.GetItem( EE_PARA_NUMBULLET, sal_True ); + SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)rSet.GetItem( EE_PARA_NUMBULLET, true ); if( pBulletItem == NULL ) throw uno::RuntimeException(); @@ -739,9 +739,9 @@ sal_Bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const S case EE_PARA_BULLETSTATE: { sal_Bool bState = sal_False; - if( rSet.GetItemState( EE_PARA_BULLETSTATE, sal_True ) & (SFX_ITEM_SET|SFX_ITEM_DEFAULT)) + if( rSet.GetItemState( EE_PARA_BULLETSTATE, true ) & (SFX_ITEM_SET|SFX_ITEM_DEFAULT)) { - SfxBoolItem* pItem = (SfxBoolItem*)rSet.GetItem( EE_PARA_BULLETSTATE, sal_True ); + SfxBoolItem* pItem = (SfxBoolItem*)rSet.GetItem( EE_PARA_BULLETSTATE, true ); bState = pItem->GetValue() ? sal_True : sal_False; } @@ -820,7 +820,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt if( pMap->nWID >= EE_ITEMS_START && pMap->nWID <= EE_ITEMS_END ) { const SfxPoolItem* pItem; - if( pNewAttrSet->GetItemState( pMap->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) + if( pNewAttrSet->GetItemState( pMap->nWID, true, &pItem ) == SFX_ITEM_SET ) { pOldAttrSet->Put( *pItem ); } @@ -840,7 +840,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt if( pMap->nWID >= EE_ITEMS_START && pMap->nWID <= EE_ITEMS_END ) { const SfxPoolItem* pItem; - if( pNewParaSet->GetItemState( pMap->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) + if( pNewParaSet->GetItemState( pMap->nWID, true, &pItem ) == SFX_ITEM_SET ) { pOldParaSet->Put( *pItem ); } @@ -1169,7 +1169,7 @@ sal_Bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, cons return !bUnknownPropertyFound; if( nWID != 0 ) - eItemState = pSet->GetItemState( nWID, sal_False ); + eItemState = pSet->GetItemState( nWID, false ); switch( eItemState ) { @@ -1222,7 +1222,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co { do { - SfxItemSet aSet( *pForwarder->GetPool(), sal_True ); + SfxItemSet aSet( *pForwarder->GetPool(), true ); if( pMap->nWID == WID_FONTDESC ) { |