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 /cui/source/inc | |
| 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 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/autocdlg.hxx | 6 | ||||
| -rw-r--r-- | cui/source/inc/cuicharmap.hxx | 10 | ||||
| -rw-r--r-- | cui/source/inc/numpages.hxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index eb3ea5b9cc95..5d70cc9d9fea 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -154,9 +154,9 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage OUString sBulletChar; OUString sByInputBulletChar; - Font aBulletFont; - Font aByInputBulletFont; - sal_uInt16 nPercent; + vcl::Font aBulletFont; + vcl::Font aByInputBulletFont; + sal_uInt16 nPercent; SvLBoxButtonData* pCheckButtonData; diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 8af1b917362e..0c982672ce74 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -43,7 +43,7 @@ public: bool bCenter = false ); virtual ~SvxShowText(); - void SetFont( const Font& rFont ); + void SetFont( const vcl::Font& rFont ); void SetText( const OUString& rText ) SAL_OVERRIDE; void SetCentered(bool bCenter) { mbCenter = bCenter; } @@ -80,8 +80,8 @@ private: FixedText* m_pSymbolText; SvxShowText* m_pShowChar; FixedText* m_pCharCodeText; - Font aFont; - bool bOne; + vcl::Font aFont; + bool bOne; const SubsetMap* pSubsetMap; DECL_LINK(OKHdl, void *); @@ -102,8 +102,8 @@ public: void DisableFontSelection(); - const Font& GetCharFont() const { return aFont;} - void SetCharFont( const Font& rFont ); + const vcl::Font& GetCharFont() const { return aFont;} + void SetCharFont( const vcl::Font& rFont ); void SetChar( sal_UCS4 ); sal_UCS4 GetChar() const; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 6c56ed05b3ce..5ead54c2c0bc 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -41,7 +41,7 @@ class SvxBrushItem; class SvxNumberingPreview : public Window { const SvxNumRule* pActNum; - Font aStdFont; + vcl::Font aStdFont; long nPageWidth; const OUString* pOutlineNames; bool bPosition; @@ -308,7 +308,7 @@ class SvxNumOptionsTabPage : public SfxTabPage bool bMenuButtonInitialized : 1; std::vector<OUString> aGrfNames; - Font aActBulletFont; + vcl::Font aActBulletFont; sal_uInt8 nBullet; sal_uInt16 nActNumLvl; |