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 /extensions/source/update | |
| 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 'extensions/source/update')
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index d5f791e78646..fed6d02e5dd8 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -846,8 +846,8 @@ void BubbleWindow::Paint( const Rectangle& ) DrawImage( Point( BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT ), maBubbleImage ); - Font aOldFont = GetFont(); - Font aBoldFont = aOldFont; + vcl::Font aOldFont = GetFont(); + vcl::Font aBoldFont = aOldFont; aBoldFont.SetWeight( WEIGHT_BOLD ); SetFont( aBoldFont ); @@ -921,8 +921,8 @@ void BubbleWindow::RecalcTextRects() { Size aTotalSize; bool bFinished = false; - Font aOldFont = GetFont(); - Font aBoldFont = aOldFont; + vcl::Font aOldFont = GetFont(); + vcl::Font aBoldFont = aOldFont; aBoldFont.SetWeight( WEIGHT_BOLD ); |