From 60e78fbb806bb45e635ba1de45ceffe187938ac0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Sep 2014 10:09:58 +0200 Subject: fdo#82577: Handle Font Put the VCL Font class in the vcl namespace. Avoids clash with the X11 Font typedef. Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537 --- vcl/inc/win/saldata.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/inc/win/saldata.hxx') 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); -- cgit /libreoffice-5-0'>distro/cib/libreoffice-5-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_8/demoCA
AgeCommit message (Expand)Author
2014-04-17remove executable bitAndras Timar