diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-06 16:07:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-08 23:25:26 +0200 |
| commit | 28f38798fcf319e3ff9ce23b4e3e0425dedcbc7e (patch) | |
| tree | a99593887748bb9e9eed0ef7a2b64a1520c43c16 /editeng | |
| parent | 4c0d933278c13b6197da40deaf4842fcf57c37ca (diff) | |
SvxFont: remove duplicate LanguageType member
... that already exists in Font baseclass.
Change-Id: Ia87e8b791e153bdd4ddc6c84eba6b4f37d127dca
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/svxfont.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 0c6648dbce77..f60d92c5cd30 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -39,7 +39,7 @@ SvxFont::SvxFont() nKern = nEsc = 0; nPropr = 100; eCaseMap = SVX_CASEMAP_NOT_MAPPED; - eLang = LANGUAGE_SYSTEM; + SetLanguage(LANGUAGE_SYSTEM); } SvxFont::SvxFont( const Font &rFont ) @@ -48,7 +48,7 @@ SvxFont::SvxFont( const Font &rFont ) nKern = nEsc = 0; nPropr = 100; eCaseMap = SVX_CASEMAP_NOT_MAPPED; - eLang = LANGUAGE_SYSTEM; + SetLanguage(LANGUAGE_SYSTEM); } SvxFont::SvxFont( const SvxFont &rFont ) @@ -58,10 +58,9 @@ SvxFont::SvxFont( const SvxFont &rFont ) nEsc = rFont.GetEscapement(); nPropr = rFont.GetPropr(); eCaseMap = rFont.GetCaseMap(); - eLang = rFont.GetLanguage(); + SetLanguage(rFont.GetLanguage()); } - void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect, const Size& rSize, const Color& rCol, sal_Bool bLeft ) { @@ -105,10 +104,10 @@ OUString SvxFont::CalcCaseMap(const OUString &rTxt) const return rTxt; OUString aTxt(rTxt); // I still have to get the language - const LanguageType eLng = LANGUAGE_DONTKNOW == eLang - ? LANGUAGE_SYSTEM : eLang; + const LanguageType eLang = LANGUAGE_DONTKNOW == GetLanguage() + ? LANGUAGE_SYSTEM : GetLanguage(); - LanguageTag aLanguageTag( eLng); + LanguageTag aLanguageTag(eLang); CharClass aCharClass( aLanguageTag ); switch( eCaseMap ) @@ -217,10 +216,10 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const // Test if string length differ between original and CaseMapped sal_Bool bCaseMapLengthDiffers(aTxt.Len() != rTxt.Len()); - const LanguageType eLng = LANGUAGE_DONTKNOW == eLang - ? LANGUAGE_SYSTEM : eLang; + const LanguageType eLang = LANGUAGE_DONTKNOW == GetLanguage() + ? LANGUAGE_SYSTEM : GetLanguage(); - LanguageTag aLanguageTag( eLng ); + LanguageTag aLanguageTag(eLang); CharClass aCharClass( aLanguageTag ); String aCharString; @@ -579,7 +578,6 @@ SvxFont& SvxFont::operator=( const Font& rFont ) SvxFont& SvxFont::operator=( const SvxFont& rFont ) { Font::operator=( rFont ); - eLang = rFont.eLang; eCaseMap = rFont.eCaseMap; nEsc = rFont.nEsc; nPropr = rFont.nPropr; |