summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-01-16 23:42:55 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-01-16 16:12:14 +0000
commitf99550dae55e40e49bf9c9875053fe2abb4c71ca (patch)
treea84bceecc809a336a81305a85edad78a4a8449c5 /starmath
parent2b297116cb6bb1061c43e5714e2609c8ee9f57d2 (diff)
vcl: change Font::SetName() to Font::SetFamilyName()
Change-Id: I54a4036544c680c4a49607677af776aa7a433fbc Reviewed-on: https://gerrit.libreoffice.org/21510 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.cxx4
-rw-r--r--starmath/source/dialog.cxx2
-rw-r--r--starmath/source/unomodel.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 1e1f9f9dc176..24f626d3fd48 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -172,7 +172,7 @@ SmFontFormat::SmFontFormat( const vcl::Font &rFont )
const vcl::Font SmFontFormat::GetFont() const
{
vcl::Font aRes;
- aRes.SetName( aName );
+ aRes.SetFamilyName( aName );
aRes.SetCharSet( (rtl_TextEncoding) nCharSet );
aRes.SetFamily( (FontFamily) nFamily );
aRes.SetPitch( (FontPitch) nPitch );
@@ -881,7 +881,7 @@ void SmMathConfig::LoadFormat()
if (bUseDefaultFont)
{
aFnt = pFormat->GetFont( i );
- aFnt.SetName( GetDefaultFontName( nLang, i ) );
+ aFnt.SetFamilyName( GetDefaultFontName( nLang, i ) );
}
else
{
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index bf0a99274355..b6e95594c612 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -302,7 +302,7 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
{
- maFont.SetName(rComboBox.GetText());
+ maFont.SetFamilyName(rComboBox.GetText());
m_pShowFont->SetFont(maFont);
}
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 37592db3a44f..d0c7d79a2775 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -661,7 +661,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
for (sal_uInt32 i = 0; i < nSize ; i++, pDescriptor++)
{
vcl::Font aFont;
- aFont.SetName ( pDescriptor->sFontName );
+ aFont.SetFamilyName ( pDescriptor->sFontName );
aFont.SetCharSet ( static_cast < rtl_TextEncoding > (pDescriptor->nCharSet) );
aFont.SetFamily ( static_cast < FontFamily > (pDescriptor->nFamily ) );
aFont.SetPitch ( static_cast < FontPitch > (pDescriptor->nPitch ) );