diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-04 07:48:15 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-06-10 18:25:21 +0200 |
| commit | d4029e62e7e3e7f58840753b368b20ef87cb3c11 (patch) | |
| tree | 08c98d2bb58327c94078592e521655427a97ee59 /starmath | |
| parent | 191969ccaa65ee1e934cb3ebab9ef9a4aa3bcd5a (diff) | |
avoid problems with poppler's and vcl's FontInfo during runtime
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
Conflicts:
include/vcl/metric.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx
Conflicts:
include/svtools/ctrltool.hxx
include/vcl/metric.hxx
include/vcl/outdev.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx
sw/source/core/uibase/docvw/srcedtw.cxx
vcl/source/gdi/metric.cxx
vcl/source/outdev/font.cxx
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/dialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index fc9641bafd80..8b10de6c5ef7 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -2280,7 +2280,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyleName) { // get Font (FontInfo) matching name and style - FontInfo aFI; + vcl::FontInfo aFI; if (pFontList) aFI = pFontList->Get(rFontName, WEIGHT_NORMAL, ITALIC_NONE); SetFontStyle(rStyleName, aFI); |