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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 19c5ed385295..ed02bc99147b 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -531,7 +531,7 @@ void SdExportTest::testSwappedOutImageExport() }; // Set cache size to a very small value to make sure one of the images is swapped out - boost::shared_ptr< comphelper::ConfigurationChanges > xBatch(comphelper::ConfigurationChanges::create()); + std::shared_ptr< comphelper::ConfigurationChanges > xBatch(comphelper::ConfigurationChanges::create()); officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1), xBatch); xBatch->commit(); @@ -657,7 +657,7 @@ void SdExportTest::testImageWithSpecialID() }; // Trigger swap out mechanism to test swapped state factor too. - boost::shared_ptr< comphelper::ConfigurationChanges > batch(comphelper::ConfigurationChanges::create()); + std::shared_ptr< comphelper::ConfigurationChanges > batch(comphelper::ConfigurationChanges::create()); officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1), batch); batch->commit(); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 4f3a0a874fb4..e4d5e9285286 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -468,7 +468,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl) sUrl = aDlg.GetDisplayDirectory(); // Write out configuration { - boost::shared_ptr< comphelper::ConfigurationChanges > batch( + std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); officecfg::Office::Impress::Pictures::Path::set(sUrl, batch); batch->commit(); diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index d110832bee88..75d5e2eee3d7 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -288,7 +288,7 @@ bool RemoteServer::connectClient( ::boost::shared_ptr< ClientInfo > pClient, con if ( apClient->mPin.equals( aPin ) ) { // Save in settings first - boost::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create(); + std::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create(); Reference< XNameContainer > const xConfig = officecfg::Office::Impress::Misc::AuthorisedRemotes::get( aChanges ); Reference<XSingleServiceFactory> xChildFactory ( @@ -353,7 +353,7 @@ void RemoteServer::deauthoriseClient( ::boost::shared_ptr< ClientInfo > pClient return; } - boost::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create(); + std::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create(); Reference< XNameContainer > const xConfig = officecfg::Office::Impress::Misc::AuthorisedRemotes::get( aChanges ); |