diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-21 14:41:01 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-21 06:22:28 +0000 |
| commit | 078194f6d0ede81042f38fb687f5cc3180a48ad0 (patch) | |
| tree | c2e4be2b74c9427adf3a8de08b9f60afe316ce9b /vcl | |
| parent | 5659b68be3acc08a1c70f1be05c99658f2b04e34 (diff) | |
vcl: remove Font::GetFamily and Font::GetFamilyNoAsk (obsolete functions)
Change-Id: I345fe86b5cfe1dde1aa4082a7943e8a9f228fe03
Reviewed-on: https://gerrit.libreoffice.org/21649
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/impfont.hxx | 6 | ||||
| -rw-r--r-- | vcl/source/font/font.cxx | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 4cd79dc9ae4c..cc87b2e0c14a 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -37,10 +37,8 @@ public: // device independent font functions const OUString& GetFamilyName() const { return maFamilyName; } - FontFamily GetFamily() { if(meFamily==FAMILY_DONTKNOW) AskConfig(); return meFamily; } - FontFamily GetFamilyNoAsk() const { return meFamily; } - FontFamily GetFamilyType() { return GetFamily(); } - FontFamily GetFamilyTypeNoAsk() const { return GetFamilyNoAsk(); } + FontFamily GetFamilyType() { if(meFamily==FAMILY_DONTKNOW) AskConfig(); return meFamily; } + FontFamily GetFamilyTypeNoAsk() const { return meFamily; } const OUString& GetStyleName() const { return maStyleName; } FontWeight GetWeight() { if(meWeight==WEIGHT_DONTKNOW) AskConfig(); return meWeight; } diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index ad38744ac358..aa85d052cb25 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -417,7 +417,7 @@ void Font::Merge( const vcl::Font& rFont ) SetLanguageTag( rFont.GetLanguageTag() ); SetCJKContextLanguageTag( rFont.GetCJKContextLanguageTag() ); // don't use access methods here, might lead to AskConfig(), if DONTKNOW - SetFamily( rFont.mpImplFont->GetFamilyNoAsk() ); + SetFamily( rFont.mpImplFont->GetFamilyTypeNoAsk() ); SetPitch( rFont.mpImplFont->GetPitchNoAsk() ); } @@ -461,7 +461,7 @@ void Font::GetFontAttributes( FontAttributes& rAttrs ) const { rAttrs.SetFamilyName( mpImplFont->GetFamilyName() ); rAttrs.SetStyleName( mpImplFont->maStyleName ); - rAttrs.SetFamilyType( mpImplFont->GetFamilyNoAsk() ); + rAttrs.SetFamilyType( mpImplFont->GetFamilyTypeNoAsk() ); rAttrs.SetPitch( mpImplFont->GetPitchNoAsk() ); rAttrs.SetItalic( mpImplFont->GetItalicNoAsk() ); rAttrs.SetWeight( mpImplFont->GetWeightNoAsk() ); @@ -522,7 +522,7 @@ SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont ) WritePair( rOStm, rImplFont.maSize ); rOStm.WriteUInt16( GetStoreCharSet( rImplFont.GetCharSet() ) ); - rOStm.WriteUInt16( rImplFont.GetFamilyNoAsk() ); + rOStm.WriteUInt16( rImplFont.GetFamilyTypeNoAsk() ); rOStm.WriteUInt16( rImplFont.GetPitchNoAsk() ); rOStm.WriteUInt16( rImplFont.GetWeightNoAsk() ); rOStm.WriteUInt16( rImplFont.meUnderline ); @@ -800,13 +800,13 @@ FontPitch Font::GetPitch() { return mpImplFont->GetPitch(); } FontWeight Font::GetWeight() { return mpImplFont->GetWeight(); } FontWidth Font::GetWidthType() { return mpImplFont->GetWidthType(); } FontItalic Font::GetItalic() { return mpImplFont->GetItalic(); } -FontFamily Font::GetFamilyType() { return mpImplFont->GetFamily(); } +FontFamily Font::GetFamilyType() { return mpImplFont->GetFamilyType(); } FontPitch Font::GetPitch() const { return mpImplFont->GetPitchNoAsk(); } FontWeight Font::GetWeight() const { return mpImplFont->GetWeightNoAsk(); } FontWidth Font::GetWidthType() const { return mpImplFont->GetWidthTypeNoAsk(); } FontItalic Font::GetItalic() const { return mpImplFont->GetItalicNoAsk(); } -FontFamily Font::GetFamilyType() const { return mpImplFont->GetFamilyNoAsk(); } +FontFamily Font::GetFamilyType() const { return mpImplFont->GetFamilyTypeNoAsk(); } int Font::GetQuality() const { return mpImplFont->GetQuality(); } void Font::SetQuality( int nQuality ) { mpImplFont->SetQuality( nQuality ); } |