diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 09:09:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-23 11:19:17 +0000 |
| commit | 177ea7a2818ee64de3eaa9b587d70fe461468005 (patch) | |
| tree | 60d3838c3f7daff05fc94e4bf2d7c83b2c013041 /sd/source/ui/framework/configuration/ConfigurationController.cxx | |
| parent | memleak:clear self referring VclPtr in *Field and *Box classes (diff) | |
| download | core-177ea7a2818ee64de3eaa9b587d70fe461468005.tar.gz core-177ea7a2818ee64de3eaa9b587d70fe461468005.zip | |
boost::shared_ptr->std::shared_ptr
Change-Id: I2c6ac98f0984534894759cfbf4449eb554801cf8
Reviewed-on: https://gerrit.libreoffice.org/18678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/framework/configuration/ConfigurationController.cxx')
| -rw-r--r-- | sd/source/ui/framework/configuration/ConfigurationController.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 54f526ebab8b..7d62e76a6c24 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -58,7 +58,7 @@ public: /** The Broadcaster class implements storing and calling of listeners. */ - ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster; + std::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster; /** The requested configuration which is modified (asynchronously) by calls to requestResourceActivation() and @@ -70,18 +70,18 @@ public: ViewShellBase* mpBase; - ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer; + std::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer; - ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager; + std::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager; - ::boost::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater; + std::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater; /** The queue processor ownes the queue of configuration change request objects and processes the objects. */ ::boost::scoped_ptr<ChangeRequestQueueProcessor> mpQueueProcessor; - ::boost::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock; + std::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock; sal_Int32 mnLockCount; }; @@ -420,7 +420,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( // We will probably be making a couple of activation and deactivation // requests so lock the configuration controller and let it later update // all changes at once. - ::boost::shared_ptr<ConfigurationUpdaterLock> pLock ( + std::shared_ptr<ConfigurationUpdaterLock> pLock ( mpImplementation->mpConfigurationUpdater->GetLock()); // Get lists of resources that are to be activated or deactivated. |