diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-05-03 23:23:06 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-05-04 06:32:53 +0000 |
| commit | f76026a43acc65465882924796d93e635c35fd90 (patch) | |
| tree | 607708153a16190d6370c5932cce1c116976f18e /desktop | |
| parent | e4d61b3c556189bf0733ab6e7bedaf975427a35a (diff) | |
Move ImplInitAppFontData from Window to Application
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().
Change-Id: I9d98aa5b533166f91352218af267930034648c7a
Reviewed-on: https://gerrit.libreoffice.org/9242
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
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..5f4b3bbad302 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(); + InitAppFontData(); #if HAVE_FEATURE_EXTENSIONS // Check if bundled or shared extensions were added /removed |