diff options
Diffstat (limited to 'vcl/inc/quartz/salgdi.h')
| -rw-r--r-- | vcl/inc/quartz/salgdi.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index ffffe7f9a1f5..4210499c52d9 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -44,7 +44,7 @@ #include <fontinstance.hxx> #include <impfontmetricdata.hxx> -#include <PhysicalFontFace.hxx> +#include <font/PhysicalFontFace.hxx> #include <salgdi.hxx> #include <quartz/salgdicommon.hxx> @@ -58,7 +58,7 @@ class FontAttributes; class XorEmulation; // CoreText-specific physically available font face -class CoreTextFontFace : public PhysicalFontFace +class CoreTextFontFace : public vcl::font::PhysicalFontFace { public: CoreTextFontFace( const FontAttributes&, sal_IntPtr nFontID ); @@ -102,7 +102,7 @@ public: bool mbFauxBold; private: - explicit CoreTextStyle(const PhysicalFontFace&, const vcl::font::FontSelectPattern&); + explicit CoreTextStyle(const vcl::font::PhysicalFontFace&, const vcl::font::FontSelectPattern&); hb_font_t* ImplInitHbFont() override; bool ImplGetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const override; @@ -552,7 +552,7 @@ public: // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" virtual bool CreateFontSubset( const OUString& rToFile, - const PhysicalFontFace* pFont, + const vcl::font::PhysicalFontFace* pFont, const sal_GlyphId* pGlyphIds, const sal_uInt8* pEncoding, sal_Int32* pWidths, @@ -564,12 +564,12 @@ public: // embeddable by GetDevFontList or NULL in case of error // parameters: pFont: describes the font in question // pDataLen: out parameter, contains the byte length of the returned buffer - virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) + virtual const void* GetEmbedFontData(const vcl::font::PhysicalFontFace*, tools::Long* pDataLen) override; // frees the font data again virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; - virtual void GetGlyphWidths( const PhysicalFontFace*, + virtual void GetGlyphWidths( const vcl::font::PhysicalFontFace*, bool bVertical, std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; @@ -582,7 +582,7 @@ public: GetGraphicsData() const override; private: - static bool GetRawFontData( const PhysicalFontFace* pFontData, + static bool GetRawFontData( const vcl::font::PhysicalFontFace* pFontData, std::vector<unsigned char>& rBuffer, bool* pJustCFF ); }; |