diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-13 10:53:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-14 12:00:40 +0200 |
| commit | 19a32ddfd2b9c1beb17641e99f139ac0d3dcaf96 (patch) | |
| tree | e2895b10ec66bae2ec47da748cf2848dea0bffa9 /sw/source/core/txtnode | |
| parent | 3c0805e1f4f4d14e92c7e655d59c87de5c207e48 (diff) | |
convert KERNING_ constants to scoped enum
Change-Id: I58031485aaa9ebdeb986a3ee0376f36a9f667947
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/fntcache.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index a344a7e956da..0bf13ebfaeab 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -1574,7 +1574,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) // In case of Pair Kerning the printer influence on the positioning // grows - const int nMul = pPrtFont->GetKerning() ? 1 : 3; + const int nMul = pPrtFont->GetKerning() != FontKerning::NONE ? 1 : 3; const int nDiv = nMul+1; // nSpaceSum contains the sum of the intermediate space distributed @@ -1927,7 +1927,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf ) // In case of Pair Kerning the printer influence on the positioning // grows - const int nMul = pPrtFont->GetKerning() ? 1 : 3; + const int nMul = pPrtFont->GetKerning() != FontKerning::NONE ? 1 : 3; const int nDiv = nMul+1; for( sal_Int32 i = 1; i<nCnt; i++ ) { diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 4849954ba3c8..c79495621574 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -626,11 +626,11 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, { SetAutoKern( ( !pIDocumentSettingAccess || !pIDocumentSettingAccess->get(DocumentSettingId::KERN_ASIAN_PUNCTUATION) ) ? - KERNING_FONTSPECIFIC : - KERNING_ASIAN ); + FontKerning::FontSpecific : + FontKerning::Asian ); } else - SetAutoKern( 0 ); + SetAutoKern( FontKerning::NONE ); } if( SfxItemState::SET == pAttrSet->GetItemState( RES_CHRATR_WORDLINEMODE, true, &pItem )) @@ -826,11 +826,11 @@ SwFont::SwFont( const SwAttrSet* pAttrSet, { SetAutoKern( ( !pIDocumentSettingAccess || !pIDocumentSettingAccess->get(DocumentSettingId::KERN_ASIAN_PUNCTUATION) ) ? - KERNING_FONTSPECIFIC : - KERNING_ASIAN ); + FontKerning::FontSpecific : + FontKerning::Asian ); } else - SetAutoKern( 0 ); + SetAutoKern( FontKerning::NONE ); SetWordLineMode( pAttrSet->GetWordLineMode().GetValue() ); const SvxEscapementItem &rEsc = pAttrSet->GetEscapement(); SetEscapement( rEsc.GetEsc() ); |