diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-11-11 12:29:26 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-11-16 18:50:28 +0100 |
| commit | fc6231f1d1dd2a4e6f678b8221971e09807d8de8 (patch) | |
| tree | c77ab0678c36432040b5a866cc74b6ab5d9b8f0b /vcl/headless | |
| parent | 84e1a01e2d1964a143f5b01fa0b70d9570dcb834 (diff) | |
vcl: StyleSettings - start to unwind code duplication.
This should be a pure re-factor, plus:
switch from Serif -> Sans font default for the UI (wow).
enable larger font size for LOK only
that avoids a hard to debug svx junit test failure.
Change-Id: Id438026064983ea4907819bab55c4be740954605
Reviewed-on: https://gerrit.libreoffice.org/44625
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpframe.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index b08c96f06cc7..12fbf88ba63b 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -18,6 +18,8 @@ */ #include <string.h> + +#include <comphelper/lok.hxx> #include <vcl/syswin.hxx> #include <headless/svpframe.hxx> @@ -411,6 +413,15 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings ) Color aBackgroundColor( 0xec, 0xec, 0xec ); aStyleSettings.BatchSetBackgrounds( aBackgroundColor, false ); + if (comphelper::LibreOfficeKit::isActive()) // TODO: remove this. + { + vcl::Font aStdFont( FAMILY_SWISS, Size( 0, 14 ) ); + aStdFont.SetCharSet( osl_getThreadTextEncoding() ); + aStdFont.SetWeight( WEIGHT_NORMAL ); + aStdFont.SetFamilyName( "Liberation Sans" ); + aStyleSettings.BatchSetFonts( aStdFont, aStdFont ); + } + rSettings.SetStyleSettings( aStyleSettings ); } |