summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-07-16 16:04:11 +0100
committerEike Rathke <erack@redhat.com>2018-07-17 11:01:57 +0200
commita09d357daf65e285323ff77653a6de3058fc44da (patch)
tree15ab51ffbbfc5a49add169ab2f1eab16e63e56cb /include
parent62aae6918e33a2535462d1e7be2278a7f9745009 (diff)
tdf#118681 make sure we're using the right font char map
Change-Id: I64265dac5d0d18b092d64ef656997d7177a425a4 Reviewed-on: https://gerrit.libreoffice.org/57505 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/svx/charmap.hxx5
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);