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/svx/fontlb.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/svx/fontlb.hxx')
| -rw-r--r-- | include/svx/fontlb.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index d0d6b9028751..d5a1b25bdff1 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -31,7 +31,7 @@ class SvLBoxFontString : public SvLBoxString { private: - Font maFont; /// The font used by this item. + vcl::Font maFont; /// The font used by this item. bool mbUseColor; /// true = use font color, false = default listbox color. public: @@ -40,7 +40,7 @@ public: SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rString, - const Font& rFont, + const vcl::Font& rFont, const Color* pColor = NULL ); virtual ~SvLBoxFontString(); @@ -62,10 +62,10 @@ public: class SVX_DLLPUBLIC SvxFontListBox : public SvTabListBox { private: - Font maStdFont; /// Used for entries without specific font. + vcl::Font maStdFont; /// Used for entries without specific font. // The following members are used to store additional parameters for InitEntry(). - Font maEntryFont; /// Current entry font used in InitEntry(). + vcl::Font maEntryFont; /// Current entry font used in InitEntry(). const Color* mpEntryColor; /// Current entry color used in InitEntry(). bool mbUseFont; /// true = Use maEntryFont/mpEntryColor in InitEntry(). @@ -75,7 +75,7 @@ public: /** Inserts a list entry and sets the font used for this entry. @param pColor The font color. NULL = use default listbox text color. */ void InsertFontEntry( - const OUString& rString, const Font& rFont, const Color* pColor = NULL ); + const OUString& rString, const vcl::Font& rFont, const Color* pColor = NULL ); /** Selects/deselects an entry specified by its position in the list box. */ void SelectEntryPos( sal_uLong nPos, bool bSelect = true ); |