Kaydet (Commit) 4a9b867c authored tarafından Caolán McNamara's avatar Caolán McNamara

svp: use SalColor instead of basebmp::Color

Change-Id: I611dad8d218f5b82903743cb15a5c2a36cc6ba5d
üst 413fdec1
This diff is collapsed.
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX #define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
#include <basebmp/bitmapdevice.hxx> #include <basebmp/bitmapdevice.hxx>
#include <basebmp/color.hxx>
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
#include <vcl/metric.hxx> #include <vcl/metric.hxx>
#include <config_cairo_canvas.h> #include <config_cairo_canvas.h>
...@@ -67,12 +66,8 @@ struct VCL_DLLPUBLIC DamageHandler ...@@ -67,12 +66,8 @@ struct VCL_DLLPUBLIC DamageHandler
class VCL_DLLPUBLIC SvpSalGraphics : public SalGraphics class VCL_DLLPUBLIC SvpSalGraphics : public SalGraphics
{ {
cairo_surface_t* m_pSurface; cairo_surface_t* m_pSurface;
SalColor m_aLineColor;
bool m_bUseLineColor; SalColor m_aFillColor;
basebmp::Color m_aLineColor;
bool m_bUseFillColor;
basebmp::Color m_aFillColor;
PaintMode m_ePaintMode; PaintMode m_ePaintMode;
public: public:
...@@ -84,7 +79,7 @@ private: ...@@ -84,7 +79,7 @@ private:
void invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags); void invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags);
void copySource(const SalTwoRect& rTR, cairo_surface_t* source); void copySource(const SalTwoRect& rTR, cairo_surface_t* source);
void setupPolyPolygon(cairo_t* cr, const basegfx::B2DPolyPolygon& rPolyPoly); void setupPolyPolygon(cairo_t* cr, const basegfx::B2DPolyPolygon& rPolyPoly);
void applyColor(cairo_t *cr, const basebmp::Color &rColor); void applyColor(cairo_t *cr, const SalColor &rColor);
void drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly); void drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly);
protected: protected:
vcl::Region m_aClipRegion; vcl::Region m_aClipRegion;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment