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 /vcl/inc/win/saldata.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 'vcl/inc/win/saldata.hxx')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index f0c5e332839c..d047fc54a857 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -36,7 +36,7 @@ class WinSalObject; class WinSalFrame; class WinSalVirtualDevice; class WinSalPrinter; -class Font; +namespace vcl { class Font; } struct HDCCache; struct TempFontItem; @@ -195,7 +195,7 @@ WinSalObject* ImplFindSalObject( HWND hWndChild ); bool ImplSalPreDispatchMsg( MSG* pMsg ); void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT nDispatchResult ); -void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ); +void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, vcl::Font& rFont ); rtl_TextEncoding ImplSalGetSystemEncoding(); OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 nLen = -1); |