summaryrefslogtreecommitdiff
path: root/desktop/inc/app.hxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-05-03 23:23:06 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2014-05-04 06:32:53 +0000
commitf76026a43acc65465882924796d93e635c35fd90 (patch)
tree607708153a16190d6370c5932cce1c116976f18e /desktop/inc/app.hxx
parente4d61b3c556189bf0733ab6e7bedaf975427a35a (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/inc/app.hxx')
-rw-r--r--desktop/inc/app.hxx1
1 files changed, 1 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();