summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-02 08:36:23 +0200
committerNoel Grandin <noel@peralex.com>2016-09-05 08:21:46 +0200
commit65ca57a447bae97714b1b32aa2df5705215a95ad (patch)
tree9b62f8fb4a890d5fcba13abc446b3244e9c5232f /filter
parenta881fd7e66294ada222e1d618a7d47a0549a2342 (diff)
convert LineStyle to scoped enum
Change-Id: I30cfa5a0649b806604c443f55683d1f2a430983d
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2
-rw-r--r--filter/source/graphicfilter/idxf/dxf2mtf.cxx10
-rw-r--r--filter/source/graphicfilter/idxf/dxfvec.hxx2
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx10
4 files changed, 12 insertions, 12 deletions
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 7036da7690fc..ee909bb948ca 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2277,7 +2277,7 @@ void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit,
void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
{
SvtGraphicStroke::DashArray l_aDashArray;
- if ( rLineInfo.GetStyle() == LINE_DASH )
+ if ( rLineInfo.GetStyle() == LineStyle::Dash )
l_aDashArray.push_back( 2 );
const double fLWidth(( ( rLineInfo.GetWidth() + 1 ) + ( rLineInfo.GetWidth() + 1 ) ) * 0.5);
SvtGraphicStroke::JoinType aJoinType(SvtGraphicStroke::joinMiter);
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 72af29d269f4..43534f9e6629 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -71,11 +71,11 @@ DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(OString const& rLineType)
pLT = pDXF->aTables.SearchLType(rLineType);
if (pLT==nullptr || pLT->nDashCount == 0) {
- aDXFLineInfo.eStyle = LINE_SOLID;
+ aDXFLineInfo.eStyle = LineStyle::Solid;
}
else {
sal_Int32 i;
- aDXFLineInfo.eStyle = LINE_DASH;
+ aDXFLineInfo.eStyle = LineStyle::Dash;
for (i=0; i < (pLT->nDashCount); i++) {
const double x = pLT->fDash[i] * pDXF->getGlobalLineTypeScale();
if ( x >= 0.0 ) {
@@ -116,7 +116,7 @@ DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const DXFBasicEntity & rE)
{
DXFLineInfo aDXFLineInfo;
- aDXFLineInfo.eStyle = LINE_SOLID;
+ aDXFLineInfo.eStyle = LineStyle::Solid;
aDXFLineInfo.fWidth = 0;
aDXFLineInfo.nDashCount = 0;
aDXFLineInfo.fDashLen = 0;
@@ -788,7 +788,7 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF
nMainEntitiesCount=CountEntities(pDXF->aEntities);
nBlockColor=7;
- aBlockDXFLineInfo.eStyle = LINE_SOLID;
+ aBlockDXFLineInfo.eStyle = LineStyle::Solid;
aBlockDXFLineInfo.fWidth = 0;
aBlockDXFLineInfo.nDashCount = 0;
aBlockDXFLineInfo.fDashLen = 0;
@@ -803,7 +803,7 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF
}
else {
nParentLayerColor=7;
- aParentLayerDXFLineInfo.eStyle = LINE_SOLID;
+ aParentLayerDXFLineInfo.eStyle = LineStyle::Solid;
aParentLayerDXFLineInfo.fWidth = 0;
aParentLayerDXFLineInfo.nDashCount = 0;
aParentLayerDXFLineInfo.fDashLen = 0;
diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx
index 8c8a4f7bba0c..4f22e6ef97fe 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.hxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.hxx
@@ -36,7 +36,7 @@ public:
double fDistance;
DXFLineInfo() :
- eStyle(LINE_SOLID),
+ eStyle(LineStyle::Solid),
fWidth(0),
nDashCount(0),
fDashLen(0),
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 7a3efb97469b..20f367a6e2dc 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -460,12 +460,12 @@ OS2METReader::~OS2METReader()
bool OS2METReader::IsLineInfo()
{
- return ( ! ( aLineInfo.IsDefault() || ( aLineInfo.GetStyle() == LINE_NONE ) || ( pVirDev->GetLineColor() == COL_TRANSPARENT ) ) );
+ return ( ! ( aLineInfo.IsDefault() || ( aLineInfo.GetStyle() == LineStyle::NONE ) || ( pVirDev->GetLineColor() == COL_TRANSPARENT ) ) );
}
void OS2METReader::DrawPolyLine( const tools::Polygon& rPolygon )
{
- if ( aLineInfo.GetStyle() == LINE_DASH || ( aLineInfo.GetWidth() > 1 ) )
+ if ( aLineInfo.GetStyle() == LineStyle::Dash || ( aLineInfo.GetWidth() > 1 ) )
pVirDev->DrawPolyLine( rPolygon, aLineInfo );
else
pVirDev->DrawPolyLine( rPolygon );
@@ -683,7 +683,7 @@ void OS2METReader::ChangeBrush(const Color& rPatColor, const Color& /*rBGColor*/
void OS2METReader::SetPen( const Color& rColor, sal_uInt16 nLineWidth, PenStyle ePenStyle )
{
- LineStyle eLineStyle( LINE_SOLID );
+ LineStyle eLineStyle( LineStyle::Solid );
if ( pVirDev->GetLineColor() != rColor )
pVirDev->SetLineColor( rColor );
@@ -694,7 +694,7 @@ void OS2METReader::SetPen( const Color& rColor, sal_uInt16 nLineWidth, PenStyle
switch ( ePenStyle )
{
case PEN_NULL :
- eLineStyle = LINE_NONE;
+ eLineStyle = LineStyle::NONE;
break;
case PEN_DASHDOT :
nDashCount++;
@@ -710,7 +710,7 @@ void OS2METReader::SetPen( const Color& rColor, sal_uInt16 nLineWidth, PenStyle
aLineInfo.SetDistance( nLineWidth );
aLineInfo.SetDotLen( nLineWidth );
aLineInfo.SetDashLen( nLineWidth << 2 );
- eLineStyle = LINE_DASH;
+ eLineStyle = LineStyle::Dash;
break;
case PEN_SOLID:
break; // -Wall not handled...