diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:44:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:44:39 +0000 |
| commit | 837132881ae097acc6ef7f9efe7b1ca94060a47d (patch) | |
| tree | bb19e0c136c0bd69ad9fa6945e1fabddfde82f06 /vcl/os2 | |
| parent | 0301fa1eb3e7ba513f3ffee3694cef6a4bed900f (diff) | |
INTEGRATION: CWS os2port02 (1.3.2); FILE MERGED
2007/10/08 14:28:05 obr 1.3.2.3: RESYNC: (1.3-1.4); FILE MERGED
2007/10/08 08:14:14 ydario 1.3.2.2: Implemented new methods for frame/graphics
Issue number: i81904
Submitted by: ydario
Reviewed by: ydario
2007/09/30 13:04:32 ydario 1.3.2.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'vcl/os2')
| -rw-r--r-- | vcl/os2/inc/salgdi.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h index 4323ef7db9db..2ed72eb6f814 100644 --- a/vcl/os2/inc/salgdi.h +++ b/vcl/os2/inc/salgdi.h @@ -4,9 +4,9 @@ * * $RCSfile: salgdi.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2007-09-25 10:08:34 $ + * last change: $Author: hr $ $Date: 2007-11-02 12:44:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,20 +37,20 @@ #define _SV_SALGDI_H #ifndef _SV_SV_H -#include <sv.h> +#include <vcl/sv.h> #endif #ifndef _SV_SALLAYOUT_HXX -#include <sallayout.hxx> +#include <vcl/sallayout.hxx> #endif #ifndef _SV_SALGDI_HXX -#include <salgdi.hxx> +#include <vcl/salgdi.hxx> #endif #ifndef _SV_OUTFONT_HXX -#include <outfont.hxx> +#include <vcl/outfont.hxx> #endif #ifndef _SV_IMPFONT_HXX -#include <impfont.hxx> +#include <vcl/impfont.hxx> #endif #include <hash_set> @@ -78,6 +78,8 @@ public: virtual ImplFontData* Clone() const; virtual ImplFontEntry* CreateFontInstance( ImplFontSelectData& ) const; + virtual sal_IntPtr GetFontId() const; + void SetFontId( sal_IntPtr nId ) { mnId = nId; } void UpdateFromHPS( HPS ); bool HasChar( sal_uInt32 cChar ) const; @@ -94,6 +96,7 @@ public: ImplFontCharMap* GetImplFontCharMap(); private: + sal_IntPtr mnId; bool mbDisableGlyphApi; bool mbHasKoreanRange; bool mbHasCJKSupport; @@ -160,6 +163,8 @@ public: KERNINGPAIRS* mpFontKernPairs; // Kerning Pairs of the current Font ULONG mnFontKernPairCount;// Number of Kerning Pairs of the current Font + USHORT ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, int ); + public: Os2SalGraphics(); virtual ~Os2SalGraphics(); @@ -220,6 +225,11 @@ protected: Region &rNativeBoundingRegion, Region &rNativeContentRegion ); #endif + virtual bool drawAlphaBitmap( const SalTwoRect&, + const SalBitmap& rSourceBitmap, + const SalBitmap& rAlphaBitmap ); + virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ); + public: // public SalGraphics methods, the interface to teh independent vcl part @@ -318,6 +328,11 @@ public: // frees the font data again virtual void FreeEmbedFontData( const void* pData, long nDataLen ); + virtual void GetGlyphWidths( ImplFontData* pFont, + bool bVertical, + std::vector< sal_Int32 >& rWidths, + std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc ); + virtual BOOL GetGlyphBoundRect( long nIndex, Rectangle& ); virtual BOOL GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); |