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 /sw/source/ui/misc/insfnote.cxx | |
| 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 'sw/source/ui/misc/insfnote.cxx')
| -rw-r--r-- | sw/source/ui/misc/insfnote.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index c96807725bff..9e9dd470d5b2 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -133,7 +133,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) { m_aFontName = pFontItem->GetFamilyName(); eCharSet = pFontItem->GetCharSet(); - Font aFont( m_aFontName, pFontItem->GetStyleName(), m_pNumberCharEdit->GetFont().GetSize() ); + vcl::Font aFont( m_aFontName, pFontItem->GetStyleName(), m_pNumberCharEdit->GetFont().GetSize() ); aFont.SetCharSet( pFontItem->GetCharSet() ); aFont.SetPitch( pFontItem->GetPitch() ); m_pNumberCharEdit->SetFont( aFont ); @@ -214,7 +214,7 @@ void SwInsFootNoteDlg::Init() { SwFmtFtn aFtnNote; OUString sNumStr; - Font aFont; + vcl::Font aFont; bExtCharAvailable = false; rSh.StartAction(); |