summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-04 07:48:15 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-04 07:49:15 +0200
commitf634cda2a26aba91277738f2c6f09405a2bf915c (patch)
treea9fc64974c8d1a20b02d69d0b4aeb84bb619dbf8 /framework
parent75ea03d8423bdcce241149540a636d6156027d65 (diff)
avoid problems with poppler's and vcl's FontInfo during runtime
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index d5309310d322..63cb6ad5ae5e 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -152,7 +152,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
if ( !pFontList )
pFontList.reset(new FontList( Application::GetDefaultDevice() ));
- FontInfo aFntInfo = pFontList->Get( m_aFontDescriptor.Name, m_aFontDescriptor.StyleName );
+ vcl::FontInfo aFntInfo = pFontList->Get( m_aFontDescriptor.Name, m_aFontDescriptor.StyleName );
// setup font size array
if ( m_pHeightArray )