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/core/unocore/unosett.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/core/unocore/unosett.cxx')
| -rw-r--r-- | sw/source/core/unocore/unosett.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index ca92aaab3d3c..0b63cef133b1 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1461,7 +1461,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( pData = new PropValData((void*)&nINT16, "BulletId", ::cppu::UnoType<sal_Int16>::get()); aPropertyValues.push_back(pData); - const Font* pFont = rFmt.GetBulletFont(); + const vcl::Font* pFont = rFmt.GetBulletFont(); //BulletChar aUString = OUString(rFmt.GetBulletChar()); @@ -1921,7 +1921,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( // do not accept "empty" font if ( !pDesc->Name.isEmpty() ) { - Font aFont; + vcl::Font aFont; SvxUnoFontDescriptor::ConvertToFont( *pDesc, aFont ); aFmt.SetBulletFont(&aFont); } @@ -1944,7 +1944,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( const FontList* pList = pFontListItem->GetFontList(); vcl::FontInfo aInfo = pList->Get( sBulletFontName, WEIGHT_NORMAL, ITALIC_NONE); - Font aFont(aInfo); + vcl::Font aFont(aInfo); aFmt.SetBulletFont(&aFont); } else |