diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /starmath/source/symbol.cxx | |
parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'starmath/source/symbol.cxx')
-rw-r--r-- | starmath/source/symbol.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index 098deb88d238..c2d5e54c9e7e 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -65,7 +65,7 @@ SmSym::SmSym(const SmSym& rSymbol) } -SmSym::SmSym(const OUString& rName, const Font& rFont, sal_UCS4 cChar, +SmSym::SmSym(const OUString& rName, const vcl::Font& rFont, sal_UCS4 cChar, const OUString& rSet, bool bIsPredefined) { m_aName = m_aExportName = rName; @@ -269,7 +269,7 @@ void SmSymbolManager::Load() { // make the new symbol a copy but with ITALIC_NORMAL, and add it to iGreek const SmSym &rSym = *aGreekSymbols[i]; - Font aFont( rSym.GetFace() ); + vcl::Font aFont( rSym.GetFace() ); OSL_ENSURE( aFont.GetItalic() == ITALIC_NONE, "expected Font with ITALIC_NONE, failed." ); aFont.SetItalic( ITALIC_NORMAL ); OUString aSymbolName('i'); |