diff options
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 16 | ||||
-rw-r--r-- | editeng/source/editeng/editattr.cxx | 8 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unofdesc.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/data/patattr.cxx | 90 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/autofmt.cxx | 10 | ||||
-rw-r--r-- | svx/source/dialog/fntctrl.cxx | 24 | ||||
-rw-r--r-- | sw/source/core/text/atrstck.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 32 | ||||
-rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 10 |
11 files changed, 104 insertions, 104 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 53e5e08200c8..cc5f57191b4e 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -723,7 +723,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp if ( eState >= SfxItemState::DEFAULT ) { const SvxPostureItem& rItem = static_cast<const SvxPostureItem&>(rSet.Get( nWhich )); - eItalic = (FontItalic)rItem.GetValue(); + eItalic = rItem.GetValue(); bStyle = true; } bStyleAvailable = bStyleAvailable && (eState >= SfxItemState::DONTCARE); @@ -739,7 +739,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp if ( eState >= SfxItemState::DEFAULT ) { const SvxWeightItem& rItem = static_cast<const SvxWeightItem&>(rSet.Get( nWhich )); - eWeight = (FontWeight)rItem.GetValue(); + eWeight = rItem.GetValue(); } else bStyle = false; @@ -1725,7 +1725,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) else { const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>(rSet->Get( nWhich )); - FontLineStyle eUnderline = (FontLineStyle)rItem.GetValue(); + FontLineStyle eUnderline = rItem.GetValue(); rFont.SetUnderline( eUnderline ); rCJKFont.SetUnderline( eUnderline ); rCTLFont.SetUnderline( eUnderline ); @@ -1769,7 +1769,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) else { const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>(rSet->Get( nWhich )); - FontLineStyle eOverline = (FontLineStyle)rItem.GetValue(); + FontLineStyle eOverline = rItem.GetValue(); rFont.SetOverline( eOverline ); rCJKFont.SetOverline( eOverline ); rCTLFont.SetOverline( eOverline ); @@ -1813,7 +1813,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) else { const SvxCrossedOutItem& rItem = static_cast<const SvxCrossedOutItem&>(rSet->Get( nWhich )); - FontStrikeout eStrikeout = (FontStrikeout)rItem.GetValue(); + FontStrikeout eStrikeout = rItem.GetValue(); rFont.SetStrikeout( eStrikeout ); rCJKFont.SetStrikeout( eStrikeout ); rCTLFont.SetStrikeout( eStrikeout ); @@ -2144,7 +2144,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) SfxItemState::DEFAULT > rOldSet.GetItemState( nWhich ); const SvxUnderlineItem& rItem = *static_cast<const SvxUnderlineItem*>(pOld); - if ( (FontLineStyle)rItem.GetValue() == eUnder && + if ( rItem.GetValue() == eUnder && ( LINESTYLE_NONE == eUnder || rItem.GetColor() == m_pUnderlineColorLB->GetSelectEntryColor() ) && ! bAllowChg ) bChanged = false; @@ -2178,7 +2178,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) SfxItemState::DEFAULT > rOldSet.GetItemState( nWhich ); const SvxOverlineItem& rItem = *static_cast<const SvxOverlineItem*>(pOld); - if ( (FontLineStyle)rItem.GetValue() == eOver && + if ( rItem.GetValue() == eOver && ( LINESTYLE_NONE == eOver || rItem.GetColor() == m_pOverlineColorLB->GetSelectEntryColor() ) && ! bAllowChg ) bChanged = false; @@ -2213,7 +2213,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) const SvxCrossedOutItem& rItem = *static_cast<const SvxCrossedOutItem*>(pOld); if ( !m_pStrikeoutLB->IsEnabled() - || ((FontStrikeout)rItem.GetValue() == eStrike && !bAllowChg) ) + || (rItem.GetValue() == eStrike && !bAllowChg) ) bChanged = false; } diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index f3b11a2f682f..6d8206588091 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -122,7 +122,7 @@ EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt void EditCharAttribWeight::SetFont( SvxFont& rFont, OutputDevice* ) { - rFont.SetWeight( (FontWeight)static_cast<const SvxWeightItem*>(GetItem())->GetValue() ); + rFont.SetWeight( static_cast<const SvxWeightItem*>(GetItem())->GetValue() ); } @@ -136,7 +136,7 @@ EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev ) { - rFont.SetUnderline( (FontLineStyle)static_cast<const SvxUnderlineItem*>(GetItem())->GetValue() ); + rFont.SetUnderline( static_cast<const SvxUnderlineItem*>(GetItem())->GetValue() ); if ( pOutDev ) pOutDev->SetTextLineColor( static_cast<const SvxUnderlineItem*>(GetItem())->GetColor() ); @@ -154,7 +154,7 @@ EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, sa void EditCharAttribOverline::SetFont( SvxFont& rFont, OutputDevice* pOutDev ) { - rFont.SetOverline( (FontLineStyle)static_cast<const SvxOverlineItem*>(GetItem())->GetValue() ); + rFont.SetOverline( static_cast<const SvxOverlineItem*>(GetItem())->GetValue() ); if ( pOutDev ) pOutDev->SetOverlineColor( static_cast<const SvxOverlineItem*>(GetItem())->GetColor() ); } @@ -199,7 +199,7 @@ EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr void EditCharAttribStrikeout::SetFont( SvxFont& rFont, OutputDevice* ) { - rFont.SetStrikeout( (FontStrikeout)static_cast<const SvxCrossedOutItem*>(GetItem())->GetValue() ); + rFont.SetStrikeout( static_cast<const SvxCrossedOutItem*>(GetItem())->GetValue() ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index c3056134e1c3..65e6965757b2 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -650,7 +650,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; case MID_WEIGHT: { - rVal <<= (float)( VCLUnoHelper::ConvertFontWeight( (FontWeight)GetValue() ) ); + rVal <<= (float)( VCLUnoHelper::ConvertFontWeight( GetValue() ) ); } break; } @@ -1209,7 +1209,7 @@ bool SvxTextLineItem::HasBoolValue() const bool SvxTextLineItem::GetBoolValue() const { - return (FontLineStyle)GetValue() != LINESTYLE_NONE; + return GetValue() != LINESTYLE_NONE; } diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 69d08901322f..48dbeb4ddcc9 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -95,28 +95,28 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte } { - SvxPostureItem aPostureItem( (FontItalic)0, EE_CHAR_ITALIC ); + SvxPostureItem aPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ); aTemp <<= rDesc.Slant; static_cast<SfxPoolItem*>(&aPostureItem)->PutValue( aTemp, MID_POSTURE ); rSet.Put(aPostureItem); } { - SvxUnderlineItem aUnderlineItem( (FontLineStyle)0, EE_CHAR_UNDERLINE ); + SvxUnderlineItem aUnderlineItem( LINESTYLE_NONE, EE_CHAR_UNDERLINE ); aTemp <<= (sal_Int16)rDesc.Underline; static_cast<SfxPoolItem*>(&aUnderlineItem)->PutValue( aTemp, MID_TL_STYLE ); rSet.Put( aUnderlineItem ); } { - SvxWeightItem aWeightItem( (FontWeight)0, EE_CHAR_WEIGHT ); + SvxWeightItem aWeightItem( WEIGHT_DONTKNOW, EE_CHAR_WEIGHT ); aTemp <<= rDesc.Weight; static_cast<SfxPoolItem*>(&aWeightItem)->PutValue( aTemp, MID_WEIGHT ); rSet.Put( aWeightItem ); } { - SvxCrossedOutItem aCrossedOutItem( (FontStrikeout)0, EE_CHAR_STRIKEOUT ); + SvxCrossedOutItem aCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ); aTemp <<= rDesc.Strikeout; static_cast<SfxPoolItem*>(&aCrossedOutItem)->PutValue( aTemp, MID_CROSS_OUT ); rSet.Put( aCrossedOutItem ); diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 3be1e94c21b2..b3e208538b0a 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -285,19 +285,19 @@ void ScPatternAttr::GetFont( if ( pCondSet->GetItemState( nWeightId, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( nWeightId ); - eWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); + eWeight = static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( nPostureId, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( nPostureId ); - eItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); + eItalic = static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_UNDERLINE ); - eUnder = (FontLineStyle)static_cast<const SvxUnderlineItem*>(pItem)->GetValue(); + eUnder = static_cast<const SvxUnderlineItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_OVERLINE ); - eOver = (FontLineStyle)static_cast<const SvxOverlineItem*>(pItem)->GetValue(); + eOver = static_cast<const SvxOverlineItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_WORDLINE ); @@ -305,7 +305,7 @@ void ScPatternAttr::GetFont( if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_CROSSEDOUT ); - eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); + eStrike = static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_CONTOUR ); @@ -321,7 +321,7 @@ void ScPatternAttr::GetFont( if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_RELIEF ); - eRelief = (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); + eRelief = static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_COLOR, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_COLOR ); @@ -336,17 +336,17 @@ void ScPatternAttr::GetFont( pFontAttr = &static_cast<const SvxFontItem&>(rItemSet.Get( nFontId )); nFontHeight = static_cast<const SvxFontHeightItem&>( rItemSet.Get( nHeightId )).GetHeight(); - eWeight = (FontWeight)static_cast<const SvxWeightItem&>( + eWeight = static_cast<const SvxWeightItem&>( rItemSet.Get( nWeightId )).GetValue(); - eItalic = (FontItalic)static_cast<const SvxPostureItem&>( + eItalic = static_cast<const SvxPostureItem&>( rItemSet.Get( nPostureId )).GetValue(); - eUnder = (FontLineStyle)static_cast<const SvxUnderlineItem&>( + eUnder = static_cast<const SvxUnderlineItem&>( rItemSet.Get( ATTR_FONT_UNDERLINE )).GetValue(); - eOver = (FontLineStyle)static_cast<const SvxOverlineItem&>( + eOver = static_cast<const SvxOverlineItem&>( rItemSet.Get( ATTR_FONT_OVERLINE )).GetValue(); bWordLine = static_cast<const SvxWordLineModeItem&>( rItemSet.Get( ATTR_FONT_WORDLINE )).GetValue(); - eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem&>( + eStrike = static_cast<const SvxCrossedOutItem&>( rItemSet.Get( ATTR_FONT_CROSSEDOUT )).GetValue(); bOutline = static_cast<const SvxContourItem&>( rItemSet.Get( ATTR_FONT_CONTOUR )).GetValue(); @@ -354,7 +354,7 @@ void ScPatternAttr::GetFont( rItemSet.Get( ATTR_FONT_SHADOWED )).GetValue(); eEmphasis = static_cast<const SvxEmphasisMarkItem&>( rItemSet.Get( ATTR_FONT_EMPHASISMARK )).GetEmphasisMark(); - eRelief = (FontRelief)static_cast<const SvxCharReliefItem&>( + eRelief = static_cast<const SvxCharReliefItem&>( rItemSet.Get( ATTR_FONT_RELIEF )).GetValue(); aColor = static_cast<const SvxColorItem&>( rItemSet.Get( ATTR_FONT_COLOR )).GetValue(); @@ -519,25 +519,25 @@ ScDxfFont ScPatternAttr::GetDxfFont(const SfxItemSet& rItemSet, SvtScriptType nS if ( rItemSet.GetItemState( nWeightId, true, &pItem ) == SfxItemState::SET ) { pItem = &rItemSet.Get( nWeightId ); - aReturn.eWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); + aReturn.eWeight = static_cast<const SvxWeightItem*>(pItem)->GetValue(); } if ( rItemSet.GetItemState( nPostureId, true, &pItem ) == SfxItemState::SET ) { pItem = &rItemSet.Get( nPostureId ); - aReturn.eItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); + aReturn.eItalic = static_cast<const SvxPostureItem*>(pItem)->GetValue(); } if ( rItemSet.GetItemState( ATTR_FONT_UNDERLINE, true, &pItem ) == SfxItemState::SET ) { pItem = &rItemSet.Get( ATTR_FONT_UNDERLINE ); - aReturn.eUnder = (FontLineStyle)static_cast<const SvxUnderlineItem*>(pItem)->GetValue(); + aReturn.eUnder = static_cast<const SvxUnderlineItem*>(pItem)->GetValue(); } if ( rItemSet.GetItemState( ATTR_FONT_OVERLINE, true, &pItem ) == SfxItemState::SET ) { pItem = &rItemSet.Get( ATTR_FONT_OVERLINE ); - aReturn.eOver = (FontLineStyle)static_cast<const SvxOverlineItem*>(pItem)->GetValue(); + aReturn.eOver = static_cast<const SvxOverlineItem*>(pItem)->GetValue(); } if ( rItemSet.GetItemState( ATTR_FONT_WORDLINE, true, &pItem ) == SfxItemState::SET ) @@ -549,7 +549,7 @@ ScDxfFont ScPatternAttr::GetDxfFont(const SfxItemSet& rItemSet, SvtScriptType nS if ( rItemSet.GetItemState( ATTR_FONT_CROSSEDOUT, true, &pItem ) == SfxItemState::SET ) { pItem = &rItemSet.Get( ATTR_FONT_CROSSEDOUT ); - aReturn.eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); + aReturn.eStrike = static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); } if ( rItemSet.GetItemState( ATTR_FONT_CONTOUR, true, &pItem ) == SfxItemState::SET ) @@ -573,7 +573,7 @@ ScDxfFont ScPatternAttr::GetDxfFont(const SfxItemSet& rItemSet, SvtScriptType nS if ( rItemSet.GetItemState( ATTR_FONT_RELIEF, true, &pItem ) == SfxItemState::SET ) { pItem = &rItemSet.Get( ATTR_FONT_RELIEF ); - aReturn.eRelief = (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); + aReturn.eRelief = static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); } if ( rItemSet.GetItemState( ATTR_FONT_COLOR, true, &pItem ) == SfxItemState::SET ) @@ -647,23 +647,23 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r if ( pCondSet->GetItemState( ATTR_FONT_WEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_WEIGHT ); - eWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); + eWeight = static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CJK_FONT_WEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CJK_FONT_WEIGHT ); - eCjkWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); + eCjkWeight = static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CTL_FONT_WEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CTL_FONT_WEIGHT ); - eCtlWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); + eCtlWeight = static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_POSTURE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_POSTURE ); - eItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); + eItalic = static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CJK_FONT_POSTURE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CJK_FONT_POSTURE ); - eCjkItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); + eCjkItalic = static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CTL_FONT_POSTURE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CTL_FONT_POSTURE ); - eCtlItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); + eCtlItalic = static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_UNDERLINE ); @@ -679,7 +679,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_CROSSEDOUT ); - eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); + eStrike = static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_CONTOUR ); @@ -698,7 +698,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r eEmphasis = static_cast<const SvxEmphasisMarkItem*>(pItem)->GetEmphasisMark(); if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_RELIEF ); - eRelief = (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); + eRelief = static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_LANGUAGE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_LANGUAGE ); @@ -716,7 +716,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r if ( pCondSet->GetItemState( ATTR_WRITINGDIR, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_WRITINGDIR ); - eDirection = (SvxFrameDirection)static_cast<const SvxFrameDirectionItem*>(pItem)->GetValue(); + eDirection = static_cast<const SvxFrameDirectionItem*>(pItem)->GetValue(); } else // Everything directly from Pattern { @@ -730,23 +730,23 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r rSrcSet.Get( ATTR_CJK_FONT_HEIGHT )).GetHeight(); nCtlTHeight = static_cast<const SvxFontHeightItem&>( rSrcSet.Get( ATTR_CTL_FONT_HEIGHT )).GetHeight(); - eWeight = (FontWeight)static_cast<const SvxWeightItem&>( + eWeight = static_cast<const SvxWeightItem&>( rSrcSet.Get( ATTR_FONT_WEIGHT )).GetValue(); - eCjkWeight = (FontWeight)static_cast<const SvxWeightItem&>( + eCjkWeight = static_cast<const SvxWeightItem&>( rSrcSet.Get( ATTR_CJK_FONT_WEIGHT )).GetValue(); - eCtlWeight = (FontWeight)static_cast<const SvxWeightItem&>( + eCtlWeight = static_cast<const SvxWeightItem&>( rSrcSet.Get( ATTR_CTL_FONT_WEIGHT )).GetValue(); - eItalic = (FontItalic)static_cast<const SvxPostureItem&>( + eItalic = static_cast<const SvxPostureItem&>( rSrcSet.Get( ATTR_FONT_POSTURE )).GetValue(); - eCjkItalic = (FontItalic)static_cast<const SvxPostureItem&>( + eCjkItalic = static_cast<const SvxPostureItem&>( rSrcSet.Get( ATTR_CJK_FONT_POSTURE )).GetValue(); - eCtlItalic = (FontItalic)static_cast<const SvxPostureItem&>( + eCtlItalic = static_cast<const SvxPostureItem&>( rSrcSet.Get( ATTR_CTL_FONT_POSTURE )).GetValue(); aUnderlineItem = static_cast<const SvxUnderlineItem&>( rSrcSet.Get( ATTR_FONT_UNDERLINE ) ); aOverlineItem = static_cast<const SvxOverlineItem&>( rSrcSet.Get( ATTR_FONT_OVERLINE ) ); bWordLine = static_cast<const SvxWordLineModeItem&>( rSrcSet.Get( ATTR_FONT_WORDLINE )).GetValue(); - eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem&>( + eStrike = static_cast<const SvxCrossedOutItem&>( rSrcSet.Get( ATTR_FONT_CROSSEDOUT )).GetValue(); bOutline = static_cast<const SvxContourItem&>( rSrcSet.Get( ATTR_FONT_CONTOUR )).GetValue(); @@ -756,7 +756,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r rSrcSet.Get( ATTR_FORBIDDEN_RULES )).GetValue(); eEmphasis = static_cast<const SvxEmphasisMarkItem&>( rSrcSet.Get( ATTR_FONT_EMPHASISMARK )).GetEmphasisMark(); - eRelief = (FontRelief)static_cast<const SvxCharReliefItem&>( + eRelief = static_cast<const SvxCharReliefItem&>( rSrcSet.Get( ATTR_FONT_RELIEF )).GetValue(); eLang = static_cast<const SvxLanguageItem&>( rSrcSet.Get( ATTR_FONT_LANGUAGE )).GetLanguage(); @@ -766,7 +766,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r rSrcSet.Get( ATTR_CTL_FONT_LANGUAGE )).GetLanguage(); bHyphenate = static_cast<const SfxBoolItem&>( rSrcSet.Get( ATTR_HYPHENATE )).GetValue(); - eDirection = (SvxFrameDirection)static_cast<const SvxFrameDirectionItem&>( + eDirection = static_cast<const SvxFrameDirectionItem&>( rSrcSet.Get( ATTR_WRITINGDIR )).GetValue(); } @@ -855,13 +855,13 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& 100, ATTR_CTL_FONT_HEIGHT ) ); if (rEditSet.GetItemState(EE_CHAR_WEIGHT,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxWeightItem( (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(), + rDestSet.Put( SvxWeightItem( static_cast<const SvxWeightItem*>(pItem)->GetValue(), ATTR_FONT_WEIGHT) ); if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CJK,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxWeightItem( (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(), + rDestSet.Put( SvxWeightItem( static_cast<const SvxWeightItem*>(pItem)->GetValue(), ATTR_CJK_FONT_WEIGHT) ); if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CTL,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxWeightItem( (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(), + rDestSet.Put( SvxWeightItem( static_cast<const SvxWeightItem*>(pItem)->GetValue(), ATTR_CTL_FONT_WEIGHT) ); // SvxTextLineItem contains enum and color @@ -874,17 +874,17 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& ATTR_FONT_WORDLINE) ); if (rEditSet.GetItemState(EE_CHAR_STRIKEOUT,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxCrossedOutItem( (FontStrikeout)static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(), + rDestSet.Put( SvxCrossedOutItem( static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(), ATTR_FONT_CROSSEDOUT) ); if (rEditSet.GetItemState(EE_CHAR_ITALIC,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxPostureItem( (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(), + rDestSet.Put( SvxPostureItem( static_cast<const SvxPostureItem*>(pItem)->GetValue(), ATTR_FONT_POSTURE) ); if (rEditSet.GetItemState(EE_CHAR_ITALIC_CJK,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxPostureItem( (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(), + rDestSet.Put( SvxPostureItem( static_cast<const SvxPostureItem*>(pItem)->GetValue(), ATTR_CJK_FONT_POSTURE) ); if (rEditSet.GetItemState(EE_CHAR_ITALIC_CTL,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxPostureItem( (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(), + rDestSet.Put( SvxPostureItem( static_cast<const SvxPostureItem*>(pItem)->GetValue(), ATTR_CTL_FONT_POSTURE) ); if (rEditSet.GetItemState(EE_CHAR_OUTLINE,true,&pItem) == SfxItemState::SET) @@ -897,7 +897,7 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& rDestSet.Put( SvxEmphasisMarkItem( static_cast<const SvxEmphasisMarkItem*>(pItem)->GetEmphasisMark(), ATTR_FONT_EMPHASISMARK) ); if (rEditSet.GetItemState(EE_CHAR_RELIEF,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxCharReliefItem( (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue(), + rDestSet.Put( SvxCharReliefItem( static_cast<const SvxCharReliefItem*>(pItem)->GetValue(), ATTR_FONT_RELIEF) ); if (rEditSet.GetItemState(EE_CHAR_LANGUAGE,true,&pItem) == SfxItemState::SET) @@ -1389,7 +1389,7 @@ ScRotateDir ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const long nAttrRotate = GetRotateVal( pCondSet ); if ( nAttrRotate ) { - SvxRotateMode eRotMode = (SvxRotateMode)static_cast<const SvxRotateModeItem&>( + SvxRotateMode eRotMode = static_cast<const SvxRotateModeItem&>( GetItem(ATTR_ROTATE_MODE, pCondSet)).GetValue(); if ( eRotMode == SVX_ROTATE_MODE_STANDARD || nAttrRotate == 18000 ) diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 9d45331e24e4..a20c4729cc0c 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -107,8 +107,8 @@ static void lcl_SetFontProperties( rFont.SetStyleName ( rFontItem.GetStyleName() ); rFont.SetCharSet ( rFontItem.GetCharSet() ); rFont.SetPitch ( rFontItem.GetPitch() ); - rFont.SetWeight ( (FontWeight)rWeightItem.GetValue() ); - rFont.SetItalic ( (FontItalic)rPostureItem.GetValue() ); + rFont.SetWeight ( rWeightItem.GetValue() ); + rFont.SetItalic ( rPostureItem.GetValue() ); } void ScAutoFmtPreview::MakeFonts( sal_uInt16 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ) @@ -145,9 +145,9 @@ void ScAutoFmtPreview::MakeFonts( sal_uInt16 nIndex, vcl::Font& rFont, vcl::Font #define SETONALLFONTS( MethodName, Value ) \ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Value ); - SETONALLFONTS( SetUnderline, (FontLineStyle)pUnderlineItem->GetValue() ) - SETONALLFONTS( SetOverline, (FontLineStyle)pOverlineItem->GetValue() ) - SETONALLFONTS( SetStrikeout, (FontStrikeout)pCrossedOutItem->GetValue() ) + SETONALLFONTS( SetUnderline, pUnderlineItem->GetValue() ) + SETONALLFONTS( SetOverline, pOverlineItem->GetValue() ) + SETONALLFONTS( SetStrikeout, pCrossedOutItem->GetValue() ) SETONALLFONTS( SetOutline, pContourItem->GetValue() ) SETONALLFONTS( SetShadow, pShadowedItem->GetValue() ) SETONALLFONTS( SetColor, aColor ) diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 86cbb294f2ad..0632773624cc 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -873,13 +873,13 @@ static void SetPrevFontStyle( const SfxItemSet& rSet, sal_uInt16 nPosture, sal_u if( GetWhich( rSet, nPosture, nWhich ) ) { const SvxPostureItem& rItem = static_cast<const SvxPostureItem&>( rSet.Get( nWhich ) ); - rFont.SetItalic( ( FontItalic ) rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); + rFont.SetItalic( rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); } if( GetWhich( rSet, nWeight, nWhich ) ) { const SvxWeightItem& rItem = static_cast<const SvxWeightItem&>( rSet.Get( nWhich ) ); - rFont.SetWeight( ( FontWeight ) rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); + rFont.SetWeight( rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); } } @@ -940,7 +940,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack if( GetWhich( rSet, SID_ATTR_CHAR_UNDERLINE, nWhich ) ) { const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>( rSet.Get( nWhich ) ); - eUnderline = ( FontLineStyle ) rItem.GetValue(); + eUnderline = rItem.GetValue(); SetTextLineColor( rItem.GetColor() ); } else @@ -955,7 +955,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack if( GetWhich( rSet, SID_ATTR_CHAR_OVERLINE, nWhich ) ) { const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>( rSet.Get( nWhich ) ); - eOverline = ( FontLineStyle ) rItem.GetValue(); + eOverline = rItem.GetValue(); SetOverlineColor( rItem.GetColor() ); } else @@ -970,7 +970,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack if( GetWhich( rSet, SID_ATTR_CHAR_STRIKEOUT, nWhich ) ) { const SvxCrossedOutItem& rItem = static_cast<const SvxCrossedOutItem&>( rSet.Get( nWhich ) ); - eStrikeout = ( FontStrikeout ) rItem.GetValue(); + eStrikeout = rItem.GetValue(); } else eStrikeout = STRIKEOUT_NONE; @@ -1002,7 +1002,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack if( GetWhich( rSet, SID_ATTR_CHAR_RELIEF, nWhich ) ) { const SvxCharReliefItem& rItem = static_cast<const SvxCharReliefItem&>( rSet.Get( nWhich ) ); - FontRelief eFontRelief = ( FontRelief ) rItem.GetValue(); + FontRelief eFontRelief = rItem.GetValue(); rFont.SetRelief( eFontRelief ); rCJKFont.SetRelief( eFontRelief ); rCTLFont.SetRelief( eFontRelief ); @@ -1176,7 +1176,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet) if( ISITEMSET ) { const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>( rSet.Get( nWhich ) ); - eUnderline = ( FontLineStyle ) rItem.GetValue(); + eUnderline = rItem.GetValue(); SetTextLineColor( rItem.GetColor() ); } else @@ -1192,7 +1192,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet) if( ISITEMSET ) { const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>( rSet.Get( nWhich ) ); - eOverline = ( FontLineStyle ) rItem.GetValue(); + eOverline = rItem.GetValue(); SetOverlineColor( rItem.GetColor() ); } else @@ -1208,7 +1208,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet) if( ISITEMSET ) { const SvxCrossedOutItem& rItem = static_cast<const SvxCrossedOutItem&>( rSet.Get( nWhich ) ); - eStrikeout = ( FontStrikeout ) rItem.GetValue(); + eStrikeout = rItem.GetValue(); } else eStrikeout = STRIKEOUT_NONE; @@ -1243,7 +1243,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet) if( ISITEMSET ) { const SvxCharReliefItem& rItem = static_cast<const SvxCharReliefItem&>( rSet.Get( nWhich ) ); - FontRelief eFontRelief = ( FontRelief ) rItem.GetValue(); + FontRelief eFontRelief = rItem.GetValue(); rFont.SetRelief( eFontRelief ); rCJKFont.SetRelief( eFontRelief ); rCTLFont.SetRelief( eFontRelief ); @@ -1407,14 +1407,14 @@ void SvxFontPrevWindow::SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nPostur if( ISITEMSET ) { const SvxPostureItem& rItem = static_cast<const SvxPostureItem&>( rSet.Get( nWhich ) ); - rFont.SetItalic( ( FontItalic ) rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); + rFont.SetItalic( rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); } nWhich = rSet.GetPool()->GetWhich( nWeight ); if( ISITEMSET ) { const SvxWeightItem& rItem = static_cast<const SvxWeightItem&>( rSet.Get( nWhich ) ); - rFont.SetWeight( ( FontWeight ) rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); + rFont.SetWeight( rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); } } diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 6951d02d2e05..50529398e7a5 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -786,7 +786,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) rFnt.SetPropWidth( static_cast<const SvxCharScaleWidthItem&>(rItem).GetValue() ); break; case RES_CHRATR_RELIEF : - rFnt.SetRelief( (FontRelief)static_cast<const SvxCharReliefItem&>(rItem).GetValue() ); + rFnt.SetRelief( static_cast<const SvxCharReliefItem&>(rItem).GetValue() ); break; case RES_CHRATR_HIDDEN : if( mpShell && mpShell->GetWin()) diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index c091ca5c881e..0cd78a6489f4 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -613,7 +613,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, SetShadow( static_cast<const SvxShadowedItem*>(pItem)->GetValue() ); if( SfxItemState::SET == pAttrSet->GetItemState( RES_CHRATR_RELIEF, true, &pItem )) - SetRelief( (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue() ); + SetRelief( static_cast<const SvxCharReliefItem*>(pItem)->GetValue() ); if( SfxItemState::SET == pAttrSet->GetItemState( RES_CHRATR_SHADOWED, true, &pItem )) SetPropWidth(static_cast<const SvxShadowedItem*>(pItem)->GetValue() ? 50 : 100 ); @@ -815,7 +815,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet, SetOutline( pAttrSet->GetContour().GetValue() ); SetShadow( pAttrSet->GetShadowed().GetValue() ); SetPropWidth( pAttrSet->GetCharScaleW().GetValue() ); - SetRelief( (FontRelief)pAttrSet->GetCharRelief().GetValue() ); + SetRelief( pAttrSet->GetCharRelief().GetValue() ); if( pAttrSet->GetAutoKern().GetValue() ) { SetAutoKern( ( !pIDocumentSettingAccess || diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 82368638ed1b..f421246c03f7 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3331,22 +3331,22 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short { case 2: bWordLine = true; SAL_FALLTHROUGH; - case 1: eUnderline = (FontLineStyle)LINESTYLE_SINGLE; break; - case 3: eUnderline = (FontLineStyle)LINESTYLE_DOUBLE; break; - case 4: eUnderline = (FontLineStyle)LINESTYLE_DOTTED; break; - case 7: eUnderline = (FontLineStyle)LINESTYLE_DASH; break; - case 9: eUnderline = (FontLineStyle)LINESTYLE_DASHDOT; break; - case 10:eUnderline = (FontLineStyle)LINESTYLE_DASHDOTDOT; break; - case 6: eUnderline = (FontLineStyle)LINESTYLE_BOLD; break; - case 11:eUnderline = (FontLineStyle)LINESTYLE_WAVE; break; - case 20:eUnderline = (FontLineStyle)LINESTYLE_BOLDDOTTED; break; - case 23:eUnderline = (FontLineStyle)LINESTYLE_BOLDDASH; break; - case 39:eUnderline = (FontLineStyle)LINESTYLE_LONGDASH; break; - case 55:eUnderline = (FontLineStyle)LINESTYLE_BOLDLONGDASH; break; - case 25:eUnderline = (FontLineStyle)LINESTYLE_BOLDDASHDOT; break; - case 26:eUnderline = (FontLineStyle)LINESTYLE_BOLDDASHDOTDOT;break; - case 27:eUnderline = (FontLineStyle)LINESTYLE_BOLDWAVE; break; - case 43:eUnderline = (FontLineStyle)LINESTYLE_DOUBLEWAVE; break; + case 1: eUnderline = LINESTYLE_SINGLE; break; + case 3: eUnderline = LINESTYLE_DOUBLE; break; + case 4: eUnderline = LINESTYLE_DOTTED; break; + case 7: eUnderline = LINESTYLE_DASH; break; + case 9: eUnderline = LINESTYLE_DASHDOT; break; + case 10:eUnderline = LINESTYLE_DASHDOTDOT; break; + case 6: eUnderline = LINESTYLE_BOLD; break; + case 11:eUnderline = LINESTYLE_WAVE; break; + case 20:eUnderline = LINESTYLE_BOLDDOTTED; break; + case 23:eUnderline = LINESTYLE_BOLDDASH; break; + case 39:eUnderline = LINESTYLE_LONGDASH; break; + case 55:eUnderline = LINESTYLE_BOLDLONGDASH; break; + case 25:eUnderline = LINESTYLE_BOLDDASHDOT; break; + case 26:eUnderline = LINESTYLE_BOLDDASHDOTDOT;break; + case 27:eUnderline = LINESTYLE_BOLDWAVE; break; + case 43:eUnderline = LINESTYLE_DOUBLEWAVE; break; } } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index c905b772f774..e56366234591 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -565,8 +565,8 @@ static void lcl_SetFontProperties( rFont.SetStyleName ( rFontItem.GetStyleName() ); rFont.SetCharSet ( rFontItem.GetCharSet() ); rFont.SetPitch ( rFontItem.GetPitch() ); - rFont.SetWeight ( (FontWeight)rWeightItem.GetValue() ); - rFont.SetItalic ( (FontItalic)rPostureItem.GetValue() ); + rFont.SetWeight ( rWeightItem.GetValue() ); + rFont.SetItalic ( rPostureItem.GetValue() ); } #define SETONALLFONTS( MethodName, Value ) \ @@ -585,9 +585,9 @@ void AutoFormatPreview::MakeFonts( sal_uInt8 nIndex, vcl::Font& rFont, vcl::Font lcl_SetFontProperties( rCJKFont, rBoxFormat.GetCJKFont(), rBoxFormat.GetCJKWeight(), rBoxFormat.GetCJKPosture() ); lcl_SetFontProperties( rCTLFont, rBoxFormat.GetCTLFont(), rBoxFormat.GetCTLWeight(), rBoxFormat.GetCTLPosture() ); - SETONALLFONTS( SetUnderline, (FontLineStyle)rBoxFormat.GetUnderline().GetValue() ); - SETONALLFONTS( SetOverline, (FontLineStyle)rBoxFormat.GetOverline().GetValue() ); - SETONALLFONTS( SetStrikeout, (FontStrikeout)rBoxFormat.GetCrossedOut().GetValue() ); + SETONALLFONTS( SetUnderline, rBoxFormat.GetUnderline().GetValue() ); + SETONALLFONTS( SetOverline, rBoxFormat.GetOverline().GetValue() ); + SETONALLFONTS( SetStrikeout, rBoxFormat.GetCrossedOut().GetValue() ); SETONALLFONTS( SetOutline, rBoxFormat.GetContour().GetValue() ); SETONALLFONTS( SetShadow, rBoxFormat.GetShadowed().GetValue() ); SETONALLFONTS( SetColor, rBoxFormat.GetColor().GetValue() ); |