diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-30 16:10:58 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-25 14:02:32 +0200 |
| commit | dd16804e52984ded1ee739a22822daa068a13707 (patch) | |
| tree | 9e005e8bdc9d438cbcf7190f9440e60fc0769de0 /vcl/win | |
| parent | 655e3bd9a880a8bf3a1f9d3514e64d0da3d36b8a (diff) | |
Drop duplicate PhysicalFontFace reference
A LogicalFontInstance has a pointer to its parent font face.
And don't pretend we can actually nest MultiSalLayout, so
store the GenericSalLayout internally.
Change-Id: I801acbc34497fc57e8e185eee34c1a1162dbea93
Reviewed-on: https://gerrit.libreoffice.org/62314
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index efbbd0c1edb3..d7c9258473a3 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -24,6 +24,7 @@ #include <comphelper/windowserrorstring.hxx> #include <comphelper/scopeguard.hxx> +#include <o3tl/make_unique.hxx> #include <opengl/texture.hxx> #include <opengl/win/gdiimpl.hxx> @@ -305,8 +306,7 @@ std::unique_ptr<SalLayout> WinSalGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs assert(mpWinFontEntry[nFallbackLevel]->GetFontFace()); mpWinFontEntry[nFallbackLevel]->SetGraphics(this); - GenericSalLayout *aLayout = new GenericSalLayout(*mpWinFontEntry[nFallbackLevel]); - return std::unique_ptr<SalLayout>(aLayout); + return o3tl::make_unique<GenericSalLayout>(*mpWinFontEntry[nFallbackLevel]); } WinFontInstance::WinFontInstance(const WinFontFace& rPFF, const FontSelectPattern& rFSP) |