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 --- sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sc/source/ui/sidebar') diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index b2075c4bccf9..ee2b9a7ec514 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -70,11 +70,11 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt ) long nRectWidth = aRect.GetWidth(); Point aBLPos = aRect.TopLeft(); - Font aOldFont = pDev->GetFont(); + vcl::Font aOldFont = pDev->GetFont(); Color aOldColor = pDev->GetLineColor(); Color aOldFillColor = pDev->GetFillColor(); - Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); Size aSize = aFont.GetSize(); aSize.Height() = nRectHeight*3/5; aFont.SetSize( aSize ); -- cgit