[Libreoffice-commits] core.git: chart2/source cppcanvas/source cui/source drawinglayer/source editeng/source extensions/source filter/source include/drawinglayer include/editeng include/tools include/vcl reportdesign/source sc/inc sc/qa sc/source sd/source svtools/source svx/source sw/source toolkit/source vcl/inc vcl/source vcl/win
Chris Sherlock
chris.sherlock79 at gmail.com
Sat Jan 30 20:31:56 PST 2016
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 4
chart2/source/view/main/DummyXShape.cxx | 2
cppcanvas/source/inc/outdevstate.hxx | 4
cppcanvas/source/mtfrenderer/implrenderer.cxx | 2
cppcanvas/source/mtfrenderer/mtftools.cxx | 76 ++---
cui/source/tabpages/chardlg.cxx | 40 +-
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 16 -
drawinglayer/source/primitive2d/textenumsprimitive2d.cxx | 76 ++---
drawinglayer/source/processor2d/vclprocessor2d.cxx | 10
editeng/source/editeng/editattr.cxx | 4
editeng/source/editeng/eerdll.cxx | 4
editeng/source/editeng/impedit3.cxx | 18 -
editeng/source/editeng/impedit4.cxx | 20 -
editeng/source/items/bulitem.cxx | 2
editeng/source/items/svxfont.cxx | 4
editeng/source/items/textitem.cxx | 28 +-
editeng/source/misc/svxacorr.cxx | 2
editeng/source/outliner/outliner.cxx | 4
editeng/source/rtf/rtfitem.cxx | 92 +++---
editeng/source/uno/unofdesc.cxx | 4
extensions/source/propctrlr/fontdialog.cxx | 6
extensions/source/propctrlr/standardcontrol.cxx | 2
filter/source/flash/swfwriter1.cxx | 6
filter/source/graphicfilter/ipict/ipict.cxx | 4
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/svdfppt.cxx | 2
filter/source/svg/svgwriter.cxx | 14 -
include/drawinglayer/primitive2d/textenumsprimitive2d.hxx | 4
include/editeng/udlnitem.hxx | 12
include/tools/fontenum.hxx | 22 -
include/vcl/font.hxx | 8
include/vcl/metaact.hxx | 12
include/vcl/outdev.hxx | 16 -
include/vcl/pdfwriter.hxx | 4
reportdesign/source/ui/misc/UITools.cxx | 2
sc/inc/fonthelper.hxx | 4
sc/qa/unit/helper/qahelper.cxx | 2
sc/qa/unit/subsequent_export-test.cxx | 12
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/source/core/data/docpool.cxx | 4
sc/source/core/data/patattr.cxx | 24 -
sc/source/core/data/stlpool.cxx | 2
sc/source/core/tool/autoform.cxx | 8
sc/source/filter/excel/fontbuff.cxx | 10
sc/source/filter/excel/xehelper.cxx | 6
sc/source/filter/excel/xestream.cxx | 10
sc/source/filter/excel/xestyle.cxx | 10
sc/source/filter/excel/xlstyle.cxx | 36 +-
sc/source/filter/html/htmlexp.cxx | 2
sc/source/filter/html/htmlpars.cxx | 4
sc/source/filter/inc/orcusinterface.hxx | 2
sc/source/filter/inc/xlstyle.hxx | 4
sc/source/filter/lotus/op.cxx | 2
sc/source/filter/oox/stylesbuffer.cxx | 139 ++++------
sc/source/filter/orcus/interface.cxx | 8
sc/source/filter/qpro/qprostyle.cxx | 2
sc/source/filter/rtf/rtfexp.cxx | 2
sc/source/filter/starcalc/scflt.cxx | 6
sc/source/filter/xml/xmlcelli.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 20 -
sc/source/ui/miscdlgs/autofmt.cxx | 4
sc/source/ui/view/editsh.cxx | 26 -
sc/source/ui/view/formatsh.cxx | 28 +-
sd/source/core/drawdoc4.cxx | 4
sd/source/core/stlpool.cxx | 20 -
sd/source/filter/html/htmlex.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 4
sd/source/ui/view/drtxtob1.cxx | 12
sd/source/ui/view/drviews2.cxx | 4
sd/source/ui/view/outlview.cxx | 2
svtools/source/control/breadcrumb.cxx | 6
svtools/source/control/hyperlabel.cxx | 4
svtools/source/control/roadmap.cxx | 4
svx/source/dialog/fntctrl.cxx | 24 -
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 6
svx/source/sidebar/text/TextPropertyPanel.cxx | 6
svx/source/sidebar/text/TextPropertyPanel.hxx | 2
svx/source/sidebar/text/TextUnderlineControl.cxx | 50 +--
svx/source/sidebar/text/TextUnderlineControl.hxx | 2
svx/source/sidebar/text/TextUnderlinePopup.cxx | 2
svx/source/sidebar/text/TextUnderlinePopup.hxx | 2
svx/source/styles/CommonStylePreviewRenderer.cxx | 2
svx/source/svdraw/svdotextdecomposition.cxx | 14 -
svx/source/table/tablertfexporter.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/bastyp/init.cxx | 4
sw/source/core/doc/DocumentStylePoolManager.cxx | 8
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/doc/tblafmt.cxx | 4
sw/source/core/inc/swfont.hxx | 20 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 8
sw/source/core/text/atrstck.cxx | 2
sw/source/core/text/itrform2.cxx | 6
sw/source/core/text/itrpaint.cxx | 6
sw/source/core/text/porfld.cxx | 8
sw/source/core/text/portxt.cxx | 8
sw/source/core/text/redlnitr.cxx | 8
sw/source/core/text/txtfld.cxx | 8
sw/source/core/text/txtftn.cxx | 4
sw/source/core/txtnode/fntcache.cxx | 14 -
sw/source/core/txtnode/fntcap.cxx | 16 -
sw/source/core/txtnode/swfont.cxx | 18 -
sw/source/filter/html/css1atr.cxx | 8
sw/source/filter/html/htmlatr.cxx | 8
sw/source/filter/html/htmlforw.cxx | 12
sw/source/filter/html/svxcss1.cxx | 14 -
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 36 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 34 +-
sw/source/filter/ww8/ww8atr.cxx | 36 +-
sw/source/filter/ww8/ww8par6.cxx | 34 +-
sw/source/ui/config/optpage.cxx | 12
sw/source/ui/table/tautofmt.cxx | 4
sw/source/uibase/app/swmodul1.cxx | 2
sw/source/uibase/config/modcfg.cxx | 8
sw/source/uibase/config/viewopt.cxx | 2
sw/source/uibase/shells/annotsh.cxx | 8
sw/source/uibase/shells/drwtxtex.cxx | 8
sw/source/uibase/shells/txtattr.cxx | 16 -
toolkit/source/helper/vclunohelper.cxx | 4
vcl/inc/impfont.hxx | 4
vcl/source/control/edit.cxx | 10
vcl/source/control/fixedhyper.cxx | 2
vcl/source/edit/texteng.cxx | 10
vcl/source/edit/txtattr.cxx | 2
vcl/source/filter/sgvtext.cxx | 4
vcl/source/filter/wmf/emfwr.cxx | 2
vcl/source/filter/wmf/winmtf.cxx | 2
vcl/source/filter/wmf/wmfwr.cxx | 2
vcl/source/font/font.cxx | 20 -
vcl/source/gdi/metaact.cxx | 12
vcl/source/gdi/pdfwriter.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 96 +++---
vcl/source/gdi/pdfwriter_impl.hxx | 6
vcl/source/gdi/svmconverter.cxx | 8
vcl/source/outdev/font.cxx | 4
vcl/source/outdev/textline.cxx | 102 +++----
vcl/source/window/window2.cxx | 2
vcl/win/gdi/salfont.cxx | 4
143 files changed, 886 insertions(+), 897 deletions(-)
New commits:
commit 3187193a6142b4b1c974ae1e1de572fa74a3c8ee
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Jan 29 17:43:42 2016 +1100
tools: rename FontUnderline to FontLineStyle
Change-Id: I4750ad8569a1003b2f8c29052f3e25003ee433ca
Reviewed-on: https://gerrit.libreoffice.org/21892
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index fae05e7..1991ef6 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -141,7 +141,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_UNDERLINE:
{
- SvxUnderlineItem aItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE);
+ SvxUnderlineItem aItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE);
bool bModified = false;
uno::Any aValue( GetPropertySet()->getPropertyValue( "CharUnderline" ));
@@ -173,7 +173,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_OVERLINE:
{
- SvxOverlineItem aItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
+ SvxOverlineItem aItem( LINESTYLE_NONE, EE_CHAR_OVERLINE );
bool bModified = false;
uno::Any aValue( GetPropertySet()->getPropertyValue( "CharOverline" ) );
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index e2e54df..955ea05 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -771,7 +771,7 @@ struct FontAttribSetter
}
else if(rPropName == "CharUnderline")
{
- FontUnderline eUnderline = static_cast<FontUnderline>(rProp.second.get<sal_Int16>());
+ FontLineStyle eUnderline = static_cast<FontLineStyle>(rProp.second.get<sal_Int16>());
mrFont.SetUnderline(eUnderline);
}
else if(rPropName == "CharWeight")
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 63aa7fb..2613440 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -63,8 +63,8 @@ namespace cppcanvas
textAlignment(0), // TODO(Q2): Synchronize with implrenderer
// and possibly new rendering::TextAlignment
textReliefStyle(RELIEF_NONE),
- textOverlineStyle(UNDERLINE_NONE),
- textUnderlineStyle(UNDERLINE_NONE),
+ textOverlineStyle(LINESTYLE_NONE),
+ textUnderlineStyle(LINESTYLE_NONE),
textStrikeoutStyle(STRIKEOUT_NONE),
textReferencePoint(ALIGN_BASELINE),
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 69a5d66..31cd771 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1496,7 +1496,7 @@ namespace cppcanvas
rState.textReliefStyle = (sal_Int8)rFont.GetRelief();
rState.textOverlineStyle = (sal_Int8)rFont.GetOverline();
rState.textUnderlineStyle = rParms.maFontUnderline.is_initialized() ?
- (*rParms.maFontUnderline ? (sal_Int8)UNDERLINE_SINGLE : (sal_Int8)UNDERLINE_NONE) :
+ (*rParms.maFontUnderline ? (sal_Int8)LINESTYLE_SINGLE : (sal_Int8)LINESTYLE_NONE) :
(sal_Int8)rFont.GetUnderline();
rState.textStrikeoutStyle = (sal_Int8)rFont.GetStrikeout();
rState.textEmphasisMarkStyle = (sal_Int8)rFont.GetEmphasisMark();
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index b148e76..32c0af7 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -320,16 +320,16 @@ namespace cppcanvas
switch( rTextLineInfo.mnOverlineStyle )
{
- case UNDERLINE_NONE: // nothing to do
+ case LINESTYLE_NONE: // nothing to do
// FALLTHROUGH intended
- case UNDERLINE_DONTKNOW:
+ case LINESTYLE_DONTKNOW:
break;
- case UNDERLINE_SMALLWAVE: // TODO(F3): NYI
+ case LINESTYLE_SMALLWAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_WAVE: // TODO(F3): NYI
+ case LINESTYLE_WAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_SINGLE:
+ case LINESTYLE_SINGLE:
appendRect(
aTextLinesPolyPoly,
rStartPos,
@@ -339,19 +339,19 @@ namespace cppcanvas
rTextLineInfo.mnOverlineOffset + rTextLineInfo.mnOverlineHeight );
break;
- case UNDERLINE_BOLDDOTTED: // TODO(F3): NYI
+ case LINESTYLE_BOLDDOTTED: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDDASH: // TODO(F3): NYI
+ case LINESTYLE_BOLDDASH: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDLONGDASH: // TODO(F3): NYI
+ case LINESTYLE_BOLDLONGDASH: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDDASHDOT: // TODO(F3): NYI
+ case LINESTYLE_BOLDDASHDOT: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDDASHDOTDOT:// TODO(F3): NYI
+ case LINESTYLE_BOLDDASHDOTDOT:// TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDWAVE: // TODO(F3): NYI
+ case LINESTYLE_BOLDWAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLD:
+ case LINESTYLE_BOLD:
appendRect(
aTextLinesPolyPoly,
rStartPos,
@@ -361,9 +361,9 @@ namespace cppcanvas
rTextLineInfo.mnOverlineOffset + rTextLineInfo.mnOverlineHeight );
break;
- case UNDERLINE_DOUBLEWAVE: // TODO(F3): NYI
+ case LINESTYLE_DOUBLEWAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_DOUBLE:
+ case LINESTYLE_DOUBLE:
appendRect(
aTextLinesPolyPoly,
rStartPos,
@@ -381,9 +381,9 @@ namespace cppcanvas
rTextLineInfo.mnOverlineOffset + rTextLineInfo.mnOverlineHeight * 2.0 );
break;
- case UNDERLINE_DASHDOTDOT: // TODO(F3): NYI
+ case LINESTYLE_DASHDOTDOT: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_DOTTED:
+ case LINESTYLE_DOTTED:
appendDashes(
aTextLinesPolyPoly,
rStartPos.getX(),
@@ -394,9 +394,9 @@ namespace cppcanvas
2*rTextLineInfo.mnOverlineHeight );
break;
- case UNDERLINE_DASHDOT: // TODO(F3): NYI
+ case LINESTYLE_DASHDOT: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_DASH:
+ case LINESTYLE_DASH:
appendDashes(
aTextLinesPolyPoly,
rStartPos.getX(),
@@ -407,7 +407,7 @@ namespace cppcanvas
6*rTextLineInfo.mnOverlineHeight );
break;
- case UNDERLINE_LONGDASH:
+ case LINESTYLE_LONGDASH:
appendDashes(
aTextLinesPolyPoly,
rStartPos.getX(),
@@ -425,16 +425,16 @@ namespace cppcanvas
switch( rTextLineInfo.mnUnderlineStyle )
{
- case UNDERLINE_NONE: // nothing to do
+ case LINESTYLE_NONE: // nothing to do
// FALLTHROUGH intended
- case UNDERLINE_DONTKNOW:
+ case LINESTYLE_DONTKNOW:
break;
- case UNDERLINE_SMALLWAVE: // TODO(F3): NYI
+ case LINESTYLE_SMALLWAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_WAVE: // TODO(F3): NYI
+ case LINESTYLE_WAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_SINGLE:
+ case LINESTYLE_SINGLE:
appendRect(
aTextLinesPolyPoly,
rStartPos,
@@ -444,19 +444,19 @@ namespace cppcanvas
rTextLineInfo.mnUnderlineOffset + rTextLineInfo.mnLineHeight );
break;
- case UNDERLINE_BOLDDOTTED: // TODO(F3): NYI
+ case LINESTYLE_BOLDDOTTED: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDDASH: // TODO(F3): NYI
+ case LINESTYLE_BOLDDASH: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDLONGDASH: // TODO(F3): NYI
+ case LINESTYLE_BOLDLONGDASH: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDDASHDOT: // TODO(F3): NYI
+ case LINESTYLE_BOLDDASHDOT: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDDASHDOTDOT:// TODO(F3): NYI
+ case LINESTYLE_BOLDDASHDOTDOT:// TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLDWAVE: // TODO(F3): NYI
+ case LINESTYLE_BOLDWAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_BOLD:
+ case LINESTYLE_BOLD:
appendRect(
aTextLinesPolyPoly,
rStartPos,
@@ -466,9 +466,9 @@ namespace cppcanvas
rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight );
break;
- case UNDERLINE_DOUBLEWAVE: // TODO(F3): NYI
+ case LINESTYLE_DOUBLEWAVE: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_DOUBLE:
+ case LINESTYLE_DOUBLE:
appendRect(
aTextLinesPolyPoly,
rStartPos,
@@ -486,9 +486,9 @@ namespace cppcanvas
rTextLineInfo.mnUnderlineOffset + 3*rTextLineInfo.mnLineHeight );
break;
- case UNDERLINE_DASHDOTDOT: // TODO(F3): NYI
+ case LINESTYLE_DASHDOTDOT: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_DOTTED:
+ case LINESTYLE_DOTTED:
appendDashes(
aTextLinesPolyPoly,
rStartPos.getX(),
@@ -499,9 +499,9 @@ namespace cppcanvas
2*rTextLineInfo.mnLineHeight );
break;
- case UNDERLINE_DASHDOT: // TODO(F3): NYI
+ case LINESTYLE_DASHDOT: // TODO(F3): NYI
// FALLTHROUGH intended
- case UNDERLINE_DASH:
+ case LINESTYLE_DASH:
appendDashes(
aTextLinesPolyPoly,
rStartPos.getX(),
@@ -512,7 +512,7 @@ namespace cppcanvas
6*rTextLineInfo.mnLineHeight );
break;
- case UNDERLINE_LONGDASH:
+ case LINESTYLE_LONGDASH:
appendDashes(
aTextLinesPolyPoly,
rStartPos.getX(),
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index e90b300..ba3f620 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1539,9 +1539,9 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
SvxFont& rCTLFont = GetPreviewCTLFont();
sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos();
- FontUnderline eUnderline = (FontUnderline)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos ));
+ FontLineStyle eUnderline = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos ));
nPos = m_pOverlineLB->GetSelectEntryPos();
- FontUnderline eOverline = (FontUnderline)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos ));
+ FontLineStyle eOverline = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos ));
nPos = m_pStrikeoutLB->GetSelectEntryPos();
FontStrikeout eStrikeout = (FontStrikeout)reinterpret_cast<sal_uLong>(m_pStrikeoutLB->GetEntryData( nPos ));
rFont.SetUnderline( eUnderline );
@@ -1823,9 +1823,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
// Underline
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE );
- rFont.SetUnderline( UNDERLINE_NONE );
- rCJKFont.SetUnderline( UNDERLINE_NONE );
- rCTLFont.SetUnderline( UNDERLINE_NONE );
+ rFont.SetUnderline( LINESTYLE_NONE );
+ rCJKFont.SetUnderline( LINESTYLE_NONE );
+ rCTLFont.SetUnderline( LINESTYLE_NONE );
m_pUnderlineLB->SelectEntryPos( 0 );
SfxItemState eState = rSet->GetItemState( nWhich );
@@ -1837,16 +1837,16 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
else
{
const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>(rSet->Get( nWhich ));
- FontUnderline eUnderline = (FontUnderline)rItem.GetValue();
+ FontLineStyle eUnderline = (FontLineStyle)rItem.GetValue();
rFont.SetUnderline( eUnderline );
rCJKFont.SetUnderline( eUnderline );
rCTLFont.SetUnderline( eUnderline );
- if ( eUnderline != UNDERLINE_NONE )
+ if ( eUnderline != LINESTYLE_NONE )
{
for ( sal_Int32 i = 0; i < m_pUnderlineLB->GetEntryCount(); ++i )
{
- if ( (FontUnderline)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData(i)) == eUnderline )
+ if ( (FontLineStyle)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData(i)) == eUnderline )
{
m_pUnderlineLB->SelectEntryPos(i);
bEnable = true;
@@ -1880,9 +1880,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
// Overline
nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE );
- rFont.SetOverline( UNDERLINE_NONE );
- rCJKFont.SetOverline( UNDERLINE_NONE );
- rCTLFont.SetOverline( UNDERLINE_NONE );
+ rFont.SetOverline( LINESTYLE_NONE );
+ rCJKFont.SetOverline( LINESTYLE_NONE );
+ rCTLFont.SetOverline( LINESTYLE_NONE );
m_pOverlineLB->SelectEntryPos( 0 );
eState = rSet->GetItemState( nWhich );
@@ -1894,16 +1894,16 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
else
{
const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>(rSet->Get( nWhich ));
- FontUnderline eOverline = (FontUnderline)rItem.GetValue();
+ FontLineStyle eOverline = (FontLineStyle)rItem.GetValue();
rFont.SetOverline( eOverline );
rCJKFont.SetOverline( eOverline );
rCTLFont.SetOverline( eOverline );
- if ( eOverline != UNDERLINE_NONE )
+ if ( eOverline != LINESTYLE_NONE )
{
for ( sal_Int32 i = 0; i < m_pOverlineLB->GetEntryCount(); ++i )
{
- if ( (FontUnderline)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData(i)) == eOverline )
+ if ( (FontLineStyle)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData(i)) == eOverline )
{
m_pOverlineLB->SelectEntryPos(i);
bEnable = true;
@@ -2274,7 +2274,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_UNDERLINE );
sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos();
- FontUnderline eUnder = (FontUnderline)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos ));
+ FontLineStyle eUnder = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos ));
if ( pOld )
{
@@ -2286,8 +2286,8 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
SfxItemState::DEFAULT > rOldSet.GetItemState( nWhich );
const SvxUnderlineItem& rItem = *static_cast<const SvxUnderlineItem*>(pOld);
- if ( (FontUnderline)rItem.GetValue() == eUnder &&
- ( UNDERLINE_NONE == eUnder || rItem.GetColor() == m_pUnderlineColorLB->GetSelectEntryColor() ) &&
+ if ( (FontLineStyle)rItem.GetValue() == eUnder &&
+ ( LINESTYLE_NONE == eUnder || rItem.GetColor() == m_pUnderlineColorLB->GetSelectEntryColor() ) &&
! bAllowChg )
bChanged = false;
}
@@ -2308,7 +2308,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_OVERLINE );
nPos = m_pOverlineLB->GetSelectEntryPos();
- FontUnderline eOver = (FontUnderline)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos ));
+ FontLineStyle eOver = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos ));
if ( pOld )
{
@@ -2320,8 +2320,8 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
SfxItemState::DEFAULT > rOldSet.GetItemState( nWhich );
const SvxOverlineItem& rItem = *static_cast<const SvxOverlineItem*>(pOld);
- if ( (FontUnderline)rItem.GetValue() == eOver &&
- ( UNDERLINE_NONE == eOver || rItem.GetColor() == m_pOverlineColorLB->GetSelectEntryColor() ) &&
+ if ( (FontLineStyle)rItem.GetValue() == eOver &&
+ ( LINESTYLE_NONE == eOver || rItem.GetColor() == m_pOverlineColorLB->GetSelectEntryColor() ) &&
! bAllowChg )
bChanged = false;
}
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 94d04c0..ac7b01f 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -1299,8 +1299,8 @@ namespace
const bool bWordLineMode(rFont.IsWordLineMode());
const bool bDecoratedIsNeeded(
- UNDERLINE_NONE != rFont.GetOverline()
- || UNDERLINE_NONE != rFont.GetUnderline()
+ LINESTYLE_NONE != rFont.GetOverline()
+ || LINESTYLE_NONE != rFont.GetUnderline()
|| STRIKEOUT_NONE != rFont.GetStrikeout()
|| EMPHASISMARK_NONE != (rFont.GetEmphasisMark() & EMPHASISMARK_STYLE)
|| RELIEF_NONE != rFont.GetRelief()
@@ -1310,12 +1310,12 @@ namespace
if(bDecoratedIsNeeded)
{
// prepare overline, underline and strikeout data
- const drawinglayer::primitive2d::TextLine eFontOverline(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rFont.GetOverline()));
- const drawinglayer::primitive2d::TextLine eFontUnderline(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rFont.GetUnderline()));
+ const drawinglayer::primitive2d::TextLine eFontOverline(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rFont.GetOverline()));
+ const drawinglayer::primitive2d::TextLine eFontLineStyle(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rFont.GetUnderline()));
const drawinglayer::primitive2d::TextStrikeout eTextStrikeout(drawinglayer::primitive2d::mapFontStrikeoutToTextStrikeout(rFont.GetStrikeout()));
// check UndelineAbove
- const bool bUnderlineAbove(drawinglayer::primitive2d::TEXT_LINE_NONE != eFontUnderline && isUnderlineAbove(rFont));
+ const bool bUnderlineAbove(drawinglayer::primitive2d::TEXT_LINE_NONE != eFontLineStyle && isUnderlineAbove(rFont));
// prepare emphasis mark data
drawinglayer::primitive2d::TextEmphasisMark eTextEmphasisMark(drawinglayer::primitive2d::TEXT_EMPHASISMARK_NONE);
@@ -1362,7 +1362,7 @@ namespace
rProperty.getOverlineColorActive() ? rProperty.getOverlineColor() : aFontColor,
rProperty.getTextLineColorActive() ? rProperty.getTextLineColor() : aFontColor,
eFontOverline,
- eFontUnderline,
+ eFontLineStyle,
bUnderlineAbove,
eTextStrikeout,
bWordLineMode,
@@ -1472,8 +1472,8 @@ namespace
if(fLineWidth > 0.0)
{
- const drawinglayer::primitive2d::TextLine aOverlineMode(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rAction.GetOverline()));
- const drawinglayer::primitive2d::TextLine aUnderlineMode(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rAction.GetUnderline()));
+ const drawinglayer::primitive2d::TextLine aOverlineMode(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rAction.GetOverline()));
+ const drawinglayer::primitive2d::TextLine aUnderlineMode(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rAction.GetUnderline()));
const drawinglayer::primitive2d::TextStrikeout aTextStrikeout(drawinglayer::primitive2d::mapFontStrikeoutToTextStrikeout(rAction.GetStrikeout()));
const bool bOverlineUsed(drawinglayer::primitive2d::TEXT_LINE_NONE != aOverlineMode);
diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
index f8cf722..8232e2b 100644
--- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
@@ -25,54 +25,54 @@ namespace drawinglayer
{
namespace primitive2d
{
- TextLine mapFontUnderlineToTextLine(FontUnderline eLineStyle)
+ TextLine mapFontLineStyleToTextLine(FontLineStyle eLineStyle)
{
switch(eLineStyle)
{
- case UNDERLINE_SINGLE: return TEXT_LINE_SINGLE;
- case UNDERLINE_DOUBLE: return TEXT_LINE_DOUBLE;
- case UNDERLINE_DOTTED: return TEXT_LINE_DOTTED;
- case UNDERLINE_DASH: return TEXT_LINE_DASH;
- case UNDERLINE_LONGDASH: return TEXT_LINE_LONGDASH;
- case UNDERLINE_DASHDOT: return TEXT_LINE_DASHDOT;
- case UNDERLINE_DASHDOTDOT: return TEXT_LINE_DASHDOTDOT;
- case UNDERLINE_SMALLWAVE: return TEXT_LINE_SMALLWAVE;
- case UNDERLINE_WAVE: return TEXT_LINE_WAVE;
- case UNDERLINE_DOUBLEWAVE: return TEXT_LINE_DOUBLEWAVE;
- case UNDERLINE_BOLD: return TEXT_LINE_BOLD;
- case UNDERLINE_BOLDDOTTED: return TEXT_LINE_BOLDDOTTED;
- case UNDERLINE_BOLDDASH: return TEXT_LINE_BOLDDASH;
- case UNDERLINE_BOLDLONGDASH: return TEXT_LINE_BOLDLONGDASH;
- case UNDERLINE_BOLDDASHDOT: return TEXT_LINE_BOLDDASHDOT;
- case UNDERLINE_BOLDDASHDOTDOT: return TEXT_LINE_BOLDDASHDOTDOT;
- case UNDERLINE_BOLDWAVE: return TEXT_LINE_BOLDWAVE;
- // FontUnderline_FORCE_EQUAL_SIZE, UNDERLINE_DONTKNOW, UNDERLINE_NONE
+ case LINESTYLE_SINGLE: return TEXT_LINE_SINGLE;
+ case LINESTYLE_DOUBLE: return TEXT_LINE_DOUBLE;
+ case LINESTYLE_DOTTED: return TEXT_LINE_DOTTED;
+ case LINESTYLE_DASH: return TEXT_LINE_DASH;
+ case LINESTYLE_LONGDASH: return TEXT_LINE_LONGDASH;
+ case LINESTYLE_DASHDOT: return TEXT_LINE_DASHDOT;
+ case LINESTYLE_DASHDOTDOT: return TEXT_LINE_DASHDOTDOT;
+ case LINESTYLE_SMALLWAVE: return TEXT_LINE_SMALLWAVE;
+ case LINESTYLE_WAVE: return TEXT_LINE_WAVE;
+ case LINESTYLE_DOUBLEWAVE: return TEXT_LINE_DOUBLEWAVE;
+ case LINESTYLE_BOLD: return TEXT_LINE_BOLD;
+ case LINESTYLE_BOLDDOTTED: return TEXT_LINE_BOLDDOTTED;
+ case LINESTYLE_BOLDDASH: return TEXT_LINE_BOLDDASH;
+ case LINESTYLE_BOLDLONGDASH: return TEXT_LINE_BOLDLONGDASH;
+ case LINESTYLE_BOLDDASHDOT: return TEXT_LINE_BOLDDASHDOT;
+ case LINESTYLE_BOLDDASHDOTDOT: return TEXT_LINE_BOLDDASHDOTDOT;
+ case LINESTYLE_BOLDWAVE: return TEXT_LINE_BOLDWAVE;
+ // FontLineStyle_FORCE_EQUAL_SIZE, LINESTYLE_DONTKNOW, LINESTYLE_NONE
default: return TEXT_LINE_NONE;
}
}
- FontUnderline mapTextLineToFontUnderline(TextLine eLineStyle)
+ FontLineStyle mapTextLineToFontLineStyle(TextLine eLineStyle)
{
switch(eLineStyle)
{
- default: /*TEXT_LINE_NONE*/ return UNDERLINE_NONE;
- case TEXT_LINE_SINGLE: return UNDERLINE_SINGLE;
- case TEXT_LINE_DOUBLE: return UNDERLINE_DOUBLE;
- case TEXT_LINE_DOTTED: return UNDERLINE_DOTTED;
- case TEXT_LINE_DASH: return UNDERLINE_DASH;
- case TEXT_LINE_LONGDASH: return UNDERLINE_LONGDASH;
- case TEXT_LINE_DASHDOT: return UNDERLINE_DASHDOT;
- case TEXT_LINE_DASHDOTDOT: return UNDERLINE_DASHDOTDOT;
- case TEXT_LINE_SMALLWAVE: return UNDERLINE_SMALLWAVE;
- case TEXT_LINE_WAVE: return UNDERLINE_WAVE;
- case TEXT_LINE_DOUBLEWAVE: return UNDERLINE_DOUBLEWAVE;
- case TEXT_LINE_BOLD: return UNDERLINE_BOLD;
- case TEXT_LINE_BOLDDOTTED: return UNDERLINE_BOLDDOTTED;
- case TEXT_LINE_BOLDDASH: return UNDERLINE_BOLDDASH;
- case TEXT_LINE_BOLDLONGDASH: return UNDERLINE_LONGDASH;
- case TEXT_LINE_BOLDDASHDOT: return UNDERLINE_BOLDDASHDOT;
- case TEXT_LINE_BOLDDASHDOTDOT:return UNDERLINE_BOLDDASHDOT;
- case TEXT_LINE_BOLDWAVE: return UNDERLINE_BOLDWAVE;
+ default: /*TEXT_LINE_NONE*/ return LINESTYLE_NONE;
+ case TEXT_LINE_SINGLE: return LINESTYLE_SINGLE;
+ case TEXT_LINE_DOUBLE: return LINESTYLE_DOUBLE;
+ case TEXT_LINE_DOTTED: return LINESTYLE_DOTTED;
+ case TEXT_LINE_DASH: return LINESTYLE_DASH;
+ case TEXT_LINE_LONGDASH: return LINESTYLE_LONGDASH;
+ case TEXT_LINE_DASHDOT: return LINESTYLE_DASHDOT;
+ case TEXT_LINE_DASHDOTDOT: return LINESTYLE_DASHDOTDOT;
+ case TEXT_LINE_SMALLWAVE: return LINESTYLE_SMALLWAVE;
+ case TEXT_LINE_WAVE: return LINESTYLE_WAVE;
+ case TEXT_LINE_DOUBLEWAVE: return LINESTYLE_DOUBLEWAVE;
+ case TEXT_LINE_BOLD: return LINESTYLE_BOLD;
+ case TEXT_LINE_BOLDDOTTED: return LINESTYLE_BOLDDOTTED;
+ case TEXT_LINE_BOLDDASH: return LINESTYLE_BOLDDASH;
+ case TEXT_LINE_BOLDLONGDASH: return LINESTYLE_LONGDASH;
+ case TEXT_LINE_BOLDDASHDOT: return LINESTYLE_BOLDDASHDOT;
+ case TEXT_LINE_BOLDDASHDOTDOT:return LINESTYLE_BOLDDASHDOT;
+ case TEXT_LINE_BOLDWAVE: return LINESTYLE_BOLDWAVE;
}
}
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index c765602..c8e7257 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -152,8 +152,8 @@ namespace drawinglayer
mpOutputDevice->SetTextLineColor( Color(aTextlineColor) );
// set Overline attribute
- const FontUnderline eFontOverline(primitive2d::mapTextLineToFontUnderline( pTCPP->getFontOverline() ));
- if( eFontOverline != UNDERLINE_NONE )
+ const FontLineStyle eFontOverline(primitive2d::mapTextLineToFontLineStyle( pTCPP->getFontOverline() ));
+ if( eFontOverline != LINESTYLE_NONE )
{
aFont.SetOverline( eFontOverline );
const basegfx::BColor aOverlineColor = maBColorModifierStack.getModifiedColor(pTCPP->getOverlineColor());
@@ -163,10 +163,10 @@ namespace drawinglayer
}
// set Underline attribute
- const FontUnderline eFontUnderline(primitive2d::mapTextLineToFontUnderline( pTCPP->getFontUnderline() ));
- if( eFontUnderline != UNDERLINE_NONE )
+ const FontLineStyle eFontLineStyle(primitive2d::mapTextLineToFontLineStyle( pTCPP->getFontUnderline() ));
+ if( eFontLineStyle != LINESTYLE_NONE )
{
- aFont.SetUnderline( eFontUnderline );
+ aFont.SetUnderline( eFontLineStyle );
if( pTCPP->getWordLineMode() )
aFont.SetWordLineMode( true );
}
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index fdc9d6a..ff71dbf 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -128,7 +128,7 @@ EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr,
void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
{
- rFont.SetUnderline( (FontUnderline)static_cast<const SvxUnderlineItem*>(GetItem())->GetValue() );
+ rFont.SetUnderline( (FontLineStyle)static_cast<const SvxUnderlineItem*>(GetItem())->GetValue() );
if ( pOutDev )
pOutDev->SetTextLineColor( static_cast<const SvxUnderlineItem*>(GetItem())->GetColor() );
@@ -146,7 +146,7 @@ EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, sa
void EditCharAttribOverline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
{
- rFont.SetOverline( (FontUnderline)static_cast<const SvxOverlineItem*>(GetItem())->GetValue() );
+ rFont.SetOverline( (FontLineStyle)static_cast<const SvxOverlineItem*>(GetItem())->GetValue() );
if ( pOutDev )
pOutDev->SetOverlineColor( static_cast<const SvxOverlineItem*>(GetItem())->GetColor() );
}
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index fad7bb1..1be1ce3 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -130,7 +130,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[20] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT );
ppDefItems[21] = new SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH );
ppDefItems[22] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT );
- ppDefItems[23] = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
+ ppDefItems[23] = new SvxUnderlineItem( LINESTYLE_NONE, EE_CHAR_UNDERLINE );
ppDefItems[24] = new SvxCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT );
ppDefItems[25] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
ppDefItems[26] = new SvxContourItem( false, EE_CHAR_OUTLINE );
@@ -154,7 +154,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[44] = new SvxCharReliefItem( RELIEF_NONE, EE_CHAR_RELIEF );
ppDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
ppDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS );
- ppDefItems[47] = new SvxOverlineItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
+ ppDefItems[47] = new SvxOverlineItem( LINESTYLE_NONE, EE_CHAR_OVERLINE );
ppDefItems[48] = new SvxCaseMapItem( SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP );
ppDefItems[49] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
ppDefItems[50] = new SvxBackgroundColorItem( Color( COL_AUTO ), EE_CHAR_BKGCOLOR );
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 1cc860a..d6b668c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2784,13 +2784,13 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
{
sal_uInt16 nAttr = mpIMEInfos->pAttribs[ nPos - mpIMEInfos->aPos.GetIndex() - 1 ];
if ( nAttr & EXTTEXTINPUT_ATTR_UNDERLINE )
- rFont.SetUnderline( UNDERLINE_SINGLE );
+ rFont.SetUnderline( LINESTYLE_SINGLE );
else if ( nAttr & EXTTEXTINPUT_ATTR_BOLDUNDERLINE )
- rFont.SetUnderline( UNDERLINE_BOLD );
+ rFont.SetUnderline( LINESTYLE_BOLD );
else if ( nAttr & EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE )
- rFont.SetUnderline( UNDERLINE_DOTTED );
+ rFont.SetUnderline( LINESTYLE_DOTTED );
else if ( nAttr & EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE )
- rFont.SetUnderline( UNDERLINE_DOTTED );
+ rFont.SetUnderline( LINESTYLE_DOTTED );
else if ( nAttr & EXTTEXTINPUT_ATTR_REDTEXT )
rFont.SetColor( Color( COL_RED ) );
else if ( nAttr & EXTTEXTINPUT_ATTR_HALFTONETEXT )
@@ -2804,7 +2804,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
}
else if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE )
{
- rFont.SetUnderline( UNDERLINE_WAVE );
+ rFont.SetUnderline( LINESTYLE_WAVE );
if( pOut )
pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) );
}
@@ -3394,7 +3394,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
if ( nOrientation || ( !IsVertical() && ( ( aTmpPos.X() + nTxtWidth ) >= nFirstVisXPos ) )
|| ( IsVertical() && ( ( aTmpPos.Y() + nTxtWidth ) >= nFirstVisYPos ) ) )
{
- if ( nEsc && ( ( aTmpFont.GetUnderline() != UNDERLINE_NONE ) ) )
+ if ( nEsc && ( ( aTmpFont.GetUnderline() != LINESTYLE_NONE ) ) )
{
// Paint the high/low without underline,
// Display the Underline on the
@@ -3409,13 +3409,13 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
if ( pPrev->GetStart() )
{
SeekCursor( pPortion->GetNode(), pPrev->GetStart(), aDummy );
- if ( aDummy.GetUnderline() != UNDERLINE_NONE )
+ if ( aDummy.GetUnderline() != LINESTYLE_NONE )
bSpecialUnderline = true;
}
if ( !bSpecialUnderline && ( pPrev->GetEnd() < pPortion->GetNode()->Len() ) )
{
SeekCursor( pPortion->GetNode(), pPrev->GetEnd()+1, aDummy );
- if ( aDummy.GetUnderline() != UNDERLINE_NONE )
+ if ( aDummy.GetUnderline() != LINESTYLE_NONE )
bSpecialUnderline = true;
}
}
@@ -3433,7 +3433,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
aUnderlinePos = lcl_ImplCalcRotatedPos( aTmpPos, aOrigin, nSin, nCos );
pOutDev->DrawStretchText( aUnderlinePos, aSz.Width(), aBlanks.makeStringAndClear(), 0, nTextLen );
- aTmpFont.SetUnderline( UNDERLINE_NONE );
+ aTmpFont.SetUnderline( LINESTYLE_NONE );
if ( !nOrientation )
aTmpFont.SetEscapement( nEsc );
aTmpFont.SetPropr( nProp );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 36eaa05..0ca6114 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -849,13 +849,13 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
{
// Must underlined if in WordLineMode, but the information is
// missing here
- FontUnderline e = static_cast<const SvxUnderlineItem&>(rItem).GetLineStyle();
+ FontLineStyle e = static_cast<const SvxUnderlineItem&>(rItem).GetLineStyle();
switch ( e )
{
- case UNDERLINE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULNONE ); break;
- case UNDERLINE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); break;
- case UNDERLINE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULDB ); break;
- case UNDERLINE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULD ); break;
+ case LINESTYLE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULNONE ); break;
+ case LINESTYLE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); break;
+ case LINESTYLE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULDB ); break;
+ case LINESTYLE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULD ); break;
default:
break;
}
@@ -863,13 +863,13 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_CHAR_OVERLINE:
{
- FontUnderline e = static_cast<const SvxOverlineItem&>(rItem).GetLineStyle();
+ FontLineStyle e = static_cast<const SvxOverlineItem&>(rItem).GetLineStyle();
switch ( e )
{
- case UNDERLINE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLNONE ); break;
- case UNDERLINE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OL ); break;
- case UNDERLINE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLDB ); break;
- case UNDERLINE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLD ); break;
+ case LINESTYLE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLNONE ); break;
+ case LINESTYLE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OL ); break;
+ case LINESTYLE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLDB ); break;
+ case LINESTYLE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLD ); break;
default:
break;
}
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 2f25862..8b41023 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -75,7 +75,7 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
rStream.ReadUInt16( nTemp ); aFont.SetPitch((FontPitch)nTemp);
rStream.ReadUInt16( nTemp ); aFont.SetAlignment((FontAlign)nTemp);
rStream.ReadUInt16( nTemp ); aFont.SetWeight((FontWeight)nTemp);
- rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontUnderline)nTemp);
+ rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontLineStyle)nTemp);
rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp);
rStream.ReadUInt16( nTemp ); aFont.SetItalic((FontItalic)nTemp);
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 1cacdbe..83b21f6 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -693,9 +693,9 @@ void SvxDoDrawCapital::Do( const OUString &_rTxt, const sal_Int32 _nIdx,
Size aPartSize;
// Set the desired font
- FontUnderline eUnder = pFont->GetUnderline();
+ FontLineStyle eUnder = pFont->GetUnderline();
FontStrikeout eStrike = pFont->GetStrikeout();
- pFont->SetUnderline( UNDERLINE_NONE );
+ pFont->SetUnderline( LINESTYLE_NONE );
pFont->SetStrikeout( STRIKEOUT_NONE );
if ( !bUpper )
{
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 4806948..218cb2b 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -107,9 +107,9 @@ SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_
SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);}
SfxPoolItem* SvxFontHeightItem::CreateDefault() {return new SvxFontHeightItem(240, 100, 0);}
SfxPoolItem* SvxFontWidthItem::CreateDefault() {return new SvxFontWidthItem(0, 100, 0);}
-SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(UNDERLINE_NONE, 0);}
-SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(UNDERLINE_NONE, 0);}
-SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(UNDERLINE_NONE, 0);}
+SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(LINESTYLE_NONE, 0);}
+SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(LINESTYLE_NONE, 0);}
+SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(LINESTYLE_NONE, 0);}
SfxPoolItem* SvxCrossedOutItem::CreateDefault() {return new SvxCrossedOutItem(STRIKEOUT_NONE, 0);}
SfxPoolItem* SvxShadowedItem::CreateDefault() {return new SvxShadowedItem(false, 0);}
SfxPoolItem* SvxAutoKernItem::CreateDefault() {return new SvxAutoKernItem(false, 0);}
@@ -1250,7 +1250,7 @@ bool SvxFontWidthItem::GetPresentation
// class SvxTextLineItem ------------------------------------------------
-SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId )
+SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId )
: SfxEnumItem( nId, (sal_uInt16)eSt ), mColor( COL_TRANSPARENT )
{
}
@@ -1266,14 +1266,14 @@ bool SvxTextLineItem::HasBoolValue() const
bool SvxTextLineItem::GetBoolValue() const
{
- return (FontUnderline)GetValue() != UNDERLINE_NONE;
+ return (FontLineStyle)GetValue() != LINESTYLE_NONE;
}
void SvxTextLineItem::SetBoolValue( bool bVal )
{
- SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
+ SetValue( (sal_uInt16)(bVal ? LINESTYLE_SINGLE : LINESTYLE_NONE) );
}
@@ -1289,7 +1289,7 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
sal_uInt16 SvxTextLineItem::GetValueCount() const
{
- return UNDERLINE_DOTTED + 1; // UNDERLINE_NONE also belongs here
+ return LINESTYLE_DOTTED + 1; // LINESTYLE_NONE also belongs here
}
@@ -1306,7 +1306,7 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
{
sal_uInt8 nState;
rStrm.ReadUChar( nState );
- return new SvxTextLineItem( (FontUnderline)nState, Which() );
+ return new SvxTextLineItem( (FontLineStyle)nState, Which() );
}
@@ -1404,7 +1404,7 @@ bool SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
// class SvxUnderlineItem ------------------------------------------------
-SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId )
+SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId )
: SvxTextLineItem( eSt, nId )
{
}
@@ -1424,20 +1424,20 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
{
sal_uInt8 nState;
rStrm.ReadUChar( nState );
- return new SvxUnderlineItem( (FontUnderline)nState, Which() );
+ return new SvxUnderlineItem( (FontLineStyle)nState, Which() );
}
OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
+ DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos);
}
// class SvxOverlineItem ------------------------------------------------
-SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId )
+SvxOverlineItem::SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId )
: SvxTextLineItem( eSt, nId )
{
}
@@ -1457,14 +1457,14 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
{
sal_uInt8 nState;
rStrm.ReadUChar( nState );
- return new SvxOverlineItem( (FontUnderline)nState, Which() );
+ return new SvxOverlineItem( (FontLineStyle)nState, Which() );
}
OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
+ DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos);
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5f46cf4..bbc861b 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -777,7 +777,7 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rT
}
else // underline
{
- SvxUnderlineItem aSvxUnderlineItem( UNDERLINE_SINGLE, SID_ATTR_CHAR_UNDERLINE );
+ SvxUnderlineItem aSvxUnderlineItem( LINESTYLE_SINGLE, SID_ATTR_CHAR_UNDERLINE );
rDoc.SetAttr( nFndPos, nEndPos - 1,
SID_ATTR_CHAR_UNDERLINE,
aSvxUnderlineItem);
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d19e62b..f741f13 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -877,8 +877,8 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
else
{
aBulletFont = aStdFont;
- aBulletFont.SetUnderline( UNDERLINE_NONE );
- aBulletFont.SetOverline( UNDERLINE_NONE );
+ aBulletFont.SetUnderline( LINESTYLE_NONE );
+ aBulletFont.SetOverline( LINESTYLE_NONE );
aBulletFont.SetStrikeout( STRIKEOUT_NONE );
aBulletFont.SetEmphasisMark( EMPHASISMARK_NONE );
aBulletFont.SetRelief( RELIEF_NONE );
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ee0282a..54ba22c 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -206,8 +206,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" );
bool bFirstToken = true;
bool bContinue = true;
- FontUnderline eUnderline;
- FontUnderline eOverline;
+ FontLineStyle eUnderline;
+ FontLineStyle eOverline;
FontEmphasisMark eEmphasis;
bPardTokenRead = false;
RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE;
@@ -725,60 +725,60 @@ SET_FONTALIGNMENT:
case RTF_UL:
if( !IsAttrSttPos() )
break;
- eUnderline = nTokenValue ? UNDERLINE_SINGLE : UNDERLINE_NONE;
+ eUnderline = nTokenValue ? LINESTYLE_SINGLE : LINESTYLE_NONE;
goto ATTR_SETUNDERLINE;
case RTF_ULD:
- eUnderline = UNDERLINE_DOTTED;
+ eUnderline = LINESTYLE_DOTTED;
goto ATTR_SETUNDERLINE;
case RTF_ULDASH:
- eUnderline = UNDERLINE_DASH;
+ eUnderline = LINESTYLE_DASH;
goto ATTR_SETUNDERLINE;
case RTF_ULDASHD:
- eUnderline = UNDERLINE_DASHDOT;
+ eUnderline = LINESTYLE_DASHDOT;
goto ATTR_SETUNDERLINE;
case RTF_ULDASHDD:
- eUnderline = UNDERLINE_DASHDOTDOT;
+ eUnderline = LINESTYLE_DASHDOTDOT;
goto ATTR_SETUNDERLINE;
case RTF_ULDB:
- eUnderline = UNDERLINE_DOUBLE;
+ eUnderline = LINESTYLE_DOUBLE;
goto ATTR_SETUNDERLINE;
case RTF_ULNONE:
- eUnderline = UNDERLINE_NONE;
+ eUnderline = LINESTYLE_NONE;
goto ATTR_SETUNDERLINE;
case RTF_ULTH:
- eUnderline = UNDERLINE_BOLD;
+ eUnderline = LINESTYLE_BOLD;
goto ATTR_SETUNDERLINE;
case RTF_ULWAVE:
- eUnderline = UNDERLINE_WAVE;
+ eUnderline = LINESTYLE_WAVE;
goto ATTR_SETUNDERLINE;
case RTF_ULTHD:
- eUnderline = UNDERLINE_BOLDDOTTED;
+ eUnderline = LINESTYLE_BOLDDOTTED;
goto ATTR_SETUNDERLINE;
case RTF_ULTHDASH:
- eUnderline = UNDERLINE_BOLDDASH;
+ eUnderline = LINESTYLE_BOLDDASH;
goto ATTR_SETUNDERLINE;
case RTF_ULLDASH:
- eUnderline = UNDERLINE_LONGDASH;
+ eUnderline = LINESTYLE_LONGDASH;
goto ATTR_SETUNDERLINE;
case RTF_ULTHLDASH:
- eUnderline = UNDERLINE_BOLDLONGDASH;
+ eUnderline = LINESTYLE_BOLDLONGDASH;
goto ATTR_SETUNDERLINE;
case RTF_ULTHDASHD:
- eUnderline = UNDERLINE_BOLDDASHDOT;
+ eUnderline = LINESTYLE_BOLDDASHDOT;
goto ATTR_SETUNDERLINE;
case RTF_ULTHDASHDD:
- eUnderline = UNDERLINE_BOLDDASHDOTDOT;
+ eUnderline = LINESTYLE_BOLDDASHDOTDOT;
goto ATTR_SETUNDERLINE;
case RTF_ULHWAVE:
- eUnderline = UNDERLINE_BOLDWAVE;
+ eUnderline = LINESTYLE_BOLDWAVE;
goto ATTR_SETUNDERLINE;
case RTF_ULULDBWAVE:
- eUnderline = UNDERLINE_DOUBLEWAVE;
+ eUnderline = LINESTYLE_DOUBLEWAVE;
goto ATTR_SETUNDERLINE;
case RTF_ULW:
- eUnderline = UNDERLINE_SINGLE;
+ eUnderline = LINESTYLE_SINGLE;
if( aPlainMap.nWordlineMode )
{
@@ -796,13 +796,13 @@ ATTR_SETUNDERLINE:
case RTF_ULC:
if( aPlainMap.nUnderline )
{
- SvxUnderlineItem aUL( UNDERLINE_SINGLE, aPlainMap.nUnderline );
+ SvxUnderlineItem aUL( LINESTYLE_SINGLE, aPlainMap.nUnderline );
const SfxPoolItem* pItem;
if( SfxItemState::SET == pSet->GetItemState(
aPlainMap.nUnderline, false, &pItem ) )
{
// is switched off ?
- if( UNDERLINE_NONE ==
+ if( LINESTYLE_NONE ==
static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle() )
break;
aUL = *static_cast<const SvxUnderlineItem*>(pItem);
@@ -810,8 +810,8 @@ ATTR_SETUNDERLINE:
else
aUL = static_cast<const SvxUnderlineItem&>(pSet->Get( aPlainMap.nUnderline, false ));
- if( UNDERLINE_NONE == aUL.GetLineStyle() )
- aUL.SetLineStyle( UNDERLINE_SINGLE );
+ if( LINESTYLE_NONE == aUL.GetLineStyle() )
+ aUL.SetLineStyle( LINESTYLE_SINGLE );
aUL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
pSet->Put( aUL );
}
@@ -820,60 +820,60 @@ ATTR_SETUNDERLINE:
case RTF_OL:
if( !IsAttrSttPos() )
break;
- eOverline = nTokenValue ? UNDERLINE_SINGLE : UNDERLINE_NONE;
+ eOverline = nTokenValue ? LINESTYLE_SINGLE : LINESTYLE_NONE;
goto ATTR_SETOVERLINE;
case RTF_OLD:
- eOverline = UNDERLINE_DOTTED;
+ eOverline = LINESTYLE_DOTTED;
goto ATTR_SETOVERLINE;
case RTF_OLDASH:
- eOverline = UNDERLINE_DASH;
+ eOverline = LINESTYLE_DASH;
goto ATTR_SETOVERLINE;
case RTF_OLDASHD:
- eOverline = UNDERLINE_DASHDOT;
+ eOverline = LINESTYLE_DASHDOT;
goto ATTR_SETOVERLINE;
case RTF_OLDASHDD:
- eOverline = UNDERLINE_DASHDOTDOT;
+ eOverline = LINESTYLE_DASHDOTDOT;
goto ATTR_SETOVERLINE;
case RTF_OLDB:
- eOverline = UNDERLINE_DOUBLE;
+ eOverline = LINESTYLE_DOUBLE;
goto ATTR_SETOVERLINE;
case RTF_OLNONE:
- eOverline = UNDERLINE_NONE;
+ eOverline = LINESTYLE_NONE;
goto ATTR_SETOVERLINE;
case RTF_OLTH:
- eOverline = UNDERLINE_BOLD;
+ eOverline = LINESTYLE_BOLD;
goto ATTR_SETOVERLINE;
case RTF_OLWAVE:
- eOverline = UNDERLINE_WAVE;
+ eOverline = LINESTYLE_WAVE;
goto ATTR_SETOVERLINE;
case RTF_OLTHD:
- eOverline = UNDERLINE_BOLDDOTTED;
+ eOverline = LINESTYLE_BOLDDOTTED;
goto ATTR_SETOVERLINE;
case RTF_OLTHDASH:
- eOverline = UNDERLINE_BOLDDASH;
+ eOverline = LINESTYLE_BOLDDASH;
goto ATTR_SETOVERLINE;
case RTF_OLLDASH:
- eOverline = UNDERLINE_LONGDASH;
+ eOverline = LINESTYLE_LONGDASH;
goto ATTR_SETOVERLINE;
case RTF_OLTHLDASH:
- eOverline = UNDERLINE_BOLDLONGDASH;
+ eOverline = LINESTYLE_BOLDLONGDASH;
goto ATTR_SETOVERLINE;
case RTF_OLTHDASHD:
- eOverline = UNDERLINE_BOLDDASHDOT;
+ eOverline = LINESTYLE_BOLDDASHDOT;
goto ATTR_SETOVERLINE;
case RTF_OLTHDASHDD:
- eOverline = UNDERLINE_BOLDDASHDOTDOT;
+ eOverline = LINESTYLE_BOLDDASHDOTDOT;
goto ATTR_SETOVERLINE;
case RTF_OLHWAVE:
- eOverline = UNDERLINE_BOLDWAVE;
+ eOverline = LINESTYLE_BOLDWAVE;
goto ATTR_SETOVERLINE;
case RTF_OLOLDBWAVE:
- eOverline = UNDERLINE_DOUBLEWAVE;
+ eOverline = LINESTYLE_DOUBLEWAVE;
goto ATTR_SETOVERLINE;
case RTF_OLW:
- eOverline = UNDERLINE_SINGLE;
+ eOverline = LINESTYLE_SINGLE;
if( aPlainMap.nWordlineMode )
{
@@ -891,13 +891,13 @@ ATTR_SETOVERLINE:
case RTF_OLC:
if( aPlainMap.nOverline )
{
- SvxOverlineItem aOL( UNDERLINE_SINGLE, aPlainMap.nOverline );
+ SvxOverlineItem aOL( LINESTYLE_SINGLE, aPlainMap.nOverline );
const SfxPoolItem* pItem;
if( SfxItemState::SET == pSet->GetItemState(
aPlainMap.nOverline, false, &pItem ) )
{
// is switched off ?
- if( UNDERLINE_NONE ==
+ if( LINESTYLE_NONE ==
static_cast<const SvxOverlineItem*>(pItem)->GetLineStyle() )
break;
aOL = *static_cast<const SvxOverlineItem*>(pItem);
@@ -905,8 +905,8 @@ ATTR_SETOVERLINE:
else
aOL = static_cast<const SvxOverlineItem&>(pSet->Get( aPlainMap.nOverline, false ));
- if( UNDERLINE_NONE == aOL.GetLineStyle() )
- aOL.SetLineStyle( UNDERLINE_SINGLE );
+ if( LINESTYLE_NONE == aOL.GetLineStyle() )
+ aOL.SetLineStyle( LINESTYLE_SINGLE );
aOL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
pSet->Put( aOL );
}
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 996b43f..59390d2 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -50,7 +50,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, vcl:
rFont.SetKerning( rDesc.Kerning ? FontKerning::FontSpecific : FontKerning::NONE );
rFont.SetWeight( VCLUnoHelper::ConvertFontWeight(rDesc.Weight) );
rFont.SetItalic( (FontItalic)rDesc.Slant );
- rFont.SetUnderline( (FontUnderline)rDesc.Underline );
+ rFont.SetUnderline( (FontLineStyle)rDesc.Underline );
rFont.SetStrikeout( (FontStrikeout)rDesc.Strikeout );
rFont.SetWordLineMode( rDesc.WordLineMode );
}
@@ -102,7 +102,7 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte
}
{
- SvxUnderlineItem aUnderlineItem( (FontUnderline)0, EE_CHAR_UNDERLINE );
+ SvxUnderlineItem aUnderlineItem( (FontLineStyle)0, EE_CHAR_UNDERLINE );
aTemp <<= (sal_Int16)rDesc.Underline;
static_cast<SfxPoolItem*>(&aUnderlineItem)->PutValue( aTemp, MID_TL_STYLE );
rSet.Put( aUnderlineItem );
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index cf932da..f062069 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -210,7 +210,7 @@ namespace pcr
float nFontHeight = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_HEIGHT, (float)aDefaultFont.Height);
float nFontWeight = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_WEIGHT, aDefaultFont.Weight);
css::awt::FontSlant nFontSlant = static_cast<css::awt::FontSlant>(aPropExtractor.getInt16FontProperty(PROPERTY_FONT_SLANT, (sal_Int16)aDefaultFont.Slant));
- sal_Int16 nFontUnderline = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_UNDERLINE, aDefaultFont.Underline);
+ sal_Int16 nFontLineStyle = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_UNDERLINE, aDefaultFont.Underline);
sal_Int16 nFontStrikeout = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_STRIKEOUT, aDefaultFont.Strikeout);
sal_Int32 nTextLineColor = aPropExtractor.getInt32FontProperty(PROPERTY_TEXTLINECOLOR, COL_AUTO);
@@ -229,7 +229,7 @@ namespace pcr
FontWeight eWeight=VCLUnoHelper::ConvertFontWeight(nFontWeight);
FontItalic eItalic=VCLUnoHelper::ConvertFontSlant(nFontSlant);
- FontUnderline eUnderline=(FontUnderline)nFontUnderline;
+ FontLineStyle eUnderline=(FontLineStyle)nFontLineStyle;
FontStrikeout eStrikeout=(FontStrikeout)nFontStrikeout;
SvxWeightItem aWeightItem(eWeight,CFID_WEIGHT);
@@ -264,7 +264,7 @@ namespace pcr
aPropExtractor.invalidateItem(PROPERTY_FONT_HEIGHT, CFID_HEIGHT, *_pSet);
aPropExtractor.invalidateItem(PROPERTY_FONT_WEIGHT, CFID_WEIGHT, *_pSet, css::awt::FontWeight::DONTKNOW == nFontWeight);
aPropExtractor.invalidateItem(PROPERTY_FONT_SLANT, CFID_POSTURE, *_pSet, css::awt::FontSlant_DONTKNOW == nFontSlant);
- aPropExtractor.invalidateItem(PROPERTY_FONT_UNDERLINE, CFID_UNDERLINE, *_pSet, css::awt::FontUnderline::DONTKNOW == nFontUnderline);
+ aPropExtractor.invalidateItem(PROPERTY_FONT_UNDERLINE, CFID_UNDERLINE, *_pSet, css::awt::FontUnderline::DONTKNOW == nFontLineStyle);
aPropExtractor.invalidateItem(PROPERTY_FONT_STRIKEOUT, CFID_STRIKEOUT, *_pSet, css::awt::FontStrikeout::DONTKNOW == nFontStrikeout);
aPropExtractor.invalidateItem(PROPERTY_WORDLINEMODE, CFID_WORDLINEMODE, *_pSet);
aPropExtractor.invalidateItem(PROPERTY_TEXTCOLOR, CFID_CHARCOLOR, *_pSet);
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 38b136c..f01e8f3 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -334,7 +334,7 @@ namespace pcr
StyleSettings aStyleSettings( aAllSettings.GetStyleSettings() );
vcl::Font aFieldFont( aStyleSettings.GetFieldFont() );
- aFieldFont.SetUnderline( UNDERLINE_SINGLE );
+ aFieldFont.SetUnderline( LINESTYLE_SINGLE );
aFieldFont.SetColor( aLinkColor.nColor );
aStyleSettings.SetFieldFont( aFieldFont );
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 44b1c49..4c72428 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -558,7 +558,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
vcl::Font aFont(aOldFont);
short nOrientation = aFont.GetOrientation();
aFont.SetOrientation( 0 );
- aFont.SetUnderline(UNDERLINE_NONE);
+ aFont.SetUnderline(LINESTYLE_NONE);
aFont.SetStrikeout(STRIKEOUT_NONE);
mpVDev->SetFont( aFont );
@@ -677,7 +677,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
// numbers, but the flash lines up very well with the original OOo document. All of this should
// probably be converted to polygons as part of the meta file, though, as we don't handle any
// fancy lines (like dashes).
- if( ( aOldFont.GetStrikeout() != STRIKEOUT_NONE ) || ( aOldFont.GetUnderline() != UNDERLINE_NONE ) )
+ if( ( aOldFont.GetStrikeout() != STRIKEOUT_NONE ) || ( aOldFont.GetUnderline() != LINESTYLE_NONE ) )
{
tools::Polygon aPoly( 4 );
const long nLineHeight = std::max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );
@@ -698,7 +698,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
// AS: The factor of 1.5 on the nLineHeight is a magic number. I'm not sure why it works,
// but it looks good to me.
- if( aOldFont.GetUnderline() != UNDERLINE_NONE )
+ if( aOldFont.GetUnderline() != LINESTYLE_NONE )
{
aPoly[ 0 ].X() = aBaseLinePos.X();
aPoly[ 0 ].Y() = static_cast<long>(aBaseLinePos.Y() + 1.5*nLineHeight);
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index c76c989..63ddfdb 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1337,8 +1337,8 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
else aActFont.SetWeight(WEIGHT_NORMAL);
if ( (nFace & 0x02)!=0 ) aActFont.SetItalic(ITALIC_NORMAL);
else aActFont.SetItalic(ITALIC_NONE);
- if ( (nFace & 0x04)!=0 ) aActFont.SetUnderline(UNDERLINE_SINGLE);
- else aActFont.SetUnderline(UNDERLINE_NONE);
+ if ( (nFace & 0x04)!=0 ) aActFont.SetUnderline(LINESTYLE_SINGLE);
+ else aActFont.SetUnderline(LINESTYLE_NONE);
if ( (nFace & 0x08)!=0 ) aActFont.SetOutline(true);
else aActFont.SetOutline(false);
if ( (nFace & 0x10)!=0 ) aActFont.SetShadow(true);
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index e88d9e8..6cb3b25 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2562,7 +2562,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
if ( nFontAttributes & 0x10 )
rSet.Put( SvxPostureItem( nFontAttributes & 0x10 ? ITALIC_NORMAL : ITALIC_NONE, EE_CHAR_ITALIC ) );
if ( nFontAttributes & 0x08 )
- rSet.Put( SvxUnderlineItem( nFontAttributes & 0x08 ? UNDERLINE_SINGLE : UNDERLINE_NONE, EE_CHAR_UNDERLINE ) );
+ rSet.Put( SvxUnderlineItem( nFontAttributes & 0x08 ? LINESTYLE_SINGLE : LINESTYLE_NONE, EE_CHAR_UNDERLINE ) );
if ( nFontAttributes & 0x40 )
rSet.Put( SvxShadowedItem( (nFontAttributes & 0x40) != 0, EE_CHAR_SHADOW ) );
// if ( nFontAttributes & 0x02 )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 971b571..a7a6b45 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5612,7 +5612,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s
rSet.Put( SvxPostureItem( nVal != 0 ? ITALIC_NORMAL : ITALIC_NONE, EE_CHAR_ITALIC_CTL ) );
}
if ( GetAttrib( PPT_CharAttr_Underline, nVal, nDestinationInstance ) )
- rSet.Put( SvxUnderlineItem( nVal != 0 ? UNDERLINE_SINGLE : UNDERLINE_NONE, EE_CHAR_UNDERLINE ) );
+ rSet.Put( SvxUnderlineItem( nVal != 0 ? LINESTYLE_SINGLE : LINESTYLE_NONE, EE_CHAR_UNDERLINE ) );
if ( GetAttrib( PPT_CharAttr_Shadow, nVal, nDestinationInstance ) )
rSet.Put( SvxShadowedItem( nVal != 0, EE_CHAR_SHADOW ) );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ee07784..3baee145 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -333,9 +333,9 @@ void SVGAttributeWriter::SetFontAttr( const vcl::Font& rFont )
if( mrExport.IsUseNativeTextDecoration() )
{
- if( rFont.GetUnderline() != UNDERLINE_NONE || rFont.GetStrikeout() != STRIKEOUT_NONE )
+ if( rFont.GetUnderline() != LINESTYLE_NONE || rFont.GetStrikeout() != STRIKEOUT_NONE )
{
- if( rFont.GetUnderline() != UNDERLINE_NONE )
+ if( rFont.GetUnderline() != LINESTYLE_NONE )
aTextDecoration = "underline ";
if( rFont.GetStrikeout() != STRIKEOUT_NONE )
@@ -795,17 +795,17 @@ void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
if( mrExport.IsUseNativeTextDecoration() )
{
- FontUnderline eCurFontUnderline = maCurrentFont.GetUnderline();
+ FontLineStyle eCurFontLineStyle = maCurrentFont.GetUnderline();
FontStrikeout eCurFontStrikeout = maCurrentFont.GetStrikeout();
- FontUnderline eParFontUnderline = maParentFont.GetUnderline();
+ FontLineStyle eParFontLineStyle = maParentFont.GetUnderline();
FontStrikeout eParFontStrikeout = maParentFont.GetStrikeout();
OUString sTextDecoration;
bool bIsDecorationChanged = false;
- if( eCurFontUnderline != eParFontUnderline )
+ if( eCurFontLineStyle != eParFontLineStyle )
{
- if( eCurFontUnderline != UNDERLINE_NONE )
+ if( eCurFontLineStyle != LINESTYLE_NONE )
sTextDecoration = "underline";
bIsDecorationChanged = true;
}
@@ -2576,7 +2576,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
if( !mrExport.IsUseNativeTextDecoration() )
{
- if( rFont.GetStrikeout() != STRIKEOUT_NONE || rFont.GetUnderline() != UNDERLINE_NONE )
+ if( rFont.GetStrikeout() != STRIKEOUT_NONE || rFont.GetUnderline() != LINESTYLE_NONE )
{
tools::Polygon aPoly( 4 );
const long nLineHeight = std::max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );
diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
index 78a48c6..61a0ecf 100644
--- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
@@ -58,8 +58,8 @@ namespace drawinglayer
};
/** helper to convert LineStyle */
- TextLine DRAWINGLAYER_DLLPUBLIC mapFontUnderlineToTextLine(FontUnderline eLineStyle);
- FontUnderline DRAWINGLAYER_DLLPUBLIC mapTextLineToFontUnderline(TextLine eLineStyle);
+ TextLine DRAWINGLAYER_DLLPUBLIC mapFontLineStyleToTextLine(FontLineStyle eLineStyle);
+ FontLineStyle DRAWINGLAYER_DLLPUBLIC mapTextLineToFontLineStyle(TextLine eLineStyle);
/** FontStrikeout definition */
enum TextStrikeout
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 9306aba..baf8e8a 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
public:
static SfxPoolItem* CreateDefault();
- SvxTextLineItem( const FontUnderline eSt,
+ SvxTextLineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
@@ -71,9 +71,9 @@ public:
}
// enum cast
- FontUnderline GetLineStyle() const
- { return (FontUnderline)GetValue(); }
- void SetLineStyle( FontUnderline eNew )
+ FontLineStyle GetLineStyle() const
+ { return (FontLineStyle)GetValue(); }
+ void SetLineStyle( FontLineStyle eNew )
{ SetValue((sal_uInt16) eNew); }
const Color& GetColor() const { return mColor; }
@@ -89,7 +89,7 @@ class EDITENG_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
public:
static SfxPoolItem* CreateDefault();
- SvxUnderlineItem( const FontUnderline eSt,
+ SvxUnderlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -106,7 +106,7 @@ class EDITENG_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
public:
static SfxPoolItem* CreateDefault();
- SvxOverlineItem( const FontUnderline eSt,
+ SvxOverlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/tools/fontenum.hxx b/include/tools/fontenum.hxx
index ffdc26a..3ab14d4 100644
--- a/include/tools/fontenum.hxx
+++ b/include/tools/fontenum.hxx
@@ -41,17 +41,17 @@ enum FontWidth { WIDTH_DONTKNOW, WIDTH_ULTRA_CONDENSED, WIDTH_EXTRA_CONDENSED,
enum FontItalic { ITALIC_NONE, ITALIC_OBLIQUE, ITALIC_NORMAL, ITALIC_DONTKNOW, FontItalic_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
- UNDERLINE_DOTTED, UNDERLINE_DONTKNOW,
- UNDERLINE_DASH, UNDERLINE_LONGDASH,
- UNDERLINE_DASHDOT, UNDERLINE_DASHDOTDOT,
- UNDERLINE_SMALLWAVE,
- UNDERLINE_WAVE, UNDERLINE_DOUBLEWAVE,
- UNDERLINE_BOLD, UNDERLINE_BOLDDOTTED,
- UNDERLINE_BOLDDASH, UNDERLINE_BOLDLONGDASH,
- UNDERLINE_BOLDDASHDOT, UNDERLINE_BOLDDASHDOTDOT,
- UNDERLINE_BOLDWAVE,
- FontUnderline_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+enum FontLineStyle { LINESTYLE_NONE, LINESTYLE_SINGLE, LINESTYLE_DOUBLE,
+ LINESTYLE_DOTTED, LINESTYLE_DONTKNOW,
+ LINESTYLE_DASH, LINESTYLE_LONGDASH,
+ LINESTYLE_DASHDOT, LINESTYLE_DASHDOTDOT,
+ LINESTYLE_SMALLWAVE,
+ LINESTYLE_WAVE, LINESTYLE_DOUBLEWAVE,
+ LINESTYLE_BOLD, LINESTYLE_BOLDDOTTED,
+ LINESTYLE_BOLDDASH, LINESTYLE_BOLDLONGDASH,
+ LINESTYLE_BOLDDASHDOT, LINESTYLE_BOLDDASHDOTDOT,
+ LINESTYLE_BOLDWAVE,
+ FontLineStyle_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
STRIKEOUT_DONTKNOW, STRIKEOUT_BOLD,
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 7f9d272..8742451 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -144,10 +144,10 @@ public:
bool IsShadow() const;
void SetRelief( FontRelief );
FontRelief GetRelief() const;
- void SetUnderline( FontUnderline );
- FontUnderline GetUnderline() const;
- void SetOverline( FontUnderline );
- FontUnderline GetOverline() const;
+ void SetUnderline( FontLineStyle );
+ FontLineStyle GetUnderline() const;
+ void SetOverline( FontLineStyle );
+ FontLineStyle GetOverline() const;
void SetStrikeout( FontStrikeout );
FontStrikeout GetStrikeout() const;
void SetEmphasisMark( FontEmphasisMark );
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 476711a..044cb50 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -546,8 +546,8 @@ private:
Point maPos;
long mnWidth;
FontStrikeout meStrikeout;
- FontUnderline meUnderline;
- FontUnderline meOverline;
+ FontLineStyle meUnderline;
+ FontLineStyle meOverline;
public:
MetaTextLineAction();
@@ -561,16 +561,16 @@ public:
MetaTextLineAction( const Point& rPos, long nWidth,
FontStrikeout eStrikeout,
- FontUnderline eUnderline,
- FontUnderline eOverline );
+ FontLineStyle eUnderline,
+ FontLineStyle eOverline );
virtual void Move( long nHorzMove, long nVertMove ) override;
virtual void Scale( double fScaleX, double fScaleY ) override;
const Point& GetStartPoint() const { return maPos; }
long GetWidth() const { return mnWidth; }
FontStrikeout GetStrikeout() const { return meStrikeout; }
- FontUnderline GetUnderline() const { return meUnderline; }
- FontUnderline GetOverline() const { return meOverline; }
+ FontLineStyle GetUnderline() const { return meUnderline; }
+ FontLineStyle GetOverline() const { return meOverline; }
};
class VCL_DLLPUBLIC MetaBmpAction : public MetaAction
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6b28dec..b0527b0 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1036,16 +1036,16 @@ public:
void DrawTextLine( const Point& rPos, long nWidth,
FontStrikeout eStrikeout,
- FontUnderline eUnderline,
- FontUnderline eOverline,
+ FontLineStyle eUnderline,
+ FontLineStyle eOverline,
bool bUnderlineAbove = false );
void ImplDrawTextLine( long nBaseX, long nX, long nY, DeviceCoordinate nWidth,
- FontStrikeout eStrikeout, FontUnderline eUnderline,
- FontUnderline eOverline, bool bUnderlineAbove );
+ FontStrikeout eStrikeout, FontLineStyle eUnderline,
+ FontLineStyle eOverline, bool bUnderlineAbove );
- void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontUnderline eUnderline,
- FontUnderline eOverline, bool bWordLine, bool bUnderlineAbove );
+ void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontLineStyle eUnderline,
+ FontLineStyle eOverline, bool bWordLine, bool bUnderlineAbove );
void DrawWaveLine( const Point& rStartPos, const Point& rEndPos );
@@ -1228,8 +1228,8 @@ private:
SAL_DLLPRIVATE void ImplDrawWavePixel( long nOriginX, long nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics, OutputDevice* pOutDev,
bool bDrawPixAsRect, long nPixWidth, long nPixHeight );
SAL_DLLPRIVATE void ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor );
- SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove );
- SAL_DLLPRIVATE void ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove );
+ SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove );
+ SAL_DLLPRIVATE void ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove );
SAL_DLLPRIVATE void ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
SAL_DLLPRIVATE void ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
SAL_DLLPRIVATE void ImplDrawMnemonicLine( long nX, long nY, long nWidth );
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 697ae91..6b8e43f 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -764,8 +764,8 @@ The following structure describes the permissions used in PDF security
void DrawTextLine( const Point& rPos, long nWidth,
FontStrikeout eStrikeout,
- FontUnderline eUnderline,
- FontUnderline eOverline,
+ FontLineStyle eUnderline,
+ FontLineStyle eOverline,
bool bUnderlineAbove = false );
void DrawTextArray( const Point& rStartPt, const OUString& rStr,
const long* pDXAry,
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 873d6bf..46a56bc 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -659,7 +659,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
new SvxWordLineModeItem(false,ITEMID_WORDLINEMODE),
new SvxContourItem(false,ITEMID_CONTOUR),
new SvxCrossedOutItem(STRIKEOUT_NONE,ITEMID_CROSSEDOUT),
- new SvxUnderlineItem(UNDERLINE_NONE,ITEMID_UNDERLINE),
+ new SvxUnderlineItem(LINESTYLE_NONE,ITEMID_UNDERLINE),
new SvxColorItem(ITEMID_COLOR),
new SvxKerningItem(0,ITEMID_KERNING),
diff --git a/sc/inc/fonthelper.hxx b/sc/inc/fonthelper.hxx
index c06930f..36d5895 100644
--- a/sc/inc/fonthelper.hxx
+++ b/sc/inc/fonthelper.hxx
@@ -25,8 +25,8 @@ struct SC_DLLPUBLIC ScDxfFont
boost::optional<sal_uInt32> nFontHeight;
boost::optional<FontWeight> eWeight;
boost::optional<FontItalic> eItalic;
- boost::optional<FontUnderline> eUnder;
- boost::optional<FontUnderline> eOver;
+ boost::optional<FontLineStyle> eUnder;
+ boost::optional<FontLineStyle> eOver;
boost::optional<bool> bWordLine;
boost::optional<FontStrikeout> eStrike;
boost::optional<bool> bOutline;
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 46e71fc..1e34890 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -213,7 +213,7 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument* pDoc, sal_Int32 nFormat)
CPPUNIT_ASSERT_EQUAL_MESSAGE("font should be striked out with a double line", STRIKEOUT_DOUBLE, aFont.GetStrikeout());
pPattern = pDoc->GetPattern(1,3,1);
pPattern->GetFont(aFont, SC_AUTOCOL_RAW);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("font should be underlined with a dotted line", UNDERLINE_DOTTED, aFont.GetUnderline());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("font should be underlined with a dotted line", LINESTYLE_DOTTED, aFont.GetUnderline());
//check row height import
//disable for now until we figure out cause of win tinderboxes test failures
//CPPUNIT_ASSERT_EQUAL( static_cast<sal_uInt16>(256), pDoc->GetRowHeight(0,1) ); //0.178in
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index e1f89b4..aab6d34 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -546,14 +546,14 @@ void setAttribute( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart, sa
break;
case EE_CHAR_OVERLINE:
{
- SvxOverlineItem aItem(UNDERLINE_DOUBLE, nType);
+ SvxOverlineItem aItem(LINESTYLE_DOUBLE, nType);
aItemSet.Put(aItem);
rEE.QuickSetAttribs(aItemSet, aSel);
}
break;
case EE_CHAR_UNDERLINE:
{
- SvxUnderlineItem aItem(UNDERLINE_DOUBLE, nType);
+ SvxUnderlineItem aItem(LINESTYLE_DOUBLE, nType);
aItemSet.Put(aItem);
rEE.QuickSetAttribs(aItemSet, aSel);
}
@@ -671,7 +671,7 @@ void ScExportTest::testRichTextExportODS()
return false;
}
- static bool isOverline(const editeng::Section& rAttr, FontUnderline eStyle)
+ static bool isOverline(const editeng::Section& rAttr, FontLineStyle eStyle)
{
if (rAttr.maAttributes.empty())
return false;
@@ -688,7 +688,7 @@ void ScExportTest::testRichTextExportODS()
return false;
}
- static bool isUnderline(const editeng::Section& rAttr, FontUnderline eStyle)
+ static bool isUnderline(const editeng::Section& rAttr, FontLineStyle eStyle)
{
if (rAttr.maAttributes.empty())
return false;
@@ -920,7 +920,7 @@ void ScExportTest::testRichTextExportODS()
if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 0 || pAttr->mnEnd != 4)
return false;
- if (pAttr->maAttributes.size() != 1 || !isOverline(*pAttr, UNDERLINE_DOUBLE))
+ if (pAttr->maAttributes.size() != 1 || !isOverline(*pAttr, LINESTYLE_DOUBLE))
return false;
// Last section should have underline applied.
@@ -928,7 +928,7 @@ void ScExportTest::testRichTextExportODS()
if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 9 || pAttr->mnEnd != 14)
return false;
- if (pAttr->maAttributes.size() != 1 || !isUnderline(*pAttr, UNDERLINE_DOUBLE))
+ if (pAttr->maAttributes.size() != 1 || !isUnderline(*pAttr, LINESTYLE_DOUBLE))
return false;
return true;
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 917dd25..91812b2 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2243,7 +2243,7 @@ void ScFiltersTest::testRichTextContentODS()
if (it->pAttr->Which() == EE_CHAR_UNDERLINE)
{
const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>(*it->pAttr);
- bHasUnderline = (rItem.GetLineStyle() == UNDERLINE_SINGLE);
+ bHasUnderline = (rItem.GetLineStyle() == LINESTYLE_SINGLE);
if (bHasUnderline)
break;
}
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 8dccc32..be88800 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -228,8 +228,8 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool)
ppPoolDefaults[ ATTR_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_FONT_HEIGHT ); // 10 pt;
ppPoolDefaults[ ATTR_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_FONT_WEIGHT );
ppPoolDefaults[ ATTR_FONT_POSTURE - ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_FONT_POSTURE );
- ppPoolDefaults[ ATTR_FONT_UNDERLINE - ATTR_STARTINDEX ] = new SvxUnderlineItem( UNDERLINE_NONE, ATTR_FONT_UNDERLINE );
- ppPoolDefaults[ ATTR_FONT_OVERLINE - ATTR_STARTINDEX ] = new SvxOverlineItem( UNDERLINE_NONE, ATTR_FONT_OVERLINE );
+ ppPoolDefaults[ ATTR_FONT_UNDERLINE - ATTR_STARTINDEX ] = new SvxUnderlineItem( LINESTYLE_NONE, ATTR_FONT_UNDERLINE );
+ ppPoolDefaults[ ATTR_FONT_OVERLINE - ATTR_STARTINDEX ] = new SvxOverlineItem( LINESTYLE_NONE, ATTR_FONT_OVERLINE );
ppPoolDefaults[ ATTR_FONT_CROSSEDOUT - ATTR_STARTINDEX ] = new SvxCrossedOutItem( STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT );
ppPoolDefaults[ ATTR_FONT_CONTOUR - ATTR_STARTINDEX ] = new SvxContourItem( false, ATTR_FONT_CONTOUR );
ppPoolDefaults[ ATTR_FONT_SHADOWED - ATTR_STARTINDEX ] = new SvxShadowedItem( false, ATTR_FONT_SHADOWED );
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 01039b1..c5a886a 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -258,8 +258,8 @@ void ScPatternAttr::GetFont(
sal_uInt32 nFontHeight;
FontWeight eWeight;
FontItalic eItalic;
- FontUnderline eUnder;
- FontUnderline eOver;
+ FontLineStyle eUnder;
+ FontLineStyle eOver;
bool bWordLine;
FontStrikeout eStrike;
bool bOutline;
@@ -294,11 +294,11 @@ void ScPatternAttr::GetFont(
if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, true, &pItem ) != SfxItemState::SET )
pItem = &rItemSet.Get( ATTR_FONT_UNDERLINE );
- eUnder = (FontUnderline)static_cast<const SvxUnderlineItem*>(pItem)->GetValue();
+ eUnder = (FontLineStyle)static_cast<const SvxUnderlineItem*>(pItem)->GetValue();
if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, true, &pItem ) != SfxItemState::SET )
pItem = &rItemSet.Get( ATTR_FONT_OVERLINE );
- eOver = (FontUnderline)static_cast<const SvxOverlineItem*>(pItem)->GetValue();
+ eOver = (FontLineStyle)static_cast<const SvxOverlineItem*>(pItem)->GetValue();
if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, true, &pItem ) != SfxItemState::SET )
pItem = &rItemSet.Get( ATTR_FONT_WORDLINE );
@@ -341,9 +341,9 @@ void ScPatternAttr::GetFont(
rItemSet.Get( nWeightId )).GetValue();
eItalic = (FontItalic)static_cast<const SvxPostureItem&>(
rItemSet.Get( nPostureId )).GetValue();
- eUnder = (FontUnderline)static_cast<const SvxUnderlineItem&>(
+ eUnder = (FontLineStyle)static_cast<const SvxUnderlineItem&>(
rItemSet.Get( ATTR_FONT_UNDERLINE )).GetValue();
- eOver = (FontUnderline)static_cast<const SvxOverlineItem&>(
+ eOver = (FontLineStyle)static_cast<const SvxOverlineItem&>(
rItemSet.Get( ATTR_FONT_OVERLINE )).GetValue();
bWordLine = static_cast<const SvxWordLineModeItem&>(
rItemSet.Get( ATTR_FONT_WORDLINE )).GetValue();
@@ -532,13 +532,13 @@ ScDxfFont ScPatternAttr::GetDxfFont(const SfxItemSet& rItemSet, SvtScriptType nS
if ( rItemSet.GetItemState( ATTR_FONT_UNDERLINE, true, &pItem ) == SfxItemState::SET )
{
pItem = &rItemSet.Get( ATTR_FONT_UNDERLINE );
- aReturn.eUnder = (FontUnderline)static_cast<const SvxUnderlineItem*>(pItem)->GetValue();
+ aReturn.eUnder = (FontLineStyle)static_cast<const SvxUnderlineItem*>(pItem)->GetValue();
}
if ( rItemSet.GetItemState( ATTR_FONT_OVERLINE, true, &pItem ) == SfxItemState::SET )
{
pItem = &rItemSet.Get( ATTR_FONT_OVERLINE );
- aReturn.eOver = (FontUnderline)static_cast<const SvxOverlineItem*>(pItem)->GetValue();
+ aReturn.eOver = (FontLineStyle)static_cast<const SvxOverlineItem*>(pItem)->GetValue();
}
if ( rItemSet.GetItemState( ATTR_FONT_WORDLINE, true, &pItem ) == SfxItemState::SET )
@@ -602,8 +602,8 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r
SvxFontItem aCtlFontItem(EE_CHAR_FONTINFO_CTL);
long nTHeight, nCjkTHeight, nCtlTHeight; // Twips
FontWeight eWeight, eCjkWeight, eCtlWeight;
- SvxUnderlineItem aUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE);
- SvxOverlineItem aOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE);
+ SvxUnderlineItem aUnderlineItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE);
+ SvxOverlineItem aOverlineItem(LINESTYLE_NONE, EE_CHAR_OVERLINE);
bool bWordLine;
FontStrikeout eStrike;
FontItalic eItalic, eCjkItalic, eCtlItalic;
@@ -867,9 +867,9 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet&
// SvxTextLineItem contains enum and color
if (rEditSet.GetItemState(EE_CHAR_UNDERLINE,true,&pItem) == SfxItemState::SET)
- rDestSet.Put( SvxUnderlineItem(UNDERLINE_NONE,ATTR_FONT_UNDERLINE) = *static_cast<const SvxUnderlineItem*>(pItem) );
+ rDestSet.Put( SvxUnderlineItem(LINESTYLE_NONE,ATTR_FONT_UNDERLINE) = *static_cast<const SvxUnderlineItem*>(pItem) );
if (rEditSet.GetItemState(EE_CHAR_OVERLINE,true,&pItem) == SfxItemState::SET)
- rDestSet.Put( SvxOverlineItem(UNDERLINE_NONE,ATTR_FONT_OVERLINE) = *static_cast<const SvxOverlineItem*>(pItem) );
+ rDestSet.Put( SvxOverlineItem(LINESTYLE_NONE,ATTR_FONT_OVERLINE) = *static_cast<const SvxOverlineItem*>(pItem) );
if (rEditSet.GetItemState(EE_CHAR_WLM,true,&pItem) == SfxItemState::SET)
rDestSet.Put( SvxWordLineModeItem( static_cast<const SvxWordLineModeItem*>(pItem)->GetValue(),
ATTR_FONT_WORDLINE) );
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 2dd1048..68638e9 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -280,7 +280,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pSet = &pSheet->GetItemSet();
pSet->Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) );
pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) );
- pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) );
+ pSet->Put( SvxUnderlineItem( LINESTYLE_SINGLE, ATTR_FONT_UNDERLINE ) );
// 3. Result1
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 9aae455..0c52378 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -180,8 +180,8 @@ void ScAfVersions::Write(SvStream& rStream, sal_uInt16 fileVersion)
rStream.WriteUInt16( SvxFontHeightItem(240, 100, ATTR_FONT_HEIGHT).GetVersion(fileVersion) );
rStream.WriteUInt16( SvxWeightItem(WEIGHT_NORMAL, ATTR_FONT_WEIGHT).GetVersion(fileVersion) );
rStream.WriteUInt16( SvxPostureItem(ITALIC_NONE, ATTR_FONT_POSTURE).GetVersion(fileVersion) );
- rStream.WriteUInt16( SvxUnderlineItem(UNDERLINE_NONE, ATTR_FONT_UNDERLINE).GetVersion(fileVersion) );
- rStream.WriteUInt16( SvxOverlineItem(UNDERLINE_NONE, ATTR_FONT_OVERLINE).GetVersion(fileVersion) );
+ rStream.WriteUInt16( SvxUnderlineItem(LINESTYLE_NONE, ATTR_FONT_UNDERLINE).GetVersion(fileVersion) );
+ rStream.WriteUInt16( SvxOverlineItem(LINESTYLE_NONE, ATTR_FONT_OVERLINE).GetVersion(fileVersion) );
rStream.WriteUInt16( SvxCrossedOutItem(STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT).GetVersion(fileVersion) );
rStream.WriteUInt16( SvxContourItem(false, ATTR_FONT_CONTOUR).GetVersion(fileVersion) );
rStream.WriteUInt16( SvxShadowedItem(false, ATTR_FONT_SHADOWED).GetVersion(fileVersion) );
@@ -221,8 +221,8 @@ ScAutoFormatDataField::ScAutoFormatDataField() :
aCTLWeight( WEIGHT_NORMAL, ATTR_CTL_FONT_WEIGHT ),
aCTLPosture( ITALIC_NONE, ATTR_CTL_FONT_POSTURE ),
- aUnderline( UNDERLINE_NONE,ATTR_FONT_UNDERLINE ),
- aOverline( UNDERLINE_NONE,ATTR_FONT_OVERLINE ),
+ aUnderline( LINESTYLE_NONE,ATTR_FONT_UNDERLINE ),
+ aOverline( LINESTYLE_NONE,ATTR_FONT_OVERLINE ),
aCrossedOut( STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT ),
aContour( false, ATTR_FONT_CONTOUR ),
aShadowed( false, ATTR_FONT_SHADOWED ),
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 7e2d047..3d85c25 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -64,15 +64,15 @@ void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet )
rItemSet.Put( aAttr );
}
- FontUnderline eUnderline;
+ FontLineStyle eUnderline;
switch( nIndex & 0x60 ) // Bit 5+6
{
case 0x60:
- case 0x20: eUnderline = UNDERLINE_SINGLE; break;
- case 0x40: eUnderline = UNDERLINE_DOUBLE; break;
- default: eUnderline = UNDERLINE_NONE;
+ case 0x20: eUnderline = LINESTYLE_SINGLE; break;
+ case 0x40: eUnderline = LINESTYLE_DOUBLE; break;
+ default: eUnderline = LINESTYLE_NONE;
}
- if( eUnderline != UNDERLINE_NONE )
+ if( eUnderline != LINESTYLE_NONE )
{
SvxUnderlineItem aUndItem( eUnderline, ATTR_FONT_UNDERLINE );
rItemSet.Put( aUndItem );
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 18edb90..1961c7d 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -766,9 +766,9 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
aNewData.mnUnderline = EXC_FONTUNDERL_NONE;
switch( aFont.GetUnderline() )
{
- case UNDERLINE_NONE: aNewData.mnUnderline = EXC_FONTUNDERL_NONE; break;
- case UNDERLINE_SINGLE: aNewData.mnUnderline = EXC_FONTUNDERL_SINGLE; break;
- case UNDERLINE_DOUBLE: aNewData.mnUnderline = EXC_FONTUNDERL_DOUBLE; break;
+ case LINESTYLE_NONE: aNewData.mnUnderline = EXC_FONTUNDERL_NONE; break;
+ case LINESTYLE_SINGLE: aNewData.mnUnderline = EXC_FONTUNDERL_SINGLE; break;
+ case LINESTYLE_DOUBLE: aNewData.mnUnderline = EXC_FONTUNDERL_DOUBLE; break;
default: aNewData.mnUnderline = EXC_FONTUNDERL_SINGLE;
}
if( aFontData.mnUnderline != aNewData.mnUnderline )
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 90c351a..474ba6c 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -876,16 +876,16 @@ static void lcl_WriteValue( sax_fastparser::FSHelperPtr& rStream, sal_Int32 nEle
FSEND );
}
-static const char* lcl_GetUnderlineStyle( FontUnderline eUnderline, bool& bHaveUnderline )
+static const char* lcl_GetUnderlineStyle( FontLineStyle eUnderline, bool& bHaveUnderline )
{
bHaveUnderline = true;
switch( eUnderline )
{
// OOXTODO: doubleAccounting, singleAccounting
- // OOXTODO: what should be done with the other FontUnderline values?
- case UNDERLINE_SINGLE: return "single";
- case UNDERLINE_DOUBLE: return "double";
- case UNDERLINE_NONE:
+ // OOXTODO: what should be done with the other FontLineStyle values?
+ case LINESTYLE_SINGLE: return "single";
+ case LINESTYLE_DOUBLE: return "double";
+ case LINESTYLE_NONE:
default: bHaveUnderline = false; return "none";
}
}
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 50ff078..758c012 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1024,15 +1024,15 @@ XclExpDxfFont::XclExpDxfFont(const XclExpRoot& rRoot,
namespace {
-const char* getUnderlineOOXValue(FontUnderline eUnderline)
+const char* getUnderlineOOXValue(FontLineStyle eUnderline)
{
switch (eUnderline)
{
- case UNDERLINE_NONE:
- case UNDERLINE_DONTKNOW:
+ case LINESTYLE_NONE:
+ case LINESTYLE_DONTKNOW:
return "none";
- case UNDERLINE_DOUBLE:
- case UNDERLINE_DOUBLEWAVE:
+ case LINESTYLE_DOUBLE:
+ case LINESTYLE_DOUBLEWAVE:
return "double";
default:
return "single";
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 776eac5..ebabba3 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list