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/rtf/svxrtf.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/rtf/svxrtf.cxx')
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 625028e0c721..eced58896490 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -90,7 +90,7 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn, aPardMap.insert( aPardMap.begin(), (sal_uInt16*)&aTmp, (sal_uInt16*)&aTmp + (sizeof( RTFPardAttrMapIds ) / sizeof(sal_uInt16)) ); } - pDfltFont = new Font; + pDfltFont = new vcl::Font; pDfltColor = new Color; } @@ -465,7 +465,7 @@ void SvxRTFParser::ReadFontTable() { int nToken; int _nOpenBrakets = 1; // the first was already detected earlier!! - Font* pFont = new Font(); + vcl::Font* pFont = new vcl::Font(); short nFontNo(0), nInsFontNo (0); OUString sAltNm, sFntNm; bool bIsAltFntNm = false, bCheckNewFont; @@ -582,7 +582,7 @@ void SvxRTFParser::ReadFontTable() pFont->SetName( sFntNm ); aFontTbl.insert( nInsFontNo, pFont ); - pFont = new Font(); + pFont = new vcl::Font(); pFont->SetCharSet( nSystemChar ); sAltNm = ""; sFntNm = ""; @@ -814,10 +814,10 @@ OUString& SvxRTFParser::DelCharAtEnd( OUString& rStr, const sal_Unicode cDel ) } -const Font& SvxRTFParser::GetFont( sal_uInt16 nId ) +const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId ) { SvxRTFFontTbl::const_iterator it = aFontTbl.find( nId ); - const Font* pFont; + const vcl::Font* pFont; if( it == aFontTbl.end() ) { const SvxFontItem& rDfltFont = (const SvxFontItem&) |