Tag: cws_dev300_overline2 User: fme Date: 2008-06-26 08:37:50+0000 Modified: dba/reportdesign/source/ui/misc/UITools.cxx
Log: #i5991# martinwhitaker - overline support File Changes: Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/UITools.cxx?r1=1.6&r2=1.6.18.1 Delta lines: +9 -9 ------------------- --- UITools.cxx 2008-04-10 19:11:22+0000 1.6 +++ UITools.cxx 2008-06-26 08:37:47+0000 1.6.18.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UITools.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.18.1 $ * * This file is part of OpenOffice.org. * @@ -330,7 +330,7 @@ _rItemSet.Put(SvxBlinkItem(_rxReportControlFormat->getCharFlash(),ITEMID_BLINK)); _rItemSet.Put(SvxCharHiddenItem(_rxReportControlFormat->getCharHidden(),ITEMID_CHARHIDDEN)); _rItemSet.Put(SvxTwoLinesItem(_rxReportControlFormat->getCharCombineIsOn(),_rxReportControlFormat->getCharCombinePrefix().toChar(),_rxReportControlFormat->getCharCombineSuffix().toChar(),ITEMID_TWOLINES)); - SvxUnderlineItem aUnderLineItem(aFont.GetUnderline(),ITEMID_UNDERLINE); + SvxTextLineItem aUnderLineItem(aFont.GetUnderline(),ITEMID_UNDERLINE); aUnderLineItem.SetColor(_rxReportControlFormat->getCharUnderlineColor()); _rItemSet.Put(aUnderLineItem); _rItemSet.Put(SvxFontHeightItem(OutputDevice::LogicToLogic(Size(0, (sal_Int32)aFont.GetHeight()), MAP_POINT, MAP_TWIP).Height(),100,ITEMID_FONTHEIGHT)); @@ -417,10 +417,10 @@ const SvxCharScaleWidthItem* pCharItem = static_cast<const SvxCharScaleWidthItem*>(pItem); aNewFont.SetWidthType(VCLUnoHelper::ConvertFontWidth(pCharItem->GetValue())); } - if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_UNDERLINE,sal_True,&pItem) && pItem->ISA(SvxUnderlineItem)) + if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_UNDERLINE,sal_True,&pItem) && pItem->ISA(SvxTextLineItem)) { - const SvxUnderlineItem* pFontItem = static_cast<const SvxUnderlineItem*>(pItem); - aNewFont.SetUnderline(pFontItem->GetUnderline()); + const SvxTextLineItem* pFontItem = static_cast<const SvxTextLineItem*>(pItem); + aNewFont.SetUnderline(pFontItem->GetLineStyle()); } if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_COLOR,sal_True,&pItem) && pItem->ISA(SvxColorItem)) { @@ -452,9 +452,9 @@ const SvxContourItem* pFontItem = static_cast<const SvxContourItem*>(pItem); lcl_pushBack( _out_rProperties, "CharContoured", uno::makeAny( pFontItem->GetValue() ) ); } - if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_UNDERLINE,sal_True,&pItem) && pItem->ISA(SvxUnderlineItem)) + if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_UNDERLINE,sal_True,&pItem) && pItem->ISA(SvxTextLineItem)) { - const SvxUnderlineItem* pFontItem = static_cast<const SvxUnderlineItem*>(pItem); + const SvxTextLineItem* pFontItem = static_cast<const SvxTextLineItem*>(pItem); lcl_pushBack( _out_rProperties, "CharUnderlineColor", uno::makeAny( pFontItem->GetColor().GetColor() ) ); } if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_HORJUSTIFY,sal_True,&pItem) && pItem->ISA(SvxHorJustifyItem)) @@ -623,7 +623,7 @@ new SvxWordLineModeItem(FALSE,ITEMID_WORDLINEMODE), new SvxContourItem(FALSE,ITEMID_CONTOUR), new SvxCrossedOutItem(STRIKEOUT_NONE,ITEMID_CROSSEDOUT), - new SvxUnderlineItem(UNDERLINE_NONE,ITEMID_UNDERLINE), + new SvxTextLineItem(UNDERLINE_NONE,ITEMID_UNDERLINE), new SvxFontHeightItem(240,100,ITEMID_FONTHEIGHT), new SvxPropSizeItem(100,ITEMID_PROPSIZE), new SvxColorItem(ITEMID_COLOR), --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
