Kaydet (Commit) 4a31802d authored tarafından Chris Sherlock's avatar Chris Sherlock

Don't forget to add polygon as an object in the makefile!

Change-Id: Ib4a51d23d80d20e00968929628bbb4966b78c408
üst 7bb315b2
...@@ -692,25 +692,31 @@ public: ...@@ -692,25 +692,31 @@ public:
// Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon // Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon
// without MetaFile processing // without MetaFile processing
SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly); SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly);
private:
///@} ///@}
/** @name Gradient functions /** @name Gradient functions
*/ */
///@{ ///@{
SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
public: public:
void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); void DrawGradient( const Rectangle& rRect, const Gradient& rGradient );
void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
void AddGradientActions( void AddGradientActions(
const Rectangle& rRect, const Rectangle& rRect,
const Gradient& rGradient, const Gradient& rGradient,
GDIMetaFile& rMtf ); GDIMetaFile& rMtf );
protected:
virtual long ImplGetGradientStepCount( long nMinRect );
private:
SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
SAL_DLLPRIVATE long ImplGetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf, bool bComplex=false );
SAL_DLLPRIVATE Color GetSingleColorGradientFill();
SAL_DLLPRIVATE void SetGrayscaleColors( Gradient &rGradient );
///@} ///@}
public: public:
...@@ -812,7 +818,6 @@ protected: ...@@ -812,7 +818,6 @@ protected:
const Point& rDestPt, const Size& rDestSize, const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel ); const Point& rSrcPtPixel, const Size& rSrcSizePixel );
virtual long ImplGetGradientStepCount( long nMinRect );
virtual bool UsePolyPolygonForComplexGradient() = 0; virtual bool UsePolyPolygonForComplexGradient() = 0;
/** Transform and draw a bitmap directly /** Transform and draw a bitmap directly
...@@ -861,16 +866,12 @@ private: ...@@ -861,16 +866,12 @@ private:
SAL_DLLPRIVATE void ImplClearFontData( bool bNewFontLists ); SAL_DLLPRIVATE void ImplClearFontData( bool bNewFontLists );
SAL_DLLPRIVATE void ImplRefreshFontData( bool bNewFontLists ); SAL_DLLPRIVATE void ImplRefreshFontData( bool bNewFontLists );
SAL_DLLPRIVATE static void ImplUpdateFontDataForAllFrames( FontUpdateHandler_t pHdl, bool bNewFontLists ); SAL_DLLPRIVATE static void ImplUpdateFontDataForAllFrames( FontUpdateHandler_t pHdl, bool bNewFontLists );
SAL_DLLPRIVATE long ImplGetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf, bool bComplex=false );
// not implemented; to detect misuses of DrawOutDev(...OutputDevice&); // not implemented; to detect misuses of DrawOutDev(...OutputDevice&);
void DrawOutDev( const Point&, const Size&, const Point&, const Size&, const Printer&); void DrawOutDev( const Point&, const Size&, const Point&, const Size&, const Printer&);
bool DrawTransparentNatively( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); bool DrawTransparentNatively( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
Color GetSingleColorGradientFill();
void SetGrayscaleColors( Gradient &rGradient );
public: public:
virtual ~OutputDevice(); virtual ~OutputDevice();
......
...@@ -234,6 +234,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ ...@@ -234,6 +234,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/gdi/metric \ vcl/source/gdi/metric \
vcl/source/gdi/octree \ vcl/source/gdi/octree \
vcl/source/gdi/oldprintadaptor \ vcl/source/gdi/oldprintadaptor \
vcl/source/gdi/outdev/polygon \
vcl/source/gdi/outdev/outdev2 \ vcl/source/gdi/outdev/outdev2 \
vcl/source/gdi/outdev/outdev3 \ vcl/source/gdi/outdev/outdev3 \
vcl/source/gdi/outdev/hatch \ vcl/source/gdi/outdev/hatch \
......
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