diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-07 10:49:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-07 11:04:35 +0200 |
| commit | 3b3b37669a6fcc3b6437677c9ae9bfd15cb65629 (patch) | |
| tree | 386473eb764f8e8fba3792bf8018f7c1eba5a6e6 /sfx2 | |
| parent | 6f4acc6f268c019805eb567b2d28bcc7e3c7ee48 (diff) | |
sfx2: use a smart pointer in IMPL_SfxBaseModel_DataContainer
Change-Id: Ia13c94e05d26d66ebee00ca89030b6947c5efc0c
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 6f8c81e9b1ba..d7776594321d 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -214,7 +214,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument Reference< rdf::XDocumentMetadataAccess> m_xDocumentMetadata ; ::rtl::Reference< ::sfx2::DocumentUndoManager > m_pDocumentUndoManager ; Sequence< document::CmisProperty> m_cmisProperties ; - SfxGrabBagItem* m_pGrabBagItem ; + boost::shared_ptr<SfxGrabBagItem> m_pGrabBagItem ; IMPL_SfxBaseModel_DataContainer( ::osl::Mutex& rMutex, SfxObjectShell* pObjectShell ) : m_pObjectShell ( pObjectShell ) @@ -233,7 +233,6 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument , m_xDocumentMetadata () // lazy , m_pDocumentUndoManager () , m_cmisProperties () - , m_pGrabBagItem ( NULL ) { // increase global instance counter. ++g_nInstanceCounter; @@ -243,7 +242,6 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument virtual ~IMPL_SfxBaseModel_DataContainer() { - delete m_pGrabBagItem; } // ::sfx2::IModifiableDocument @@ -3489,7 +3487,7 @@ sal_Bool SfxBaseModel::hasValidSignatures() const void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const { - if (m_pData->m_pGrabBagItem != NULL) + if (m_pData->m_pGrabBagItem.get()) m_pData->m_pGrabBagItem->QueryValue(rVal); else { uno::Sequence<beans::PropertyValue> aValue(0); @@ -3499,8 +3497,8 @@ void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const void SfxBaseModel::setGrabBagItem(const com::sun::star::uno::Any& rVal) { - if (m_pData->m_pGrabBagItem == NULL) - m_pData->m_pGrabBagItem = new SfxGrabBagItem; + if (!m_pData->m_pGrabBagItem.get()) + m_pData->m_pGrabBagItem.reset(new SfxGrabBagItem); m_pData->m_pGrabBagItem->PutValue(rVal); } |