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 /formula/source/ui/dlg/parawin.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 'formula/source/ui/dlg/parawin.cxx')
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 8017ed3baf0b..d499a6d6d57c 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -296,7 +296,7 @@ void ParaWin::DelParaArray() ::std::vector<OUString>().swap(aParaArray); } -void ParaWin::SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont) +void ParaWin::SetArgumentFonts(const vcl::Font&aBoldFont,const vcl::Font&aLightFont) { aFntBold=aBoldFont; aFntLight=aLightFont; @@ -366,7 +366,7 @@ void ParaWin::SetArgName(sal_uInt16 no,const OUString& aText) aArgInput[no].UpdateAccessibleNames(); } -void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont) +void ParaWin::SetArgNameFont(sal_uInt16 no,const vcl::Font& aFont) { aArgInput[no].SetArgNameFont(aFont); } |