diff options
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/textparagraphpropertiescontext.cxx | 12 | ||||
| -rw-r--r-- | oox/source/drawingml/textspacingcontext.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index 3a0eb4156849..460bc2e2d4d6 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -270,7 +270,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl if (oBefore.has()) { TextSpacing& rSpacing = mrTextParagraphProperties.getParaTopMargin(); - rSpacing.nUnit = TextSpacing::POINTS; + rSpacing.nUnit = TextSpacing::Unit::Points; rSpacing.nValue = TWIPS_TO_MM(oBefore.get()); rSpacing.bHasValue = true; } @@ -280,7 +280,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl if (oBeforeLines.has()) { TextSpacing& rSpacing = mrTextParagraphProperties.getParaTopMargin(); - rSpacing.nUnit = TextSpacing::PERCENT; + rSpacing.nUnit = TextSpacing::Unit::Percent; rSpacing.nValue = oBeforeLines.get() * MAX_PERCENT / 100; rSpacing.bHasValue = true; } @@ -294,7 +294,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl if (oAfter.has()) { TextSpacing& rSpacing = mrTextParagraphProperties.getParaBottomMargin(); - rSpacing.nUnit = TextSpacing::POINTS; + rSpacing.nUnit = TextSpacing::Unit::Points; rSpacing.nValue = TWIPS_TO_MM(oAfter.get()); rSpacing.bHasValue = true; } @@ -304,7 +304,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl if (oAfterLines.has()) { TextSpacing& rSpacing = mrTextParagraphProperties.getParaBottomMargin(); - rSpacing.nUnit = TextSpacing::PERCENT; + rSpacing.nUnit = TextSpacing::Unit::Percent; rSpacing.nValue = oAfterLines.get() * MAX_PERCENT / 100; rSpacing.bHasValue = true; } @@ -318,12 +318,12 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl { if( !oLineRule.has() || oLineRule.get() == "auto" ) { - maLineSpacing.nUnit = TextSpacing::PERCENT; + maLineSpacing.nUnit = TextSpacing::Unit::Percent; maLineSpacing.nValue = oLineSpacing.get() * MAX_PERCENT / 240; } else { - maLineSpacing.nUnit = TextSpacing::POINTS; + maLineSpacing.nUnit = TextSpacing::Unit::Points; maLineSpacing.nValue = TWIPS_TO_MM(oLineSpacing.get()); } maLineSpacing.bHasValue = true; diff --git a/oox/source/drawingml/textspacingcontext.cxx b/oox/source/drawingml/textspacingcontext.cxx index fc6dfd813139..f33b1c10a4e5 100644 --- a/oox/source/drawingml/textspacingcontext.cxx +++ b/oox/source/drawingml/textspacingcontext.cxx @@ -43,11 +43,11 @@ namespace oox { namespace drawingml { switch( aElement ) { case A_TOKEN( spcPct ): - maSpacing.nUnit = TextSpacing::PERCENT; + maSpacing.nUnit = TextSpacing::Unit::Percent; maSpacing.nValue = GetPercent( rAttribs.getString( XML_val ).get() ); break; case A_TOKEN( spcPts ): - maSpacing.nUnit = TextSpacing::POINTS; + maSpacing.nUnit = TextSpacing::Unit::Points; maSpacing.nValue = GetTextSpacingPoint( rAttribs.getString( XML_val ).get() ); break; default: |