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/source/ui/inc/spellparam.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/source/ui/inc/spellparam.hxx')
| -rw-r--r-- | sc/source/ui/inc/spellparam.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index d50e6539a97d..fb326f60cd8c 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -48,14 +48,14 @@ public: ScConversionType eConvType, LanguageType eSourceLang, LanguageType eTargetLang, - const Font& rTargetFont, + const vcl::Font& rTargetFont, sal_Int32 nOptions, bool bIsInteractive ); inline ScConversionType GetType() const { return meConvType; } inline LanguageType GetSourceLang() const { return meSourceLang; } inline LanguageType GetTargetLang() const { return meTargetLang; } - inline const Font* GetTargetFont() const { return mbUseTargetFont ? &maTargetFont : 0; } + inline const vcl::Font* GetTargetFont() const { return mbUseTargetFont ? &maTargetFont : 0; } inline sal_Int32 GetOptions() const { return mnOptions; } inline bool IsInteractive() const { return mbIsInteractive; } @@ -63,7 +63,7 @@ private: ScConversionType meConvType; /// Type of the conversion. LanguageType meSourceLang; /// Source language for conversion. LanguageType meTargetLang; /// Target language for conversion. - Font maTargetFont; /// Target font to be used if language has to be changed. + vcl::Font maTargetFont; /// Target font to be used if language has to be changed. sal_Int32 mnOptions; /// Conversion options. bool mbUseTargetFont; /// True = Use maTargetFont to change font during conversion. bool mbIsInteractive; /// True = Text conversion has (specific) dialog that may be raised. |