diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-17 13:26:25 +1100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:56 -0400 |
commit | 49329d19eff5b5beffdeaa54242c9534f5b470c4 (patch) | |
tree | 85517ead7d4e926c17f9e52cda01475c3c93eaeb /starmath | |
parent | 745d356d6b5b6b9308f35e89713288f17dd32503 (diff) |
vcl: rename Font::GetName to Font::GetFamilyName
Reviewed-on: https://gerrit.libreoffice.org/21529
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e)
Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/source/cfgitem.cxx | 2 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 12 | ||||
-rw-r--r-- | starmath/source/document.cxx | 2 | ||||
-rw-r--r-- | starmath/source/format.cxx | 2 | ||||
-rw-r--r-- | starmath/source/rect.cxx | 2 | ||||
-rw-r--r-- | starmath/source/unomodel.cxx | 6 | ||||
-rw-r--r-- | starmath/source/utility.cxx | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index e987b664e0e8..d2d09997df2e 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -158,7 +158,7 @@ SmFontFormat::SmFontFormat() SmFontFormat::SmFontFormat( const vcl::Font &rFont ) { - aName = rFont.GetName(); + aName = rFont.GetFamilyName(); nCharSet = (sal_Int16) rFont.GetCharSet(); nFamily = (sal_Int16) rFont.GetFamily(); nPitch = (sal_Int16) rFont.GetPitch(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 04656de72863..227d91891e84 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -270,7 +270,7 @@ void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRec rRenderContext.SetFont(aFont); rRenderContext.SetTextColor(aTextColor); - OUString sText(rRenderContext.GetFont().GetName()); + OUString sText(rRenderContext.GetFont().GetFamilyName()); Size aTextSize(rRenderContext.GetTextWidth(sText), rRenderContext.GetTextHeight()); rRenderContext.DrawText(Point((rRenderContext.GetOutputSize().Width() - aTextSize.Width()) / 2, @@ -335,7 +335,7 @@ void SmFontDialog::SetFont(const vcl::Font &rFont) { maFont = rFont; - m_pFontBox->SetText(maFont.GetName()); + m_pFontBox->SetText(maFont.GetFamilyName()); m_pBoldCheckBox->Check(IsBold(maFont)); m_pItalicCheckBox->Check(IsItalic(maFont)); m_pShowFont->SetFont(maFont); @@ -359,7 +359,7 @@ SmFontDialog::SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, sal_uInt16 nCount = aFontList.GetFontNameCount(); for (sal_uInt16 i = 0; i < nCount; ++i) { - m_pFontBox->InsertEntry( aFontList.GetFontName(i).GetName() ); + m_pFontBox->InsertEntry( aFontList.GetFontName(i).GetFamilyName() ); } maFont.SetSize(Size(0, 24)); maFont.SetWeight(WEIGHT_NORMAL); @@ -1757,7 +1757,7 @@ void SmSymDefineDialog::FillFonts(bool bDelete) { sal_uInt16 nCount = pFontList->GetFontNameCount(); for (sal_uInt16 i = 0; i < nCount; i++) - pFonts->InsertEntry( pFontList->GetFontName(i).GetName() ); + pFonts->InsertEntry( pFontList->GetFontName(i).GetFamilyName() ); } } @@ -2017,7 +2017,7 @@ void SmSymDefineDialog::UpdateButtons() && aTmpSymbolSetName.equalsIgnoreAsciiCase(pOldSymbolSetName->GetText()) && aTmpSymbolName.equals(pOrigSymbol->GetName()) && pFonts->GetSelectEntry().equalsIgnoreAsciiCase( - pOrigSymbol->GetFace().GetName()) + pOrigSymbol->GetFace().GetFamilyName()) && pStyles->GetText().equalsIgnoreAsciiCase( GetFontStyles().GetStyleName(pOrigSymbol->GetFace())) && pCharsetDisplay->GetSelectCharacter() == pOrigSymbol->GetCharacter(); @@ -2280,7 +2280,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, { // choose font and style accordingly const vcl::Font &rFont = pSymbol->GetFace(); - SelectFont(rFont.GetName(), false); + SelectFont(rFont.GetFamilyName(), false); SelectStyle(GetFontStyles().GetStyleName(rFont), false); // Since setting the Font via the Style name of the SymbolFonts doesn't diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index a5c92ed42780..d55c0335bf5e 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.GetName(), + SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), rFntDta.nFontInfoId ) ); } diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 44dcd38aed22..17294ce15bca 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -88,7 +88,7 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) return OutputDevice::GetDefaultFont( pTable[ nIdent ], nLang, - GetDefaultFontFlags::OnlyOne ).GetName(); + GetDefaultFontFlags::OnlyOne ).GetFamilyName(); } } diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index 1e69966e151a..267a3ec889d3 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -129,7 +129,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, aSize = Size(rDev.GetTextWidth(rText), rDev.GetTextHeight()); const FontMetric aFM (rDev.GetFontMetric()); - bool bIsMath = aFM.GetName().equalsIgnoreAsciiCase( FONTNAME_MATH ); + bool bIsMath = aFM.GetFamilyName().equalsIgnoreAsciiCase( FONTNAME_MATH ); bool bAllowSmaller = bIsMath && !SmIsMathAlpha(rText); const long nFontHeight = rDev.GetFont().GetSize().Height(); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 41ffd321941a..47a09b9379db 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -452,7 +452,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* if(sFontName.isEmpty()) throw IllegalArgumentException(); - if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetName()) != sFontName) + if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetFamilyName()) != sFontName) { const SmFace rOld = aFormat.GetFont((*ppEntries)->mnMemberId); @@ -725,7 +725,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu case HANDLE_CUSTOM_FONT_NAME_FIXED : { const SmFace & rFace = aFormat.GetFont((*ppEntries)->mnMemberId); - *pValue <<= OUString(rFace.GetName()); + *pValue <<= OUString(rFace.GetFamilyName()); } break; case HANDLE_CUSTOM_FONT_FIXED_POSTURE: @@ -877,7 +877,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu pDescriptor->nCharacter = static_cast < sal_Int32 > ((*aIter)->GetCharacter()); vcl::Font rFont = (*aIter)->GetFace(); - pDescriptor->sFontName = rFont.GetName(); + 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->nPitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 6ac33fc2ce26..269abce3b17d 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -73,7 +73,7 @@ vcl::Font SmFontPickList::Get(sal_uInt16 nPos) const bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) { - return rFirstFont.GetName() == rSecondFont.GetName() && + return rFirstFont.GetFamilyName() == rSecondFont.GetFamilyName() && rFirstFont.GetFamily() == rSecondFont.GetFamily() && rFirstFont.GetCharSet() == rSecondFont.GetCharSet() && rFirstFont.GetWeight() == rSecondFont.GetWeight() && @@ -82,7 +82,7 @@ bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & OUString SmFontPickList::GetStringItem(const vcl::Font &rFont) { - OUStringBuffer aString(rFont.GetName()); + OUStringBuffer aString(rFont.GetFamilyName()); if (IsItalic( rFont )) { |