diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 07:44:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 07:44:59 +0000 |
| commit | 8efa7ea14df672d42560db49311faab83777a99b (patch) | |
| tree | e8c9e3f7e8ce0713cf325038872f1df5bf7edbe6 /vcl/inc/vcl/outdev.hxx | |
| parent | 28b2ace78d25c6f4ea39c6b619c2ccf297f58f70 (diff) | |
INTEGRATION: CWS aquabmpfix02 (1.7.2); FILE MERGED
2008/06/02 10:20:46 hdu 1.7.2.2: #i90247# cleanup OutputDevice::ImplSelectClipRegion() signature
2008/06/02 08:44:39 hdu 1.7.2.1: #i89828# add and use OutputDevice::ImplGetDeviceTransformation() method
Diffstat (limited to 'vcl/inc/vcl/outdev.hxx')
| -rw-r--r-- | vcl/inc/vcl/outdev.hxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 1eef1926fde4..ee906b3452b8 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: outdev.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -406,7 +406,7 @@ public: SAL_DLLPRIVATE void ImplInitFont() const; SAL_DLLPRIVATE void ImplInitTextColor(); SAL_DLLPRIVATE void ImplInitClipRegion(); - SAL_DLLPRIVATE static BOOL ImplSelectClipRegion( SalGraphics* pGraphics, const Region& rRegion, OutputDevice *pOutDev ); + SAL_DLLPRIVATE bool ImplSelectClipRegion( const Region&, SalGraphics* pGraphics = NULL ); SAL_DLLPRIVATE void ImplSetClipRegion( const Region* pRegion ); SAL_DLLPRIVATE void ImplSetTriangleClipRegion( const PolyPolygon &rPolyPolygon ); @@ -446,16 +446,17 @@ public: SAL_DLLPRIVATE void ImplInitFontList() const; SAL_DLLPRIVATE void ImplUpdateFontData( bool bNewFontLists ); SAL_DLLPRIVATE static void ImplUpdateAllFontData( bool bNewFontLists ); + SAL_DLLPRIVATE long ImplLogicXToDevicePixel( long nX ) const; SAL_DLLPRIVATE long ImplLogicYToDevicePixel( long nY ) const; SAL_DLLPRIVATE long ImplLogicWidthToDevicePixel( long nWidth ) const; SAL_DLLPRIVATE long ImplLogicHeightToDevicePixel( long nHeight ) const; SAL_DLLPRIVATE long ImplDevicePixelToLogicWidth( long nWidth ) const; SAL_DLLPRIVATE long ImplDevicePixelToLogicHeight( long nHeight ) const; - SAL_DLLPRIVATE float ImplFloatLogicWidthToDevicePixel( float ) const; - SAL_DLLPRIVATE float ImplFloatLogicHeightToDevicePixel( float ) const; - SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicWidth( float ) const; - SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicHeight( float ) const; + SAL_DLLPRIVATE float ImplFloatLogicWidthToDevicePixel( float ) const; + SAL_DLLPRIVATE float ImplFloatLogicHeightToDevicePixel( float ) const; + SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicWidth( float ) const; + SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicHeight( float ) const; SAL_DLLPRIVATE Point ImplLogicToDevicePixel( const Point& rLogicPt ) const; SAL_DLLPRIVATE Size ImplLogicToDevicePixel( const Size& rLogicSize ) const; SAL_DLLPRIVATE Rectangle ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const; @@ -464,6 +465,9 @@ public: SAL_DLLPRIVATE LineInfo ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const; SAL_DLLPRIVATE Rectangle ImplDevicePixelToLogic( const Rectangle& rLogicRect ) const; SAL_DLLPRIVATE Region ImplPixelToDevicePixel( const Region& rRegion ) const; + SAL_DLLPRIVATE void ImplInvalidateViewTransform(); + SAL_DLLPRIVATE basegfx::B2DHomMatrix ImplGetDeviceTransformation() const; + SAL_DLLPRIVATE void ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly = NULL ); SAL_DLLPRIVATE void ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly = NULL ); SAL_DLLPRIVATE void ImplDrawPolyPolygon( USHORT nPoly, const PolyPolygon& rPolyPoly ); @@ -894,7 +898,6 @@ public: // #i75163# basegfx::B2DHomMatrix GetViewTransformation() const; basegfx::B2DHomMatrix GetInverseViewTransformation() const; - SAL_DLLPRIVATE void ImplInvalidateViewTransform(); /** Set an offset in pixel |