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/cctrl | |
| 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/cctrl')
| -rw-r--r-- | sc/source/ui/cctrl/dpcontrol.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 6cb40c185ed4..74caa07088af 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -119,11 +119,11 @@ void ScDPFieldButton::draw() // Field name. // Get the font and size the same way as in scenario selection (lcl_DrawOneFrame in gridwin4.cxx) - Font aTextFont( mpStyle->GetAppFont() ); + vcl::Font aTextFont( mpStyle->GetAppFont() ); if ( mpDoc ) { // use ScPatternAttr::GetFont only for font size - Font aAttrFont; + vcl::Font aAttrFont; static_cast<const ScPatternAttr&>(mpDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)). GetFont( aAttrFont, SC_AUTOCOL_BLACK, mpOutDev, &maZoomY ); aTextFont.SetSize( aAttrFont.GetSize() ); |