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/qt5 | |
| 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/qt5')
| -rw-r--r-- | vcl/qt5/Qt5Graphics.hxx | 2 | ||||
| -rw-r--r-- | vcl/qt5/Qt5Graphics_Text.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx index 8b37232f7e5c..af21ee462b18 100644 --- a/vcl/qt5/Qt5Graphics.hxx +++ b/vcl/qt5/Qt5Graphics.hxx @@ -184,7 +184,7 @@ public: virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override; virtual std::unique_ptr<SalLayout> GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) override; - virtual void DrawTextLayout(const CommonSalLayout&) override; + virtual void DrawTextLayout(const GenericSalLayout&) override; // Native control support diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx index ed3d849aa3f4..2af33b0d97a5 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/Qt5Graphics_Text.cxx @@ -23,7 +23,7 @@ #include <vcl/fontcharmap.hxx> -#include <CommonSalLayout.hxx> +#include <sallayout.hxx> #include <PhysicalFontCollection.hxx> #include <QtGui/QFontDatabase> @@ -142,10 +142,10 @@ bool Qt5Graphics::GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) { std::unique_ptr<SalLayout> Qt5Graphics::GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) { if (m_pTextStyle[nFallbackLevel]) - return std::unique_ptr<SalLayout>(new CommonSalLayout(*m_pTextStyle[nFallbackLevel])); + return std::unique_ptr<SalLayout>(new GenericSalLayout(*m_pTextStyle[nFallbackLevel])); return std::unique_ptr<SalLayout>(); } -void Qt5Graphics::DrawTextLayout(const CommonSalLayout&) {} +void Qt5Graphics::DrawTextLayout(const GenericSalLayout&) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |