diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2018-05-10 12:48:13 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-05-11 00:16:39 +0200 |
| commit | a909afbc21e8cdd03a7f27db798f830c76aa91d2 (patch) | |
| tree | 540641dd83ebf9f51556306022026600e567fb1c /vcl/inc/win/salgdi.h | |
| parent | e37135d4139f7c614c46fff6f82d519a05f1d9f8 (diff) | |
Fold CommonSalLayout into GenericSalLayout
Now the crazy constructors of CommonSalLayout are gone, we can merge
the two and drop one level of indirection.
Change-Id: I166e4ed2c9d22c1ce75246d486f7526c4928f652
Reviewed-on: https://gerrit.libreoffice.org/54077
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/inc/win/salgdi.h')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 85b88e8e5f10..f2580aa05d5d 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -50,7 +50,6 @@ class PhysicalFontCollection; class SalGraphicsImpl; class WinOpenGLSalGraphicsImpl; class ImplFontMetricData; -class CommonSalLayout; #define RGB_TO_PALRGB(nRGB) ((nRGB)|0x02000000) #define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff) @@ -174,8 +173,8 @@ private: LogicalFontInstance* GetWinFontEntry(int nFallbackLevel); - bool CacheGlyphs(const CommonSalLayout& rLayout); - bool DrawCachedGlyphs(const CommonSalLayout& rLayout); + bool CacheGlyphs(const GenericSalLayout& rLayout); + bool DrawCachedGlyphs(const GenericSalLayout& rLayout); public: HDC getHDC() const { return mhLocalDC; } @@ -295,7 +294,7 @@ protected: private: // local helpers - void DrawTextLayout(const CommonSalLayout&, HDC, bool bUseDWrite); + void DrawTextLayout(const GenericSalLayout&, HDC, bool bUseDWrite); public: // public SalGraphics methods, the interface to the independent vcl part @@ -378,7 +377,7 @@ public: virtual std::unique_ptr<SalLayout> GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; - virtual void DrawTextLayout( const CommonSalLayout& ) override; + virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; // Query the platform layer for control support |