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 /framework/source | |
| 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 'framework/source')
| -rw-r--r-- | framework/source/uielement/complextoolbarcontroller.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index b2542d92165f..bf0ac99eec8f 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -269,7 +269,7 @@ void ComplexToolbarController::addNotifyInfo( sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - const Font& rFont = rSettings.GetAppFont(); + const vcl::Font& rFont = rSettings.GetAppFont(); // Calculate height of the application font used by window sal_Int32 nHeight = sal_Int32( rFont.GetHeight() ); |