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 /sd/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 'sd/inc')
| -rw-r--r-- | sd/inc/Outliner.hxx | 2 | ||||
| -rw-r--r-- | sd/inc/drawdoc.hxx | 2 | ||||
| -rw-r--r-- | sd/inc/stlpool.hxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index ee84cb4349d8..7fbe423a7ca3 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -155,7 +155,7 @@ public: /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); + const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); /** This is called internally when text conversion is started. The position of current view mode/page/object/caret position diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 2e0a174f69e7..1998e4d039be 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -571,7 +571,7 @@ public: /** return the document fonts for latin, cjk and ctl according to the current languages set at this document */ - SAL_DLLPRIVATE void getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont ); + SAL_DLLPRIVATE void getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ); SAL_DLLPRIVATE sd::UndoManager* GetUndoManager() const; diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index ae146096542d..15958987fe55 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -86,8 +86,8 @@ public: void CreatePseudosIfNecessary(); void UpdateStdNames(); - static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont ); - static Font GetBulletFont(); + static void PutNumBulletItem( SfxStyleSheetBase* pSheet, vcl::Font& rBulletFont ); + static vcl::Font GetBulletFont(); SdDrawDocument* GetDoc() const { return mpDoc; } |