diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-13 00:33:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-15 09:20:41 +0100 |
| commit | ad282070c5b351e8cbfe12ec3b5d172f307277c9 (patch) | |
| tree | 8b0c21e6cb6b99d099dee7055c49918a07985fad | |
| parent | 935afabf6fb28c288b51b896ace5ee4ce3cd4fef (diff) | |
make these pure virtual to prove all implemented in sole sub-class
Facilitates merging of ServerFont and FreetypeServerFont
| -rw-r--r-- | vcl/inc/glyphcache.hxx | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx index 3368d3004bb7..62d27c70bdcf 100644 --- a/vcl/inc/glyphcache.hxx +++ b/vcl/inc/glyphcache.hxx @@ -178,24 +178,23 @@ private: class VCL_PLUGIN_PUBLIC ServerFont { public: - virtual const ::rtl::OString* GetFontFileName() const { return NULL; } - virtual int GetFontFaceNumber() const { return 0; } - virtual bool TestFont() const { return true; } - virtual void* GetFtFace() const { return 0; } - virtual int GetLoadFlags() const { return 0; } - virtual void SetFontOptions( boost::shared_ptr<ImplFontOptions> ) {} - virtual boost::shared_ptr<ImplFontOptions> GetFontOptions() const - { return boost::shared_ptr<ImplFontOptions>(); } - virtual bool NeedsArtificialBold() const { return false; } - virtual bool NeedsArtificialItalic() const { return false; } + virtual const ::rtl::OString* GetFontFileName() const = 0; + virtual int GetFontFaceNumber() const = 0; + virtual bool TestFont() const = 0; + virtual void* GetFtFace() const = 0; + virtual int GetLoadFlags() const = 0; + virtual void SetFontOptions( boost::shared_ptr<ImplFontOptions> ) = 0; + virtual boost::shared_ptr<ImplFontOptions> GetFontOptions() const = 0; + virtual bool NeedsArtificialBold() const = 0; + virtual bool NeedsArtificialItalic() const = 0; const ImplFontSelectData& GetFontSelData() const { return maFontSelData; } virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const = 0; - virtual sal_uLong GetKernPairs( ImplKernPairData** ) const { return 0; } - virtual int GetGlyphKernValue( int, int ) const { return 0; } + virtual sal_uLong GetKernPairs( ImplKernPairData** ) const = 0; + virtual int GetGlyphKernValue( int, int ) const = 0; virtual const ImplFontCharMap* GetImplFontCharMap() const = 0; - virtual bool GetFontCapabilities(vcl::FontCapabilities &) const { return false; } + virtual bool GetFontCapabilities(vcl::FontCapabilities &) const = 0; Point TransformPoint( const Point& ) const; GlyphData& GetGlyphData( int nGlyphIndex ); @@ -228,7 +227,7 @@ protected: virtual void GarbageCollect( long ); void ReleaseFromGarbageCollect(); - virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; } + virtual ServerFontLayoutEngine* GetLayoutEngine() = 0; private: typedef ::boost::unordered_map<int,GlyphData> GlyphList; |