diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-01 15:48:15 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
commit | a881fd7e66294ada222e1d618a7d47a0549a2342 (patch) | |
tree | cb928eb75f73e36ec3c93a44f2901617476e7fc8 /filter | |
parent | 8c5d90adaf1813c8f3a65487044b8fbe80f8bc85 (diff) |
convert RasterOp to scoped enum
Change-Id: I136423c105316c9b5b18e64d04a248fd7ac5590b
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 48 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 34 |
2 files changed, 41 insertions, 41 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 6dbdff195fc4..7a3efb97469b 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -311,16 +311,16 @@ struct OSAttr , nPushOrder(0) , nIvAttrA(0) , nIvAttrP(0) - , eLinMix(ROP_OVERPAINT) - , eLinBgMix(ROP_OVERPAINT) - , eChrMix(ROP_OVERPAINT) - , eChrBgMix(ROP_OVERPAINT) - , eMrkMix(ROP_OVERPAINT) - , eMrkBgMix(ROP_OVERPAINT) - , ePatMix(ROP_OVERPAINT) - , ePatBgMix(ROP_OVERPAINT) - , eImgMix(ROP_OVERPAINT) - , eImgBgMix(ROP_OVERPAINT) + , eLinMix(RasterOp::OverPaint) + , eLinBgMix(RasterOp::OverPaint) + , eChrMix(RasterOp::OverPaint) + , eChrBgMix(RasterOp::OverPaint) + , eMrkMix(RasterOp::OverPaint) + , eMrkBgMix(RasterOp::OverPaint) + , ePatMix(RasterOp::OverPaint) + , ePatBgMix(RasterOp::OverPaint) + , eImgMix(RasterOp::OverPaint) + , eImgBgMix(RasterOp::OverPaint) , nArcP(0) , nArcQ(0) , nArcR(0) @@ -814,10 +814,10 @@ Point OS2METReader::ReadPoint( const bool bAdjustBoundRect ) RasterOp OS2METReader::OS2MixToRasterOp(sal_uInt8 nMix) { switch (nMix) { - case 0x0c: return ROP_INVERT; - case 0x04: return ROP_XOR; - case 0x0b: return ROP_XOR; - default: return ROP_OVERPAINT; + case 0x0c: return RasterOp::Invert; + case 0x04: return RasterOp::Xor; + case 0x0b: return RasterOp::Xor; + default: return RasterOp::OverPaint; } } @@ -2622,24 +2622,24 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF aDefAttr.aLinCol =Color(COL_BLACK); aDefAttr.aLinBgCol =Color(COL_WHITE); - aDefAttr.eLinMix =ROP_OVERPAINT; - aDefAttr.eLinBgMix =ROP_OVERPAINT; + aDefAttr.eLinMix =RasterOp::OverPaint; + aDefAttr.eLinBgMix =RasterOp::OverPaint; aDefAttr.aChrCol =Color(COL_BLACK); aDefAttr.aChrBgCol =Color(COL_WHITE); - aDefAttr.eChrMix =ROP_OVERPAINT; - aDefAttr.eChrBgMix =ROP_OVERPAINT; + aDefAttr.eChrMix =RasterOp::OverPaint; + aDefAttr.eChrBgMix =RasterOp::OverPaint; aDefAttr.aMrkCol =Color(COL_BLACK); aDefAttr.aMrkBgCol =Color(COL_WHITE); - aDefAttr.eMrkMix =ROP_OVERPAINT; - aDefAttr.eMrkBgMix =ROP_OVERPAINT; + aDefAttr.eMrkMix =RasterOp::OverPaint; + aDefAttr.eMrkBgMix =RasterOp::OverPaint; aDefAttr.aPatCol =Color(COL_BLACK); aDefAttr.aPatBgCol =Color(COL_WHITE); - aDefAttr.ePatMix =ROP_OVERPAINT; - aDefAttr.ePatBgMix =ROP_OVERPAINT; + aDefAttr.ePatMix =RasterOp::OverPaint; + aDefAttr.ePatBgMix =RasterOp::OverPaint; aDefAttr.aImgCol =Color(COL_BLACK); aDefAttr.aImgBgCol =Color(COL_WHITE); - aDefAttr.eImgMix =ROP_OVERPAINT; - aDefAttr.eImgBgMix =ROP_OVERPAINT; + aDefAttr.eImgMix =RasterOp::OverPaint; + aDefAttr.eImgBgMix =RasterOp::OverPaint; aDefAttr.nArcP =1; aDefAttr.nArcQ =1; aDefAttr.nArcR =0; diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index ad451f72166e..2c4a7e9b8ca1 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -161,7 +161,7 @@ private: Pattern eActFillPattern; Pattern eActBackPattern; Size nActPenSize; - // Note: Postscript mode is stored by setting eActRop to ROP_1 + // Note: Postscript mode is stored by setting eActRop to RasterOp::N1 RasterOp eActROP; PictDrawingMethod eActMethod; Size aActOvalSize; @@ -215,7 +215,7 @@ private: // returns true, if we do not need to print the shape/text/frame bool IsInvisible(PictDrawingMethod eMethod) const { - if (eActROP == ROP_1) return true; + if (eActROP == RasterOp::N1) return true; if (eMethod==PDM_FRAME && (nActPenSize.Width() == 0 || nActPenSize.Height() == 0)) return true; return false; } @@ -247,7 +247,7 @@ public: , pVirDev(nullptr) , nOrigPos(0) , IsVersion2(false) - , eActROP(ROP_OVERPAINT) + , eActROP(RasterOp::OverPaint) , eActMethod(PDM_UNDEFINED) { aActFont.SetCharSet(GetTextEncoding()); @@ -648,12 +648,12 @@ void PictReader::DrawingMethod(PictDrawingMethod eMethod) SetFillColor( aActBackColor );// Osnola: previously aActForeColor else // checkMe SetFillColor(eActBackPattern.getColor(COL_BLACK, aActBackColor)); - pVirDev->SetRasterOp(ROP_OVERPAINT); + pVirDev->SetRasterOp(RasterOp::OverPaint); break; case PDM_INVERT: // checkme SetLineColor( Color(COL_TRANSPARENT)); SetFillColor( Color( COL_BLACK ) ); - pVirDev->SetRasterOp(ROP_INVERT); + pVirDev->SetRasterOp(RasterOp::Invert); break; case PDM_FILL: SetLineColor( Color(COL_TRANSPARENT) ); @@ -661,14 +661,14 @@ void PictReader::DrawingMethod(PictDrawingMethod eMethod) SetFillColor( aActForeColor ); else SetFillColor(eActFillPattern.getColor(aActBackColor, aActForeColor)); - pVirDev->SetRasterOp(ROP_OVERPAINT); + pVirDev->SetRasterOp(RasterOp::OverPaint); break; case PDM_TEXT: aActFont.SetColor(aActForeColor); aActFont.SetFillColor(aActBackColor); aActFont.SetTransparent(true); pVirDev->SetFont(aActFont); - pVirDev->SetRasterOp(ROP_OVERPAINT); + pVirDev->SetRasterOp(RasterOp::OverPaint); break; default: break; // -Wall undefined not handled... @@ -1385,17 +1385,17 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode) case 0x0008: // PnMode pPict->ReadUInt16( nUSHORT ); // internal code for postscript command (Quickdraw Reference Drawing B-30,B-34) - if (nUSHORT==23) eActROP = ROP_1; + if (nUSHORT==23) eActROP = RasterOp::N1; else { switch (nUSHORT & 0x0007) { - case 0: eActROP=ROP_OVERPAINT; break; // Copy - case 1: eActROP=ROP_OVERPAINT; break; // Or - case 2: eActROP=ROP_XOR; break; // Xor - case 3: eActROP=ROP_OVERPAINT; break; // Bic - case 4: eActROP=ROP_INVERT; break; // notCopy - case 5: eActROP=ROP_OVERPAINT; break; // notOr - case 6: eActROP=ROP_XOR; break; // notXor - case 7: eActROP=ROP_OVERPAINT; break; // notBic + case 0: eActROP=RasterOp::OverPaint; break; // Copy + case 1: eActROP=RasterOp::OverPaint; break; // Or + case 2: eActROP=RasterOp::Xor; break; // Xor + case 3: eActROP=RasterOp::OverPaint; break; // Bic + case 4: eActROP=RasterOp::Invert; break; // notCopy + case 5: eActROP=RasterOp::OverPaint; break; // notOr + case 6: eActROP=RasterOp::Xor; break; // notXor + case 7: eActROP=RasterOp::OverPaint; break; // notBic } } eActMethod=PDM_UNDEFINED; @@ -1888,7 +1888,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) aActForeColor = Color(COL_BLACK); aActBackColor = Color(COL_WHITE); nActPenSize = Size(1,1); - eActROP = ROP_OVERPAINT; + eActROP = RasterOp::OverPaint; eActMethod = PDM_UNDEFINED; aActOvalSize = Size(1,1); |