diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-16 16:04:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-16 18:22:39 +0200 |
| commit | cf6c748f30fd630b6b7256e0c7ba1783892f9d1e (patch) | |
| tree | 3ea53faf3695f76c755242b955e43eef756a43d7 /include | |
| parent | 66537c7cecbfe92b3b50cff4c0cac051d8d4272f (diff) | |
tdf#118681 make sure we're using the right font char map
Change-Id: I64265dac5d0d18b092d64ef656997d7177a425a4
Reviewed-on: https://gerrit.libreoffice.org/57504
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/charmap.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
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 <tools/link.hxx> #include <vcl/ctrl.hxx> #include <vcl/event.hxx> +#include <vcl/fontcharmap.hxx> #include <vcl/outdev.hxx> #include <vcl/metric.hxx> #include <vcl/vclptr.hxx> @@ -80,8 +81,8 @@ public: void SetFavClickHdl( const Link<SvxShowCharSet*,void>& 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); |