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 /include/editeng/bulletitem.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 'include/editeng/bulletitem.hxx')
| -rw-r--r-- | include/editeng/bulletitem.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 1dbb47388ed7..5af465bde828 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -61,7 +61,7 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem { - Font aFont; + vcl::Font aFont; GraphicObject* pGraphicObject; OUString aPrevText; OUString aFollowText; @@ -98,7 +98,7 @@ public: long GetWidth() const { return nWidth; } sal_uInt16 GetStyle() const { return nStyle; } sal_uInt8 GetJustification() const { return nJustify; } - Font GetFont() const { return aFont; } + vcl::Font GetFont() const { return aFont; } sal_uInt16 GetScale() const { return nScale; } const GraphicObject& GetGraphicObject() const; @@ -112,7 +112,7 @@ public: void SetWidth( long nNew ) { nWidth = nNew; } void SetStyle( sal_uInt16 nNew ) { nStyle = nNew; } void SetJustification( sal_uInt8 nNew ) { nJustify = nNew; } - void SetFont( const Font& rNew) { aFont = rNew; } + void SetFont( const vcl::Font& rNew) { aFont = rNew; } void SetScale( sal_uInt16 nNew ) { nScale = nNew; } virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const SAL_OVERRIDE; @@ -122,8 +122,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - static void StoreFont( SvStream&, const Font& ); - static Font CreateFont( SvStream&, sal_uInt16 nVer ); + static void StoreFont( SvStream&, const vcl::Font& ); + static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer ); sal_uInt16& GetValidMask() { return nValidMask; } sal_uInt16 GetValidMask() const { return nValidMask; } |