mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:staticcall

Browse Source 
Change-Id: I98f62391ee27c806f89cd8b85a04d67d1bcc78b7
This commit is contained in:
Stephan Bergmann
2014-06-13 17:49:37 +02:00
parent 529e7619c5
commit 1db81a3e4b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/app/app.cxx
View File

@@ -1601,7 +1601,7 @@ int Desktop::Main()
SvtFontSubstConfig().Apply(); SvtFontSubstConfig().Apply();
SvtTabAppearanceCfg aAppearanceCfg; SvtTabAppearanceCfg aAppearanceCfg;
aAppearanceCfg.SetInitialized(); SvtTabAppearanceCfg::SetInitialized();
aAppearanceCfg.SetApplicationDefaults( this ); aAppearanceCfg.SetApplicationDefaults( this );
SvtAccessibilityOptions aOptions; SvtAccessibilityOptions aOptions;
aOptions.SetVCLSettings(); aOptions.SetVCLSettings();

4
desktop/source/app/sofficemain.cxx
View File

@@ -57,11 +57,11 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
desktop::Desktop aDesktop; desktop::Desktop aDesktop;
// This string is used during initialization of the Gtk+ VCL module // This string is used during initialization of the Gtk+ VCL module
aDesktop.SetAppName( OUString("soffice") ); Application::SetAppName( OUString("soffice") );
#ifdef UNX #ifdef UNX
// handle --version and --help already here, otherwise they would be handled // handle --version and --help already here, otherwise they would be handled
// after VCL initialization that might fail if $DISPLAY is not set // 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() ); OUString aUnknown( rCmdLineArgs.GetUnknown() );
if ( !aUnknown.isEmpty() ) if ( !aUnknown.isEmpty() )
{ {

6
desktop/source/deployment/gui/dp_gui_service.cxx
View File

@@ -237,10 +237,10 @@ void ServiceImpl::startExecuteModal(
if (! InitVCL() ) if (! InitVCL() )
throw RuntimeException( "Cannot initialize VCL!", throw RuntimeException( "Cannot initialize VCL!",
static_cast<OWeakObject *>(this) ); static_cast<OWeakObject *>(this) );
AllSettings as = app->GetSettings(); AllSettings as = Application::GetSettings();
as.SetUILanguageTag( LanguageTag( utl::ConfigManager::getLocale() ).makeFallback() ); as.SetUILanguageTag( LanguageTag( utl::ConfigManager::getLocale() ).makeFallback() );
app->SetSettings( as ); Application::SetSettings( as );
app->SetDisplayName( Application::SetDisplayName(
utl::ConfigManager::getProductName() + utl::ConfigManager::getProductName() +
OUString(" ") + OUString(" ") +
utl::ConfigManager::getProductVersion()); utl::ConfigManager::getProductVersion());