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/uibase/shells/drwtxtsh.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/uibase/shells/drwtxtsh.cxx')
| -rw-r--r-- | sw/source/uibase/shells/drwtxtsh.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index e7de13dc4e65..391d0f175f6d 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -751,7 +751,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) const SvxFontItem* pFontItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false); if ( pFontItem ) { - aFont.SetFamilyName( pFontItem->GetFamilyName() ); + aFont.SetName( pFontItem->GetFamilyName() ); aFont.SetStyleName( pFontItem->GetStyleName() ); aFont.SetCharSet( pFontItem->GetCharSet() ); aFont.SetPitch( pFontItem->GetPitch() ); @@ -760,7 +760,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) if ( pCItem ) { sSym = pCItem->GetValue(); - aOpt.SetSymbolFont(aFont.GetFamilyName()); + aOpt.SetSymbolFont(aFont.GetName()); SW_MOD()->ApplyUsrPref(aOpt, &rView); } } @@ -786,7 +786,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) // assign attributes (Set font) SfxItemSet aFontAttribSet( *aFontSet.GetPool(), aFontSet.GetRanges() ); - SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetFamilyName(), + SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ); @@ -813,8 +813,8 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) pOLV->ShowCursor(); rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) ); - if(!aFont.GetFamilyName().isEmpty()) - rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetFamilyName() ) ); + if(!aFont.GetName().isEmpty()) + rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetName() ) ); rReq.Done(); } } |