summaryrefslogtreecommitdiff
path: root/editeng/source/rtf/rtfitem.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/rtf/rtfitem.cxx')
-rw-r--r--editeng/source/rtf/rtfitem.cxx92
1 files changed, 46 insertions, 46 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ee0282ad823c..54ba22c91cc4 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 );
}
generated by cgit (git 2.34.1) at 2025-01-17 21:50:52 +0000