diff options
Diffstat (limited to 'vcl/win/inc/salgdi.h')
-rwxr-xr-x | vcl/win/inc/salgdi.h | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h index f592f53ae29c..94c4849bb197 100755 --- a/vcl/win/inc/salgdi.h +++ b/vcl/win/inc/salgdi.h @@ -58,8 +58,8 @@ class ImplWinFontData : public ImplFontData { public: explicit ImplWinFontData( const ImplDevFontAttributes&, - int nFontHeight, WIN_BYTE eWinCharSet, - WIN_BYTE nPitchAndFamily ); + int nFontHeight, BYTE eWinCharSet, + BYTE nPitchAndFamily ); virtual ~ImplWinFontData(); virtual ImplFontData* Clone() const; @@ -70,8 +70,8 @@ public: bool HasChar( sal_uInt32 cChar ) const; - WIN_BYTE GetCharSet() const { return meWinCharSet; } - WIN_BYTE GetPitchAndFamily() const { return mnPitchAndFamily; } + BYTE GetCharSet() const { return meWinCharSet; } + BYTE GetPitchAndFamily() const { return mnPitchAndFamily; } bool IsGlyphApiDisabled() const { return mbDisableGlyphApi; } bool SupportsKorean() const { return mbHasKoreanRange; } bool SupportsCJK() const { return mbHasCJKSupport; } @@ -107,8 +107,8 @@ private: // TODO: get rid of the members below needed to work with the Win9x non-unicode API BYTE* mpFontCharSets; // all Charsets for the current font (used on W98 for kerning) BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried - WIN_BYTE meWinCharSet; - WIN_BYTE mnPitchAndFamily; + BYTE meWinCharSet; + BYTE mnPitchAndFamily; bool mbAliasSymbolsHigh; bool mbAliasSymbolsLow; private: @@ -153,23 +153,23 @@ public: RGNDATA* mpClipRgnData; // ClipRegion-Data RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data RECT* mpNextClipRect; // Naechstes ClipRegion-Rect - BOOL mbFirstClipRect; // Flag for first cliprect to insert + sal_Bool mbFirstClipRect; // Flag for first cliprect to insert LOGFONTA* mpLogFont; // LOG-Font which is currently selected (only W9x) ImplFontAttrCache* mpFontAttrCache; // Cache font attributes from files in so/share/fonts BYTE* mpFontCharSets; // All Charsets for the current font BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried - BOOL mbFontKernInit; // FALSE: FontKerns must be queried + sal_Bool mbFontKernInit; // FALSE: FontKerns must be queried KERNINGPAIR* mpFontKernPairs; // Kerning Pairs of the current Font - ULONG mnFontKernPairCount;// Number of Kerning Pairs of the current Font + sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font int mnPenWidth; // Linienbreite - BOOL mbStockPen; // is Pen a stockpen - BOOL mbStockBrush; // is Brush a stcokbrush - BOOL mbPen; // is Pen (FALSE == NULL_PEN) - BOOL mbBrush; // is Brush (FALSE == NULL_BRUSH) - BOOL mbPrinter; // is Printer - BOOL mbVirDev; // is VirDev - BOOL mbWindow; // is Window - BOOL mbScreen; // is Screen compatible + sal_Bool mbStockPen; // is Pen a stockpen + sal_Bool mbStockBrush; // is Brush a stcokbrush + sal_Bool mbPen; // is Pen (FALSE == NULL_PEN) + sal_Bool mbBrush; // is Brush (FALSE == NULL_BRUSH) + sal_Bool mbPrinter; // is Printer + sal_Bool mbVirDev; // is VirDev + sal_Bool mbWindow; // is Window + sal_Bool mbScreen; // is Screen compatible bool mbXORMode; // _every_ output with RasterOp XOR // remember RGB values for SetLineColor/SetFillColor @@ -183,25 +183,25 @@ public: virtual ~WinSalGraphics(); protected: - virtual BOOL unionClipRegion( long nX, long nY, long nWidth, long nHeight ); + virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); // draw --> LineColor and FillColor and RasterOp and ClipRegion virtual void drawPixel( long nX, long nY ); virtual void drawPixel( long nX, long nY, SalColor nSalColor ); virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - virtual void drawPolyLine( ULONG nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( ULONG nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin ); - virtual sal_Bool drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ); - virtual sal_Bool drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ); + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); + virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ); // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, USHORT nFlags ); + long nSrcHeight, sal_uInt16 nFlags ); // CopyBits and DrawBitmap --> RasterOp and ClipRegion // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics @@ -222,20 +222,20 @@ protected: // invert --> ClipRegion (only Windows or VirDevs) virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags); - virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); // native widget rendering methods that require mirroring - virtual BOOL hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, BOOL& rIsInside ); - virtual BOOL drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + const Point& aPos, sal_Bool& rIsInside ); + virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ); - virtual BOOL drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ); - virtual BOOL getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -250,7 +250,7 @@ public: // get device resolution virtual void GetResolution( long& rDPIX, long& rDPIY ); // get the depth of the device - virtual USHORT GetBitCount(); + virtual sal_uInt16 GetBitCount(); // get the width of the device virtual long GetGraphicsWidth() const; @@ -258,7 +258,7 @@ public: virtual void ResetClipRegion(); // begin setting the clip region, add rectangles to the // region with the UnionClipRegion call - virtual void BeginSetClipRegion( ULONG nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr nCount ); // all rectangles were added and the clip region should be set now virtual void EndSetClipRegion(); @@ -280,12 +280,12 @@ public: // set the text color to a specific color virtual void SetTextColor( SalColor nSalColor ); // set the font - virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); + virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); // get the current font's etrics virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) - virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); + virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const; // graphics must fill supplied font list @@ -306,7 +306,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual BOOL CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData*, long* pGlyphIDs, sal_uInt8* pEncoding, @@ -344,15 +344,15 @@ public: Ucs2UIntMap& rUnicodeEnc ); virtual int GetMinKashidaWidth(); - virtual BOOL GetGlyphBoundRect( long nIndex, Rectangle& ); - virtual BOOL GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); + virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& ); + virtual sal_Bool GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); virtual void DrawServerFontLayout( const ServerFontLayout& ); virtual bool supportsOperation( OutDevSupportType ) const; // Query the platform layer for control support - virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; @@ -370,7 +370,7 @@ void ImplGetLogFontFromFontSelect( HDC, const ImplFontSelectData*, // - Defines - // ----------- -#define MAX_64KSALPOINTS ((((USHORT)0xFFFF)-8)/sizeof(POINTS)) +#define MAX_64KSALPOINTS ((((sal_uInt16)0xFFFF)-8)/sizeof(POINTS)) // ----------- // - Inlines - |