diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-24 16:53:14 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-24 16:53:14 +0200 |
| commit | fc9171c1442b359d7e806767e90a18c5d6ca2e7e (patch) | |
| tree | 4794331a9c05fe2b05b2d1d201a3084e222f0280 /desktop/inc | |
| parent | efaabab96ab8f6b1b866f26e7c4478b846ac4a1d (diff) | |
| parent | ba640a3477213a4d2f179f188fe80029969ef1bb (diff) | |
Merge commit 'ooo/OOO330_m12'
Conflicts:
desktop/source/app/app.cxx
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 0690828081c5..1b9eeb370330 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -154,6 +154,7 @@ class Desktop : public Application sal_Bool InitializeInstallation( const rtl::OUString& rAppFilename ); sal_Bool InitializeConfiguration(); + void FlushConfiguration(); sal_Bool InitializeQuickstartMode( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr ); void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg ); |