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 /editeng/source/items/numitem.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 'editeng/source/items/numitem.cxx')
| -rw-r--r-- | editeng/source/items/numitem.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 56cfeaccf901..24c2ef1e138e 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -219,7 +219,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream ) rStream.ReadUInt16( hasBulletFont ); if ( hasBulletFont ) { - pBulletFont = new Font( ); + pBulletFont = new vcl::Font( ); ReadFont( rStream, *pBulletFont ); } else pBulletFont = NULL; @@ -345,7 +345,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat ) } DELETEZ(pBulletFont); if(rFormat.pBulletFont) - pBulletFont = new Font(*rFormat.pBulletFont); + pBulletFont = new vcl::Font(*rFormat.pBulletFont); return *this; } @@ -443,10 +443,10 @@ sal_Int16 SvxNumberFormat::GetVertOrient() const return eVertOrient; } -void SvxNumberFormat::SetBulletFont(const Font* pFont) +void SvxNumberFormat::SetBulletFont(const vcl::Font* pFont) { delete pBulletFont; - pBulletFont = pFont ? new Font(*pFont): 0; + pBulletFont = pFont ? new vcl::Font(*pFont): 0; } void SvxNumberFormat::SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode ) |