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 /dbaccess/source/ui/tabledesign | |
| 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 'dbaccess/source/ui/tabledesign')
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableDesignView.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 0cb8cdcdfb8a..9db53a80e726 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -57,7 +57,7 @@ void OTableRowView::Init() { EditBrowseBox::Init(); - Font aFont( GetDataWindow().GetFont() ); + vcl::Font aFont( GetDataWindow().GetFont() ); aFont.SetWeight( WEIGHT_NORMAL ); GetDataWindow().SetFont( aFont ); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 239848c2fe6f..46d20a980e4e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -122,7 +122,7 @@ void OTableBorderWindow::ImplInitSettings( bool bFont, bool bForeground, bool bB if ( bFont ) { - Font aFont = rStyleSettings.GetAppFont(); + vcl::Font aFont = rStyleSettings.GetAppFont(); if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetPointFont( aFont ); |