diff options
| author | Radu Ioan <ioan.radu.g@gmail.com> | 2014-11-21 20:48:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-23 18:15:44 +0100 |
| commit | 7528b498b634f0d96a710afc7faf20299cc5792d (patch) | |
| tree | ee6c39fbf1d8e91f43738f6e9a9aa388f059f0dc /sw | |
| parent | 40833b49ebdef2e5ab9ece33fc558fd0929f4e8d (diff) | |
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XLineStyle
Reviewed on:
https://gerrit.libreoffice.org/13029
Change-Id: I583575a04988ccf932374e411672ba14a3f3cb2f
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4e4dccd175ba..66bc667eb9a3 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -124,6 +124,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/drawing/ShadingPattern.hpp> #include <com/sun/star/text/GraphicCrop.hpp> +#include <com/sun/star/drawing/LineStyle.hpp> #include <algorithm> @@ -7692,7 +7693,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), 2, XML_strokecolor, sColor.getStr(), XML_strokeweight, sWidth.getStr() ); - if( LineStyle_DASH == pTop->GetBorderLineStyle() ) // Line Style is Dash type + if( drawing::LineStyle_DASH == pTop->GetBorderLineStyle() ) // Line Style is Dash type AddToAttrList( m_rExport.SdrExporter().getDashLineStyle(), XML_dashstyle, "dash" ); } @@ -7707,7 +7708,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) XML_val, sColor, FSEND); m_pSerializer->endElementNS(XML_a, XML_solidFill); - if( LineStyle_DASH == pTop->GetBorderLineStyle() ) // Line Style is Dash type + if( drawing::LineStyle_DASH == pTop->GetBorderLineStyle() ) // Line Style is Dash type m_pSerializer->singleElementNS(XML_a, XML_prstDash, XML_val, "dash", FSEND); m_pSerializer->endElementNS(XML_a, XML_ln); } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 34c57958c911..ec5564e4ae2a 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -205,7 +205,7 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL, WW8_DP_SHADOW& rSh ) { if( SVBT16ToShort( rL.lnps ) == 5 ){ // invisible - rSet.Put( XLineStyleItem( XLINE_NONE ) ); + rSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) ); }else{ // sichtbar Color aCol( WW8TransCol( rL.lnpc ) ); // LinienFarbe rSet.Put( XLineColorItem( OUString(), aCol ) ); @@ -213,7 +213,7 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL, // line thickness if( SVBT16ToShort( rL.lnps ) >= 1 && SVBT16ToShort(rL.lnps ) <= 4 ){ // line style - rSet.Put( XLineStyleItem( XLINE_DASH ) ); + rSet.Put( XLineStyleItem( drawing::LineStyle_DASH ) ); sal_Int16 nLen = SVBT16ToShort( rL.lnpw ); XDash aD( XDASH_RECT, 1, 2 * nLen, 1, 5 * nLen, 5 * nLen ); switch( SVBT16ToShort( rL.lnps ) ){ @@ -227,7 +227,7 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL, } rSet.Put( XLineDashItem( OUString(), aD ) ); }else{ - rSet.Put( XLineStyleItem( XLINE_SOLID ) ); // needed for TextBox + rSet.Put( XLineStyleItem( drawing::LineStyle_SOLID ) ); // needed for TextBox } } if( SVBT16ToShort( rSh.shdwpi ) ){ // shadow @@ -2720,7 +2720,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, SfxItemSet aSet(pDrawModel->GetItemPool()); aSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); - aSet.Put(XLineStyleItem(XLINE_NONE)); + aSet.Put(XLineStyleItem(drawing::LineStyle_NONE)); aSet.Put(SdrTextFitToSizeTypeItem( SDRTEXTFIT_NONE )); aSet.Put(makeSdrTextAutoGrowHeightItem(false)); aSet.Put(makeSdrTextAutoGrowWidthItem(false)); |