diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-05-06 23:49:29 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-05-07 09:29:00 +1000 |
| commit | 081a0854635f4bc9f6f743ef4e2675c208405f74 (patch) | |
| tree | daea106c0ccac23c7a1b856dc754948438b71db2 /include/vcl/svapp.hxx | |
| parent | ef31acfde05d5fe0706b0e2d24fc19d07cdbcd31 (diff) | |
Move ImplInitAppFontData from Window to Application (take 2)
I have renamed ImplInitAppFontData to InitAppFontData and moved it from
Window to Application. This is because this is something that sets
*application* global variables, it just so happens it gets it from a
Window parameter. But it should be set when the application starts, so I
have moved it to Main().
This was previously reverted, but I have since located what was causing
unit tests to fail and the font dropdowns to stop loading in writer:
see commit c6d7ba5f33c3 where Application::SetSettings() was setting
pImplSVData->maGDIData.mnAppFontX to zero.
Change-Id: I5da7073b0d8541f1a71a09b0a8337d012fc4134b
Diffstat (limited to 'include/vcl/svapp.hxx')
| -rw-r--r-- | include/vcl/svapp.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index a0d71e6ce0ce..b7e00ca17c2e 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -267,6 +267,12 @@ public: */ virtual void Init(); +protected: + /** Initialize font data for the application. + */ + static void InitAppFontData(); + +public: /** Finish initialization of the application. @see Init, DeInit |