diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-12 14:41:19 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-05 18:11:01 +0200 |
| commit | c817a5a4958c323eb189e1374072998b8b13ba8c (patch) | |
| tree | 0345dd9e4ae0b590a184b354e9fb183dbcd27f09 /vcl/inc/win/salgdi.h | |
| parent | 0e736b0c20e096c5daf59f141b4509cfcc159a79 (diff) | |
vcl: test PhysicalFontFace and move to vcl::font namespace
- moved PhysicalFontFace.hxx to vcl/inc/font
- added PhysicalFontFace to vcl::font namespace
- had to regenerate precompiled_vcl.hxx
- tested PhysicalFontFace, with some extensive tests for
IsBetterMatch()
Change-Id: I860022ac244f8a827f6f9cb7ed9018c5d9c328cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121970
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/inc/win/salgdi.h')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 4ea2546b9ae3..f02eadf60c14 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -26,7 +26,7 @@ #include <salgdi.hxx> #include <fontinstance.hxx> #include <fontattributes.hxx> -#include <PhysicalFontFace.hxx> +#include <font/PhysicalFontFace.hxx> #include <impfont.hxx> #include <vcl/fontcapabilities.hxx> #include <vcl/fontcharmap.hxx> @@ -58,7 +58,7 @@ class ImplFontMetricData; #define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff) // win32 specific physically available font face -class WinFontFace : public PhysicalFontFace +class WinFontFace : public vcl::font::PhysicalFontFace { public: explicit WinFontFace( const FontAttributes&, @@ -174,7 +174,7 @@ private: void DeInitGraphics(); public: - HFONT ImplDoSetFont(vcl::font::FontSelectPattern const & i_rFont, const PhysicalFontFace * i_pFontFace, HFONT& o_rOldFont); + HFONT ImplDoSetFont(vcl::font::FontSelectPattern const & i_rFont, const vcl::font::PhysicalFontFace * i_pFontFace, HFONT& o_rOldFont); HDC getHDC() const { return mhLocalDC; } void setHDC(HDC aNew); @@ -364,7 +364,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*, + const vcl::font::PhysicalFontFace*, const sal_GlyphId* pGlyphIDs, const sal_uInt8* pEncoding, sal_Int32* pWidths, @@ -376,10 +376,10 @@ 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) override; + 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; @@ -400,7 +400,7 @@ public: void ImplUpdateSysColorEntries(); int ImplIsSysColorEntry( Color nColor ); void ImplGetLogFontFromFontSelect( const vcl::font::FontSelectPattern&, - const PhysicalFontFace*, LOGFONTW& ); + const vcl::font::PhysicalFontFace*, LOGFONTW& ); #define MAX_64KSALPOINTS ((((sal_uInt16)0xFFFF)-8)/sizeof(POINTS)) |