mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:useuniqueptr in helpdatafileproxy::Hdf

Browse Source 
Change-Id: I4324a290b826d76f89319f556aededb30d921f8d
Reviewed-on: https://gerrit.libreoffice.org/54166
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-05-08 09:44:04 +02:00
parent 56195a4d0b
commit 6a017237e0
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
xmlhelp/source/cxxhelp/provider/db.cxx
View File

@@ -68,13 +68,13 @@ void Hdf::createHashMap( bool bOptimizeForPerformance )
{ {
if( m_pStringToDataMap != nullptr ) if( m_pStringToDataMap != nullptr )
return; return;
m_pStringToDataMap = new StringToDataMap; m_pStringToDataMap.reset(new StringToDataMap);
} }
else else
{ {
if( m_pStringToValPosMap != nullptr ) if( m_pStringToValPosMap != nullptr )
return; return;
m_pStringToValPosMap = new StringToValPosMap; m_pStringToValPosMap.reset(new StringToValPosMap);
} }
Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileURL ); Reference< XInputStream > xIn = m_xSFA->openFileRead( m_aFileURL );
@@ -123,19 +123,15 @@ void Hdf::createHashMap( bool bOptimizeForPerformance )
void Hdf::releaseHashMap() void Hdf::releaseHashMap()
{ {
if( m_pStringToDataMap != nullptr ) m_pStringToDataMap.reset();
{ m_pStringToValPosMap.reset();
delete m_pStringToDataMap;
m_pStringToDataMap = nullptr;
}
if( m_pStringToValPosMap != nullptr )
{
delete m_pStringToValPosMap;
m_pStringToValPosMap = nullptr;
}
} }
Hdf::~Hdf()
{
}
bool Hdf::getValueForKey( const OString& rKey, HDFData& rValue ) bool Hdf::getValueForKey( const OString& rKey, HDFData& rValue )
{ {
bool bSuccess = false; bool bSuccess = false;

7
xmlhelp/source/cxxhelp/provider/db.hxx
View File

@@ -52,8 +52,8 @@ namespace helpdatafileproxy {
class Hdf class Hdf
{ {
OUString m_aFileURL; OUString m_aFileURL;
StringToDataMap* m_pStringToDataMap; std::unique_ptr<StringToDataMap> m_pStringToDataMap;
StringToValPosMap* m_pStringToValPosMap; std::unique_ptr<StringToValPosMap> m_pStringToValPosMap;
css::uno::Reference< css::ucb::XSimpleFileAccess3 > css::uno::Reference< css::ucb::XSimpleFileAccess3 >
m_xSFA; m_xSFA;
@@ -81,8 +81,7 @@ namespace helpdatafileproxy {
{ {
OSL_ASSERT(comphelper::isFileUrl(rFileURL)); OSL_ASSERT(comphelper::isFileUrl(rFileURL));
} }
~Hdf() ~Hdf();
{ releaseHashMap(); }
void createHashMap( bool bOptimizeForPerformance ); void createHashMap( bool bOptimizeForPerformance );
void releaseHashMap(); void releaseHashMap();