Kaydet (Commit) 12761ab7 authored tarafından Ian's avatar Ian Kaydeden (comit) David Tardon

migrated some raw pointers to unique_ptr's

Change-Id: Ibbe088e73bdf987bf3784b61aa8b38a86d6654e3
Reviewed-on: https://gerrit.libreoffice.org/17679Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst e5ba9090
...@@ -143,26 +143,19 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory( ...@@ -143,26 +143,19 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory(
// "normal" service implementation // "normal" service implementation
ScaDateAddIn::ScaDateAddIn() : ScaDateAddIn::ScaDateAddIn() :
pDefLocales( NULL ), pDefLocales( nullptr ),
pResMgr( NULL ), pResMgr( nullptr ),
pFuncDataList( NULL ) pFuncDataList( nullptr )
{ {
} }
ScaDateAddIn::~ScaDateAddIn()
{
delete pFuncDataList;
delete pResMgr;
delete[] pDefLocales;
}
static const sal_Char* pLang[] = { "de", "en" }; static const sal_Char* pLang[] = { "de", "en" };
static const sal_Char* pCoun[] = { "DE", "US" }; static const sal_Char* pCoun[] = { "DE", "US" };
static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang ); static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
void ScaDateAddIn::InitDefLocales() void ScaDateAddIn::InitDefLocales()
{ {
pDefLocales = new lang::Locale[ nNumOfLoc ]; pDefLocales.reset(new lang::Locale[ nNumOfLoc ]);
for( sal_uInt32 nIndex = 0; nIndex < nNumOfLoc; nIndex++ ) for( sal_uInt32 nIndex = 0; nIndex < nNumOfLoc; nIndex++ )
{ {
...@@ -192,24 +185,18 @@ ResMgr& ScaDateAddIn::GetResMgr() throw( uno::RuntimeException, std::exception ) ...@@ -192,24 +185,18 @@ ResMgr& ScaDateAddIn::GetResMgr() throw( uno::RuntimeException, std::exception )
void ScaDateAddIn::InitData() void ScaDateAddIn::InitData()
{ {
delete pResMgr; pResMgr.reset(ResMgr::CreateResMgr("date", LanguageTag(aFuncLoc)));
pResMgr = ResMgr::CreateResMgr("date", LanguageTag(aFuncLoc)); pFuncDataList.reset();
delete pFuncDataList;
if ( pResMgr ) if ( pResMgr )
{ {
pFuncDataList = new ScaFuncDataList; pFuncDataList.reset(new ScaFuncDataList);
InitScaFuncDataList( *pFuncDataList, *pResMgr ); InitScaFuncDataList( *pFuncDataList, *pResMgr );
} }
else
{
pFuncDataList = nullptr;
}
if( pDefLocales ) if( pDefLocales )
{ {
delete pDefLocales; pDefLocales.reset();
pDefLocales = NULL;
} }
} }
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <string.h> #include <string.h>
#include <vector> #include <vector>
#include <memory>
#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
...@@ -184,9 +185,9 @@ class ScaDateAddIn : public ::cppu::WeakImplHelper6< ...@@ -184,9 +185,9 @@ class ScaDateAddIn : public ::cppu::WeakImplHelper6<
{ {
private: private:
::com::sun::star::lang::Locale aFuncLoc; ::com::sun::star::lang::Locale aFuncLoc;
::com::sun::star::lang::Locale* pDefLocales; std::unique_ptr< ::com::sun::star::lang::Locale[] > pDefLocales;
ResMgr* pResMgr; std::unique_ptr< ResMgr > pResMgr;
ScaFuncDataList* pFuncDataList; std::unique_ptr< ScaFuncDataList > pFuncDataList;
void InitDefLocales(); void InitDefLocales();
...@@ -199,7 +200,7 @@ private: ...@@ -199,7 +200,7 @@ private:
public: public:
ScaDateAddIn(); ScaDateAddIn();
virtual ~ScaDateAddIn(); virtual ~ScaDateAddIn() =default;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment