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/svtools/sampletext.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/svtools/sampletext.hxx')
| -rw-r--r-- | include/svtools/sampletext.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx index 6deacc3a315a..c241e19a7500 100644 --- a/include/svtools/sampletext.hxx +++ b/include/svtools/sampletext.hxx @@ -17,12 +17,12 @@ #include <vcl/fontcapabilities.hxx> class OutputDevice; -class Font; +namespace vcl { class Font; } SVT_DLLPUBLIC UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage); -SVT_DLLPUBLIC bool isSymbolFont(const Font &rFont); -SVT_DLLPUBLIC bool isOpenSymbolFont(const Font &rFont); +SVT_DLLPUBLIC bool isSymbolFont(const vcl::Font &rFont); +SVT_DLLPUBLIC bool isOpenSymbolFont(const vcl::Font &rFont); SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice &rDevice); @@ -36,7 +36,7 @@ SVT_DLLPUBLIC OUString makeShortRepresentativeTextForScript(UScriptCode eScript) SVT_DLLPUBLIC OUString makeShortMinimalTextForScript(UScriptCode eScript); //These ones are typically for use in the font preview window in format character -SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont); +SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &rFont); SVT_DLLPUBLIC OUString makeRepresentativeTextForLanguage(LanguageType eLang); SVT_DLLPUBLIC OUString makeRepresentativeTextForScript(UScriptCode eScript); SVT_DLLPUBLIC OUString makeMinimalTextForScript(UScriptCode eScript); |