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 /sw/source/filter/ww8/ww8par3.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 'sw/source/filter/ww8/ww8par3.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 59e4c3debaca..0f457f9821f7 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1096,11 +1096,11 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, else { const SvxFontItem& rFontItem = pFormat->GetFont(); - aFont.SetFamily( rFontItem.GetFamily() ); - aFont.SetFamilyName( rFontItem.GetFamilyName() ); - aFont.SetStyleName( rFontItem.GetStyleName() ); - aFont.SetPitch( rFontItem.GetPitch() ); - aFont.SetCharSet( rFontItem.GetCharSet() ); + aFont.SetFamily( rFontItem.GetFamily() ); + aFont.SetName( rFontItem.GetFamilyName() ); + aFont.SetStyleName( rFontItem.GetStyleName() ); + aFont.SetPitch( rFontItem.GetPitch() ); + aFont.SetCharSet( rFontItem.GetCharSet() ); } aNumFormat.SetBulletFont( &aFont ); } @@ -2350,7 +2350,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, } aTmp <<= OUString( pFontItem->GetFamilyName()); - aFont.SetFamilyName( pFontItem->GetFamilyName() ); + aFont.SetName( pFontItem->GetFamilyName() ); aFont.SetStyleName( pFontItem->GetStyleName() ); aFont.SetFamily( pFontItem->GetFamily() ); aFont.SetCharSet( pFontItem->GetCharSet() ); |