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/inc/symbol.hxx | |
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/inc/symbol.hxx')
-rw-r--r-- | starmath/inc/symbol.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index eb17b368dbfd..1c469a3c1aea 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -77,17 +77,17 @@ private: public: SmSym(); - SmSym(const OUString& rName, const Font& rFont, sal_UCS4 cChar, + SmSym(const OUString& rName, const vcl::Font& rFont, sal_UCS4 cChar, const OUString& rSet, bool bIsPredefined = false); SmSym(const SmSym& rSymbol); SmSym& operator = (const SmSym& rSymbol); - const Font& GetFace() const { return m_aFace; } + const vcl::Font& GetFace() const { return m_aFace; } sal_UCS4 GetCharacter() const { return m_cChar; } const OUString& GetName() const { return m_aName; } - void SetFace( const Font& rFont ) { m_aFace = rFont; } + void SetFace( const vcl::Font& rFont ) { m_aFace = rFont; } void SetCharacter( sal_UCS4 cChar ) { m_cChar = cChar; } bool IsPredefined() const { return m_bPredefined; } |