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(
// "normal" service implementation
ScaDateAddIn::ScaDateAddIn() :
pDefLocales( NULL ),
pResMgr( NULL ),
pFuncDataList( NULL )
pDefLocales( nullptr ),
pResMgr( nullptr ),
pFuncDataList( nullptr )
{
}
ScaDateAddIn::~ScaDateAddIn()
{
delete pFuncDataList;
delete pResMgr;
delete[] pDefLocales;
}
static const sal_Char* pLang[] = { "de", "en" };
static const sal_Char* pCoun[] = { "DE", "US" };
static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
void ScaDateAddIn::InitDefLocales()
{
pDefLocales = new lang::Locale[ nNumOfLoc ];
pDefLocales.reset(new lang::Locale[ nNumOfLoc ]);
for( sal_uInt32 nIndex = 0; nIndex < nNumOfLoc; nIndex++ )
{
......@@ -192,24 +185,18 @@ ResMgr& ScaDateAddIn::GetResMgr() throw( uno::RuntimeException, std::exception )
void ScaDateAddIn::InitData()
{
delete pResMgr;
pResMgr = ResMgr::CreateResMgr("date", LanguageTag(aFuncLoc));
delete pFuncDataList;
pResMgr.reset(ResMgr::CreateResMgr("date", LanguageTag(aFuncLoc)));
pFuncDataList.reset();
if ( pResMgr )
{
pFuncDataList = new ScaFuncDataList;
pFuncDataList.reset(new ScaFuncDataList);
InitScaFuncDataList( *pFuncDataList, *pResMgr );
}
else
{
pFuncDataList = nullptr;
}
if( pDefLocales )
{
delete pDefLocales;
pDefLocales = NULL;
pDefLocales.reset();
}
}
......
......@@ -24,6 +24,7 @@
#include <string.h>
#include <vector>
#include <memory>
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......@@ -183,10 +184,10 @@ class ScaDateAddIn : public ::cppu::WeakImplHelper6<
::com::sun::star::lang::XServiceInfo >
{
private:
::com::sun::star::lang::Locale aFuncLoc;
::com::sun::star::lang::Locale* pDefLocales;
ResMgr* pResMgr;
ScaFuncDataList* pFuncDataList;
::com::sun::star::lang::Locale aFuncLoc;
std::unique_ptr< ::com::sun::star::lang::Locale[] > pDefLocales;
std::unique_ptr< ResMgr > pResMgr;
std::unique_ptr< ScaFuncDataList > pFuncDataList;
void InitDefLocales();
......@@ -199,7 +200,7 @@ private:
public:
ScaDateAddIn();
virtual ~ScaDateAddIn();
virtual ~ScaDateAddIn() =default;
static OUString getImplementationName_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