diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-21 03:30:10 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-21 06:22:01 +0000 |
| commit | 5659b68be3acc08a1c70f1be05c99658f2b04e34 (patch) | |
| tree | 2ca15cb560de11bd0af456a88e6b3e83589c5abd /starmath | |
| parent | abf04f6b0ad0dd83b4d479723144593e2f83ede0 (diff) | |
vcl: rename Font::GetFamily to Font::GetFamilyType
Change-Id: Ie427a43bd126dcdd89c6f66582736e67130f2254
Reviewed-on: https://gerrit.libreoffice.org/21633
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/cfgitem.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/document.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/unomodel.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/utility.cxx | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 24f626d3fd48..ea936a792055 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -162,7 +162,7 @@ SmFontFormat::SmFontFormat( const vcl::Font &rFont ) { aName = rFont.GetFamilyName(); nCharSet = (sal_Int16) rFont.GetCharSet(); - nFamily = (sal_Int16) rFont.GetFamily(); + nFamily = (sal_Int16) rFont.GetFamilyType(); nPitch = (sal_Int16) rFont.GetPitch(); nWeight = (sal_Int16) rFont.GetWeight(); nItalic = (sal_Int16) rFont.GetItalic(); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 53f33fdf39b2..a6068a8f242e 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -336,7 +336,7 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool) vcl::Font aFont = OutputDevice::GetDefaultFont( rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne ); rEditEngineItemPool.SetPoolDefaultItem( - SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(), + SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), rFntDta.nFontInfoId ) ); } diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index d0c7d79a2775..b976d9f305ee 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -881,7 +881,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu vcl::Font rFont = (*aIter)->GetFace(); pDescriptor->sFontName = rFont.GetFamilyName(); pDescriptor->nCharSet = sal::static_int_cast< sal_Int16 >(rFont.GetCharSet()); - pDescriptor->nFamily = sal::static_int_cast< sal_Int16 >(rFont.GetFamily()); + pDescriptor->nFamily = sal::static_int_cast< sal_Int16 >(rFont.GetFamilyType()); pDescriptor->nPitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); pDescriptor->nWeight = sal::static_int_cast< sal_Int16 >(rFont.GetWeight()); pDescriptor->nItalic = sal::static_int_cast< sal_Int16 >(rFont.GetItalic()); diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index cfb4917881e3..3e79a86bcadc 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -74,10 +74,10 @@ vcl::Font SmFontPickList::Get(sal_uInt16 nPos) const bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) { return rFirstFont.GetFamilyName() == rSecondFont.GetFamilyName() && - rFirstFont.GetFamily() == rSecondFont.GetFamily() && - rFirstFont.GetCharSet() == rSecondFont.GetCharSet() && - rFirstFont.GetWeight() == rSecondFont.GetWeight() && - rFirstFont.GetItalic() == rSecondFont.GetItalic(); + rFirstFont.GetFamilyType() == rSecondFont.GetFamilyType() && + rFirstFont.GetCharSet() == rSecondFont.GetCharSet() && + rFirstFont.GetWeight() == rSecondFont.GetWeight() && + rFirstFont.GetItalic() == rSecondFont.GetItalic(); } OUString SmFontPickList::GetStringItem(const vcl::Font &rFont) |