diff options
Diffstat (limited to 'vcl/source/font/font.cxx')
| -rw-r--r-- | vcl/source/font/font.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index c47fb0bbac4d..d84d2d28e6a2 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -368,7 +368,6 @@ void Font::Merge( const vcl::Font& rFont ) SetCharSet( rFont.GetCharSet() ); SetLanguageTag( rFont.GetLanguageTag() ); SetCJKContextLanguageTag( rFont.GetCJKContextLanguageTag() ); - // don't use access methods here, might lead to AskConfig(), if DONTKNOW SetFamily( rFont.GetFamilyType() ); SetPitch( rFont.GetPitch() ); } @@ -926,11 +925,11 @@ Degree10 Font::GetOrientation() const { return mpImplFont->mnOrientation; } bool Font::IsVertical() const { return mpImplFont->mbVertical; } FontKerning Font::GetKerning() const { return mpImplFont->meKerning; } -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->GetFamilyType(); } +FontPitch Font::GetPitchMaybeAskConfig() { return mpImplFont->GetPitch(); } +FontWeight Font::GetWeightMaybeAskConfig() { return mpImplFont->GetWeight(); } +FontWidth Font::GetWidthTypeMaybeAskConfig() { return mpImplFont->GetWidthType(); } +FontItalic Font::GetItalicMaybeAskConfig() { return mpImplFont->GetItalic(); } +FontFamily Font::GetFamilyTypeMaybeAskConfig() { return mpImplFont->GetFamilyType(); } FontPitch Font::GetPitch() const { return mpImplFont->GetPitchNoAsk(); } FontWeight Font::GetWeight() const { return mpImplFont->GetWeightNoAsk(); } |