From cf6c748f30fd630b6b7256e0c7ba1783892f9d1e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 16 Jul 2018 16:04:11 +0100 Subject: tdf#118681 make sure we're using the right font char map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I64265dac5d0d18b092d64ef656997d7177a425a4 Reviewed-on: https://gerrit.libreoffice.org/57504 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/svx/charmap.hxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 6e18581c4786..5101b230059f 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -80,8 +81,8 @@ public: void SetFavClickHdl( const Link& rHdl ) { aFavClickHdl = rHdl; } static sal_uInt32& getSelectedChar(); void SetFont( const vcl::Font& rFont ); - vcl::Font const & GetFont() const { return mxVirDev->GetFont(); } - bool GetFontCharMap(FontCharMapRef& rxFontCharMap) const { return mxVirDev->GetFontCharMap(rxFontCharMap); } + vcl::Font const & GetFont() const { return maFont; } + FontCharMapRef GetFontCharMap(); bool isFavChar(const OUString& sTitle, const OUString& rFont); void getFavCharacterList(); //gets both Fav char and Fav char font list void updateFavCharacterList(const OUString& rChar, const OUString& rFont); -- cgit