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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/inc/app.hxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 67fc3fbd27a1..8b8affe06a04 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -128,6 +128,7 @@ class Desktop : public Application // throws an exception upon failure private: + void RegisterServices( css::uno::Reference< css::uno::XComponentContext > const & context); void DeregisterServices(); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 377afc7f85c2..247ac1df6ef8 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1493,6 +1493,7 @@ int Desktop::Main() the main thread is not yet in the event loop. */ Application::GetDefaultDevice(); + Application::InitAppFontData(); #if HAVE_FEATURE_EXTENSIONS // Check if bundled or shared extensions were added /removed |