diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:49:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:54:25 +0200 |
| commit | 1db81a3e4b53a06dd499d311dc02c65a69b4d7a0 (patch) | |
| tree | b9eab7bb60d4166827dde9e219eb5172fb791b92 | |
| parent | 529e7619c5258aec91c33dd57b9fa12c3e85cfeb (diff) | |
loplugin:staticcall
Change-Id: I98f62391ee27c806f89cd8b85a04d67d1bcc78b7
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index dccdecc8fae1..fb11a189f32a 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1601,7 +1601,7 @@ int Desktop::Main() SvtFontSubstConfig().Apply(); SvtTabAppearanceCfg aAppearanceCfg; - aAppearanceCfg.SetInitialized(); + SvtTabAppearanceCfg::SetInitialized(); aAppearanceCfg.SetApplicationDefaults( this ); SvtAccessibilityOptions aOptions; aOptions.SetVCLSettings(); diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index f94de28f2ad6..a7072cba50f7 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -57,11 +57,11 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() desktop::Desktop aDesktop; // This string is used during initialization of the Gtk+ VCL module - aDesktop.SetAppName( OUString("soffice") ); + Application::SetAppName( OUString("soffice") ); #ifdef UNX // handle --version and --help already here, otherwise they would be handled // after VCL initialization that might fail if $DISPLAY is not set - const desktop::CommandLineArgs& rCmdLineArgs = aDesktop.GetCommandLineArgs(); + const desktop::CommandLineArgs& rCmdLineArgs = desktop::Desktop::GetCommandLineArgs(); OUString aUnknown( rCmdLineArgs.GetUnknown() ); if ( !aUnknown.isEmpty() ) { diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index b60a4bf781d5..d049f9093d23 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -237,10 +237,10 @@ void ServiceImpl::startExecuteModal( if (! InitVCL() ) throw RuntimeException( "Cannot initialize VCL!", static_cast<OWeakObject *>(this) ); - AllSettings as = app->GetSettings(); + AllSettings as = Application::GetSettings(); as.SetUILanguageTag( LanguageTag( utl::ConfigManager::getLocale() ).makeFallback() ); - app->SetSettings( as ); - app->SetDisplayName( + Application::SetSettings( as ); + Application::SetDisplayName( utl::ConfigManager::getProductName() + OUString(" ") + utl::ConfigManager::getProductVersion()); |