diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 09:46:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 16:45:13 +0000 |
| commit | c7258cfccdf9f4c5235da1b135801f957a5b0ec1 (patch) | |
| tree | d5af5085ad1327afe2d41045ea452e017fea1fb6 /desktop | |
| parent | 027c383584bff4ea2aa7aa2b9e294e614087f28f (diff) | |
shared_ptr<T>(new T(args)) -> make_shared<T>(args)
and boost:make_shared->std::make_shared
Change-Id: Ic1e187c52c856a7b27817967b2caa8920f23a98d
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/app/langselect.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/app/userinstall.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 562b1f2692d0..59d984d2fdb9 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -291,7 +291,7 @@ bool shouldLaunchQuickstart() void SetRestartState() { try { - boost::shared_ptr< comphelper::ConfigurationChanges > batch( + std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); officecfg::Setup::Office::OfficeRestartInProgress::set(true, batch); batch->commit(); @@ -304,7 +304,7 @@ void DoRestartActionsIfNecessary(bool quickstart) { if (quickstart) { try { if (officecfg::Setup::Office::OfficeRestartInProgress::get()) { - boost::shared_ptr< comphelper::ConfigurationChanges > batch( + std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); officecfg::Setup::Office::OfficeRestartInProgress::set( false, batch); @@ -2848,7 +2848,7 @@ void Desktop::CheckFirstRun( ) } #endif - boost::shared_ptr< comphelper::ConfigurationChanges > batch( + std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); officecfg::Office::Common::Misc::FirstRun::set(false, batch); batch->commit(); diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index c853c60f07b1..a3f94791f091 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -141,7 +141,7 @@ bool prepareLocale() { if (locale.isEmpty()) { // Selected language is not/no longer installed: try { - boost::shared_ptr<comphelper::ConfigurationChanges> batch( + std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create()); officecfg::Office::Linguistic::General::UILocale::set( "", batch); @@ -184,7 +184,7 @@ bool prepareLocale() { css::uno::UNO_QUERY_THROW)->setLocale(tag.getLocale(false)); if (!cmdLanguage) { try { - boost::shared_ptr<comphelper::ConfigurationChanges> batch( + std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create()); officecfg::Setup::L10N::ooLocale::set(locale, batch); batch->commit(); diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index ef0b0a1df0d3..3cb4d394fe14 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -130,7 +130,7 @@ Status create(OUString const & uri) { return ERROR_OTHER; } #endif - boost::shared_ptr<comphelper::ConfigurationChanges> batch( + std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create()); officecfg::Setup::Office::ooSetupInstCompleted::set(true, batch); batch->commit(); |