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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 8 | ||||
| -rw-r--r-- | svx/source/dialog/searchcharmap.cxx | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index fcaa955541df..1f1f469dfc82 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -20,7 +20,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> -#include <vcl/fontcharmap.hxx> #include <svtools/colorcfg.hxx> #include <rtl/textenc.h> @@ -844,12 +843,17 @@ svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos ) return aFind->second.get(); } - sal_Int32 SvxShowCharSet::getMaxCharCount() const { return mxFontCharMap->GetCharCount(); } +FontCharMapRef SvxShowCharSet::GetFontCharMap() +{ + RecalculateFont(*mxVirDev); + return mxFontCharMap; +} + // TODO: should be moved into Font Attributes stuff // we let it mature here though because it is currently the only use diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index d131002f3dee..74a90959dfc3 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -20,7 +20,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> -#include <vcl/fontcharmap.hxx> #include <svtools/colorcfg.hxx> #include <rtl/textenc.h> |