vcl/source/font/font.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 834809dbbef60de6677b80e26753c55c4edf96c2
Author: Luke Deller <l...@deller.id.au>
Date: Wed Sep 14 23:53:33 2016 +1000
Avoid AskConfig when setting font family
Avoid calling the expensive ImplFont::AskConfig from Font::SetFamily
as we are just going to overwrite the font family anyway.
It looks like this crept in accidentally in the recent refactor
commit e418d1a9c87ce01b75141f92dc249c7fb1a1bdcb
Change-Id: I12a9bde77ffcc81f03c37ce400c59ea3a9acac31
Reviewed-on: https://gerrit.libreoffice.org/28901
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index c608faf..df0f891 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -124,7 +124,7 @@ void Font::SetFontSize( const Size& rSize )
void Font::SetFamily( FontFamily eFamily )
{
- if( mpImplFont->GetFamilyType() != eFamily )
+ if( mpImplFont->GetFamilyTypeNoAsk() != eFamily )
mpImplFont->SetFamilyType( eFamily );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
