vcl/inc/CommonSalLayout.hxx | 1 - vcl/source/gdi/CommonSalLayout.cxx | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-)
New commits: commit bd15b93f933f65ac1a8b9f7a51bd99fa18dfe3ed Author: Khaled Hosny <[email protected]> Date: Sat Sep 24 13:32:38 2016 +0200 No need to copy FontSelectPattern Causes a crash on Mac when opening an existing document. Change-Id: I489457d0403259a18bcae9c66c2bde661e87178d diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx index 89214d4..2fd23f4 100644 --- a/vcl/inc/CommonSalLayout.hxx +++ b/vcl/inc/CommonSalLayout.hxx @@ -36,7 +36,6 @@ class CommonSalLayout : public GenericSalLayout { hb_font_t* mpHbFont; - FontSelectPattern maFontSelData; css::uno::Reference<css::i18n::XBreakIterator> mxBreak; #ifdef _WIN32 HDC mhDC; diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 38d6117..a665c02 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -129,7 +129,6 @@ static hb_unicode_funcs_t* getUnicodeFuncs() CommonSalLayout::CommonSalLayout(WinSalGraphics* WSL, WinFontInstance& rWinFontInstance, const WinFontFace& rWinFontFace) : mhFont((HFONT)GetCurrentObject(WSL->getHDC(), OBJ_FONT)), mhDC(WSL->getHDC()), - maFontSelData(rWinFontInstance.maFontSelData), mpD2DRenderer(nullptr) { mpHbFont = rWinFontFace.GetHbFont(); @@ -153,7 +152,7 @@ CommonSalLayout::CommonSalLayout(WinSalGraphics* WSL, WinFontInstance& rWinFontI hb_face_destroy(pHbFace); } - scaleHbFont(mpHbFont, maFontSelData); + scaleHbFont(mpHbFont, rWinFontInstance.maFontSelData); } void CommonSalLayout::InitFont() const @@ -163,8 +162,7 @@ void CommonSalLayout::InitFont() const #elif defined(MACOSX) || defined(IOS) CommonSalLayout::CommonSalLayout(const CoreTextStyle& rCoreTextStyle) -: maFontSelData(rCoreTextStyle.maFontSelData), - mrCoreTextStyle(rCoreTextStyle) +: mrCoreTextStyle(rCoreTextStyle) { mpHbFont = rCoreTextStyle.GetHbFont(); if (!mpHbFont) @@ -184,13 +182,12 @@ CommonSalLayout::CommonSalLayout(const CoreTextStyle& rCoreTextStyle) hb_face_destroy(pHbFace); } - scaleHbFont(mpHbFont, maFontSelData); + scaleHbFont(mpHbFont, rCoreTextStyle.maFontSelData); } #else CommonSalLayout::CommonSalLayout(ServerFont& rServerFont) -: maFontSelData(rServerFont.GetFontSelData()), - mrServerFont(rServerFont) +: mrServerFont(rServerFont) { mpHbFont = rServerFont.GetHbFont(); if (!mpHbFont) @@ -203,7 +200,7 @@ CommonSalLayout::CommonSalLayout(ServerFont& rServerFont) hb_face_destroy(pHbFace); } - scaleHbFont(mpHbFont, maFontSelData); + scaleHbFont(mpHbFont, rServerFont.GetFontSelData()); } #endif _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
