diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-01-16 12:20:45 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-01-16 12:20:45 -0600 |
| commit | 45654a1d4d96732912e6e4dc254c9612d3f241c0 (patch) | |
| tree | 19f4ba915a56e53447980ce89fd46710167d7d23 /svx/source/dialog/fntctrl.cxx | |
| parent | 5d4f1f6f630d4382679087a4fb0da364c9c9692b (diff) | |
revert vcl patch series that brok Mac and Windows
revert:
9bc2f3de8672e812f3a67541c6d7069b434a7e42
vcl: add comment about ImplFontMetric::{Get|Set}LineHeight()
26371f105bc44e04469ec03fc5bb12505e651c6b
vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic()
2dd0b4317372b8022efe3911b38b4fa02956d8b9
vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor virtual
5ab13bf3ead3539e4ad847656da81e7eb6029652
vcl: tabify font.hxx
f99550dae55e40e49bf9c9875053fe2abb4c71ca
vcl: change Font::SetName() to Font::SetFamilyName()
2b297116cb6bb1061c43e5714e2609c8ee9f57d2
vcl: rename Font::GetName to Font::GetFamilyName
Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62
Diffstat (limited to 'svx/source/dialog/fntctrl.cxx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 682035c8f6f4..1aa7a6ddca15 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -673,7 +673,7 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl if ((pImpl->m_bCJKEnabled) || (pImpl->m_bCTLEnabled)) pImpl->maText = makeRepresentativeTextForFont(LATIN, rFont); else - pImpl->maText = rFont.GetFamilyName(); + pImpl->maText = rFont.GetName(); if (pImpl->m_bCJKEnabled) { @@ -878,7 +878,7 @@ static void SetPrevFont(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont { const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(rSet.Get(nWhich)); rFont.SetFamily(rFontItem.GetFamily()); - rFont.SetFamilyName(rFontItem.GetFamilyName()); + rFont.SetName(rFontItem.GetFamilyName()); rFont.SetPitch(rFontItem.GetPitch()); rFont.SetCharSet(rFontItem.GetCharSet()); rFont.SetStyleName(rFontItem.GetStyleName()); @@ -1415,7 +1415,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo { const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>( rSet.Get(nWhich) ); rFont.SetFamily( rFontItem.GetFamily() ); - rFont.SetFamilyName( rFontItem.GetFamilyName() ); + rFont.SetName( rFontItem.GetFamilyName() ); rFont.SetPitch( rFontItem.GetPitch() ); rFont.SetCharSet( rFontItem.GetCharSet() ); rFont.SetStyleName( rFontItem.GetStyleName() ); |