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 /sc/inc/patattr.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 'sc/inc/patattr.hxx')
| -rw-r--r-- | sc/inc/patattr.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 00d0c98b7730..90516ccf0c37 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -26,7 +26,7 @@ #include <editeng/svxenum.hxx> #include "scdllapi.h" -class Font; +namespace vcl { class Font; } class OutputDevice; class Fraction; class ScStyleSheet; @@ -80,7 +80,7 @@ public: SvxCellOrientation GetCellOrientation( const SfxItemSet* pCondSet = 0 ) const; /** Static helper function to fill a font object from the passed item set. */ - static void GetFont( Font& rFont, const SfxItemSet& rItemSet, + static void GetFont( vcl::Font& rFont, const SfxItemSet& rItemSet, ScAutoFontColorMode eAutoMode, OutputDevice* pOutDev = NULL, const Fraction* pScale = NULL, @@ -88,7 +88,7 @@ public: sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL, const Color* pTextConfigColor = NULL ); /** Fills a font object from the own item set. */ - void GetFont( Font& rFont, ScAutoFontColorMode eAutoMode, + void GetFont( vcl::Font& rFont, ScAutoFontColorMode eAutoMode, OutputDevice* pOutDev = NULL, const Fraction* pScale = NULL, const SfxItemSet* pCondSet = NULL, |