diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-05 11:54:16 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-05 12:27:51 +0200 |
| commit | b4107411900f5bb4c215e2d9db09fc2b2b82939b (patch) | |
| tree | db49676210a90fbc4dd56213029394a6d128c0ea /desktop | |
| parent | 8f08def4aefc6b92366536fb1fb6620527474129 (diff) | |
Revert "Move ImplInitAppFontData from Window to Application"
This reverts commit f76026a43acc65465882924796d93e635c35fd90. This
brings back the paragraph style and font name combo boxes in Writer.
Change-Id: Idb28253797ef842d575fe10537f6e70faa34fe75
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/inc/app.hxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 8b8affe06a04..67fc3fbd27a1 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -128,7 +128,6 @@ 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 5f4b3bbad302..377afc7f85c2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1493,7 +1493,6 @@ 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 |