Kaydet (Commit) 3c97782c authored tarafından Noel Grandin's avatar Noel Grandin

use unique_ptr in pGlobalOLEExcludeList

Change-Id: Ib52e594b469818a0567c9c6b5cd460375d997abc
Reviewed-on: https://gerrit.libreoffice.org/65994
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 54515a6a
......@@ -68,7 +68,7 @@ void TextFinit();
// about printer changes. Thereby saving loading a lot of objects (luckily all foreign
// objects are mapped to one ID).
// Initialisation and deinitialisation can be found in init.cxx
extern std::vector<SvGlobalName*> *pGlobalOLEExcludeList;
extern std::vector<SvGlobalName> *pGlobalOLEExcludeList;
#endif
......
......@@ -430,7 +430,7 @@ SfxItemInfo aSlotTab[] =
{ 0, true } // RES_UNKNOWNATR_CONTAINER
};
std::vector<SvGlobalName*> *pGlobalOLEExcludeList = nullptr;
std::vector<SvGlobalName> *pGlobalOLEExcludeList = nullptr;
SwAutoCompleteWord* SwDoc::mpACmpltWords = nullptr;
......@@ -648,7 +648,7 @@ void InitCore()
SwSelPaintRects::s_pMapMode = new MapMode;
SwFntObj::pPixMap = new MapMode;
pGlobalOLEExcludeList = new std::vector<SvGlobalName*>;
pGlobalOLEExcludeList = new std::vector<SvGlobalName>;
if (!utl::ConfigManager::IsFuzzing())
{
......@@ -733,8 +733,6 @@ void FinitCore()
delete pHt;
}
for (SvGlobalName* p : *pGlobalOLEExcludeList)
delete p;
delete pGlobalOLEExcludeList;
}
......
......@@ -752,11 +752,11 @@ void SwDoc::PrtOLENotify( bool bAll )
}
bool bFound = false;
for ( std::vector<SvGlobalName*>::size_type j = 0;
for ( std::vector<SvGlobalName>::size_type j = 0;
j < pGlobalOLEExcludeList->size() && !bFound;
++j )
{
bFound = *(*pGlobalOLEExcludeList)[j] == aName;
bFound = (*pGlobalOLEExcludeList)[j] == aName;
}
if ( bFound )
continue;
......@@ -765,7 +765,7 @@ void SwDoc::PrtOLENotify( bool bAll )
// If it doesn't want to be informed
if ( xObj.is() )
{
pGlobalOLEExcludeList->push_back( new SvGlobalName( aName ) );
pGlobalOLEExcludeList->push_back( aName );
}
}
delete pNodes;
......
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