diff options
Diffstat (limited to 'framework/source')
4 files changed, 8 insertions, 11 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 756205886d34..711f39b301b7 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -3153,17 +3153,16 @@ namespace detail class InfoHelperBuilder { private: - ::cppu::OPropertyArrayHelper *m_pInfoHelper; + std::unique_ptr<::cppu::OPropertyArrayHelper> m_pInfoHelper; public: explicit InfoHelperBuilder(const LayoutManager &rManager) { uno::Sequence< beans::Property > aProperties; rManager.describeProperties(aProperties); - m_pInfoHelper = new ::cppu::OPropertyArrayHelper(aProperties, true); + m_pInfoHelper.reset( new ::cppu::OPropertyArrayHelper(aProperties, true) ); } ~InfoHelperBuilder() { - delete m_pInfoHelper; } InfoHelperBuilder(const InfoHelperBuilder&) = delete; InfoHelperBuilder& operator=(const InfoHelperBuilder&) = delete; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index d900733a5995..89583b33d7fa 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -403,7 +403,7 @@ bool ImageManagerImpl::implts_storeUserImages( ImageListItemDescriptor* pList = new ImageListItemDescriptor; aUserImageListInfo.pImageList->push_back( std::unique_ptr<ImageListItemDescriptor>(pList) ); - pList->pImageItemList = new ImageItemListDescriptor; + pList->pImageItemList.reset( new ImageItemListDescriptor ); for ( sal_uInt16 i=0; i < pImageList->GetImageCount(); i++ ) { ImageItemDescriptor* pItem = new ImageItemDescriptor; diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 75f47e42c53b..8345f0f31a92 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -59,14 +59,12 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( FontSizeMenuController DEFINE_INIT_SERVICE ( FontSizeMenuController, {} ) FontSizeMenuController::FontSizeMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : - svt::PopupMenuControllerBase( xContext ), - m_pHeightArray( nullptr ) + svt::PopupMenuControllerBase( xContext ) { } FontSizeMenuController::~FontSizeMenuController() { - delete []m_pHeightArray; } // private function @@ -155,7 +153,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r FontMetric aFontMetric = pFontList->Get( m_aFontDescriptor.Name, m_aFontDescriptor.StyleName ); // setup font size array - delete m_pHeightArray; + m_pHeightArray.reset(); const sal_IntPtr* pTempAry; const sal_IntPtr* pAry = pFontList->GetSizeAry( aFontMetric ); @@ -169,7 +167,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r // first insert font size names (for simplified/traditional chinese) float fPoint; FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() ); - m_pHeightArray = new long[nSizeCount+aFontSizeNames.Count()]; + m_pHeightArray.reset( new long[nSizeCount+aFontSizeNames.Count()] ); OUString aCommand; if ( !aFontSizeNames.IsEmpty() ) diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index f0b2a196e052..96ff940024ae 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -302,7 +302,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( } if ( !m_pImages->pImageItemList ) - m_pImages->pImageItemList = new ImageItemListDescriptor; + m_pImages->pImageItemList.reset( new ImageItemListDescriptor ); m_bImageStartFound = true; @@ -717,7 +717,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* m_xWriteDocumentHandler->startElement( ELEMENT_NS_IMAGES, xList ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList; + ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList.get(); if ( pImageItemList ) { for (std::unique_ptr<ImageItemDescriptor> & i : *pImageItemList) |