diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-16 23:42:55 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-16 16:12:14 +0000 |
| commit | f99550dae55e40e49bf9c9875053fe2abb4c71ca (patch) | |
| tree | a84bceecc809a336a81305a85edad78a4a8449c5 /sw/source/ui | |
| parent | 2b297116cb6bb1061c43e5714e2609c8ee9f57d2 (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 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 12 | ||||
| -rw-r--r-- | sw/source/ui/misc/insfnote.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 23779cc11090..3a2afb8b4e22 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -256,9 +256,9 @@ void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _ _rPage.rSh.GetCurAttr(aSet); SvxFontItem aFormatFont(static_cast<const SvxFontItem &>( aSet.Get(_nWhich))); - _rFont.SetFamily (aFormatFont.GetFamily()); - _rFont.SetName (aFormatFont.GetFamilyName()); - _rFont.SetPitch (aFormatFont.GetPitch()); + _rFont.SetFamily(aFormatFont.GetFamily()); + _rFont.SetFamilyName(aFormatFont.GetFamilyName()); + _rFont.SetPitch(aFormatFont.GetPitch()); _rFont.SetCharSet(aFormatFont.GetCharSet()); } @@ -304,9 +304,9 @@ void SwDropCapsPict::UpdatePaintSettings() OSL_ENSURE(pFormat, "character style doesn't exist!"); const SvxFontItem &rFormatFont = pFormat->GetFont(); - aFont.SetFamily (rFormatFont.GetFamily()); - aFont.SetName (rFormatFont.GetFamilyName()); - aFont.SetPitch (rFormatFont.GetPitch()); + aFont.SetFamily(rFormatFont.GetFamily()); + aFont.SetFamilyName(rFormatFont.GetFamilyName()); + aFont.SetPitch(rFormatFont.GetPitch()); aFont.SetCharSet(rFormatFont.GetCharSet()); } } diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 5565cb7aa6de..20c8d748ba87 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -239,7 +239,7 @@ void SwInsFootNoteDlg::Init() aFont = m_pNumberCharEdit->GetFont(); m_aFontName = rFont.GetFamilyName(); eCharSet = rFont.GetCharSet(); - aFont.SetName(m_aFontName); + aFont.SetFamilyName(m_aFontName); aFont.SetCharSet(eCharSet); bExtCharAvailable = true; rSh.Left( CRSR_SKIP_CHARS, false, 1, false ); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 89d26ccb7db4..6eae65389b70 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -566,7 +566,7 @@ static void lcl_SetFontProperties( const SvxPostureItem& rPostureItem ) { rFont.SetFamily ( rFontItem.GetFamily() ); - rFont.SetName ( rFontItem.GetFamilyName() ); + rFont.SetFamilyName ( rFontItem.GetFamilyName() ); rFont.SetStyleName ( rFontItem.GetStyleName() ); rFont.SetCharSet ( rFontItem.GetCharSet() ); rFont.SetPitch ( rFontItem.GetPitch() ); |