diff options
Diffstat (limited to 'vcl/inc/vcl/glyphcache.hxx')
| -rw-r--r-- | vcl/inc/vcl/glyphcache.hxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx index c28a3bfef3dd..f4d3b13c0445 100644 --- a/vcl/inc/vcl/glyphcache.hxx +++ b/vcl/inc/vcl/glyphcache.hxx @@ -49,7 +49,6 @@ class ImplFontOptions; namespace basegfx { class B2DPolyPolygon; } class RawBitmap; -class CmapResult; #include <vcl/outfont.hxx> #include <vcl/impfont.hxx> @@ -64,7 +63,7 @@ namespace vcl // ======================================================================= -class VCL_DLLPUBLIC GlyphCache +class VCL_PLUGIN_PUBLIC GlyphCache { public: explicit GlyphCache( GlyphCachePeer& ); @@ -96,7 +95,7 @@ private: void GrowNotify(); private: - ULONG CalcByteCount() const; + sal_uLong CalcByteCount() const; void GarbageCollect(); // the GlyphCache's FontList matches a font request to a serverfont instance @@ -105,8 +104,8 @@ private: struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; }; typedef ::boost::unordered_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList; FontList maFontList; - ULONG mnMaxSize; // max overall cache size in bytes - mutable ULONG mnBytesUsed; + sal_uLong mnMaxSize; // max overall cache size in bytes + mutable sal_uLong mnBytesUsed; mutable long mnLruIndex; mutable int mnGlyphCount; ServerFont* mpCurrentGCFont; @@ -179,7 +178,7 @@ private: // ======================================================================= -class VCL_DLLPUBLIC ServerFont +class VCL_PLUGIN_PUBLIC ServerFont { public: virtual const ::rtl::OString* GetFontFileName() const { return NULL; } @@ -194,9 +193,9 @@ public: const ImplFontSelectData& GetFontSelData() const { return maFontSelData; } virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const = 0; - virtual ULONG GetKernPairs( ImplKernPairData** ) const { return 0; } + virtual sal_uLong GetKernPairs( ImplKernPairData** ) const { return 0; } virtual int GetGlyphKernValue( int, int ) const { return 0; } - virtual bool GetFontCodeRanges( CmapResult& ) const { return false; } + virtual const ImplFontCharMap* GetImplFontCharMap() const = 0; virtual bool GetFontCapabilities(vcl::FontCapabilities &) const { return false; } Point TransformPoint( const Point& ) const; @@ -224,7 +223,7 @@ protected: void AddRef() const { ++mnRefCount; } long GetRefCount() const { return mnRefCount; } long Release() const; - ULONG GetByteCount() const { return mnBytesUsed; } + sal_uLong GetByteCount() const { return mnBytesUsed; } virtual void InitGlyphData( int nGlyphIndex, GlyphData& ) const = 0; virtual void GarbageCollect( long ); @@ -244,7 +243,7 @@ private: // used by GlyphCache for cache LRU algorithm mutable long mnRefCount; - mutable ULONG mnBytesUsed; + mutable sal_uLong mnBytesUsed; ServerFont* mpPrevGCFont; ServerFont* mpNextGCFont; @@ -262,7 +261,7 @@ private: // ======================================================================= // a class for cache entries for physical font instances that are based on serverfonts -class VCL_DLLPUBLIC ImplServerFontEntry : public ImplFontEntry +class VCL_PLUGIN_PUBLIC ImplServerFontEntry : public ImplFontEntry { private: ServerFont* mpServerFont; @@ -279,7 +278,7 @@ public: // ======================================================================= -class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout +class VCL_PLUGIN_PUBLIC ServerFontLayout : public GenericSalLayout { private: ServerFont& mrServerFont; @@ -324,7 +323,7 @@ protected: // ======================================================================= -class VCL_DLLPUBLIC RawBitmap +class VCL_PLUGIN_PUBLIC RawBitmap { public: RawBitmap(); @@ -333,13 +332,13 @@ public: public: unsigned char* mpBits; - ULONG mnAllocated; + sal_uLong mnAllocated; - ULONG mnWidth; - ULONG mnHeight; + sal_uLong mnWidth; + sal_uLong mnHeight; - ULONG mnScanlineSize; - ULONG mnBitCount; + sal_uLong mnScanlineSize; + sal_uLong mnBitCount; int mnXOffset; int mnYOffset; @@ -357,7 +356,7 @@ inline void ServerFont::SetExtended( int nInfo, void* pVoid ) // ExtraKernInfo allows an on-demand query of extra kerning info #i29881# // The kerning values have to be scaled to match the font size before use -class VCL_DLLPUBLIC ExtraKernInfo +class VCL_PLUGIN_PUBLIC ExtraKernInfo { public: ExtraKernInfo( sal_IntPtr nFontId ); |