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

SvListView::CreateViewData unnecessary

the method and the only override all do the same thing

Change-Id: Id8cb131845f3303fbd51736879aa15661d672400
Reviewed-on: https://gerrit.libreoffice.org/64923
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst a8c1db54
...@@ -299,7 +299,6 @@ public: ...@@ -299,7 +299,6 @@ public:
SvViewDataEntry* GetViewData( SvTreeListEntry* pEntry ); SvViewDataEntry* GetViewData( SvTreeListEntry* pEntry );
bool HasViewData() const; bool HasViewData() const;
virtual std::unique_ptr<SvViewDataEntry> CreateViewData( SvTreeListEntry* pEntry );
virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ); virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry );
virtual void ModelHasCleared(); virtual void ModelHasCleared();
......
...@@ -293,8 +293,6 @@ protected: ...@@ -293,8 +293,6 @@ protected:
void CancelTextEditing(); void CancelTextEditing();
bool EditingCanceled() const; bool EditingCanceled() const;
// Return value must be derived from SvViewDataEntry!
virtual std::unique_ptr<SvViewDataEntry> CreateViewData( SvTreeListEntry* ) override;
// InitViewData is called right after CreateViewData // InitViewData is called right after CreateViewData
// The Entry is has not yet been added to the View in InitViewData! // The Entry is has not yet been added to the View in InitViewData!
virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ) override; virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ) override;
......
...@@ -1122,19 +1122,13 @@ void SvListView::Impl::InitTable() ...@@ -1122,19 +1122,13 @@ void SvListView::Impl::InitTable()
pEntry = m_rThis.pModel->First(); pEntry = m_rThis.pModel->First();
while( pEntry ) while( pEntry )
{ {
pViewData = m_rThis.CreateViewData( pEntry ); pViewData = o3tl::make_unique<SvViewDataEntry>();
DBG_ASSERT(pViewData,"InitTable:No ViewData");
m_rThis.InitViewData( pViewData.get(), pEntry ); m_rThis.InitViewData( pViewData.get(), pEntry );
m_DataTable.insert(std::make_pair(pEntry, std::move(pViewData))); m_DataTable.insert(std::make_pair(pEntry, std::move(pViewData)));
pEntry = m_rThis.pModel->Next( pEntry ); pEntry = m_rThis.pModel->Next( pEntry );
} }
} }
std::unique_ptr<SvViewDataEntry> SvListView::CreateViewData( SvTreeListEntry* )
{
return o3tl::make_unique<SvViewDataEntry>();
}
void SvListView::Clear() void SvListView::Clear()
{ {
m_pImpl->m_DataTable.clear(); m_pImpl->m_DataTable.clear();
...@@ -1211,7 +1205,7 @@ void SvListView::Impl::ActionMoved() ...@@ -1211,7 +1205,7 @@ void SvListView::Impl::ActionMoved()
void SvListView::Impl::ActionInserted( SvTreeListEntry* pEntry ) void SvListView::Impl::ActionInserted( SvTreeListEntry* pEntry )
{ {
DBG_ASSERT(pEntry,"Insert:No Entry"); DBG_ASSERT(pEntry,"Insert:No Entry");
std::unique_ptr<SvViewDataEntry> pData(m_rThis.CreateViewData( pEntry )); std::unique_ptr<SvViewDataEntry> pData(new SvViewDataEntry());
m_rThis.InitViewData( pData.get(), pEntry ); m_rThis.InitViewData( pData.get(), pEntry );
std::pair<SvDataTable::iterator, bool> aSuccess = std::pair<SvDataTable::iterator, bool> aSuccess =
m_DataTable.insert(std::make_pair(pEntry, std::move(pData))); m_DataTable.insert(std::make_pair(pEntry, std::move(pData)));
...@@ -1236,8 +1230,7 @@ void SvListView::Impl::ActionInsertedTree( SvTreeListEntry* pEntry ) ...@@ -1236,8 +1230,7 @@ void SvListView::Impl::ActionInsertedTree( SvTreeListEntry* pEntry )
while( pCurEntry ) while( pCurEntry )
{ {
DBG_ASSERT(m_DataTable.find(pCurEntry) != m_DataTable.end(),"Entry already in Table"); DBG_ASSERT(m_DataTable.find(pCurEntry) != m_DataTable.end(),"Entry already in Table");
std::unique_ptr<SvViewDataEntry> pViewData(m_rThis.CreateViewData(pCurEntry)); std::unique_ptr<SvViewDataEntry> pViewData(new SvViewDataEntry());
DBG_ASSERT(pViewData,"No ViewData");
m_rThis.InitViewData( pViewData.get(), pEntry ); m_rThis.InitViewData( pViewData.get(), pEntry );
m_DataTable.insert(std::make_pair(pCurEntry, std::move(pViewData))); m_DataTable.insert(std::make_pair(pCurEntry, std::move(pViewData)));
pCurEntry = m_rThis.pModel->Next( pCurEntry ); pCurEntry = m_rThis.pModel->Next( pCurEntry );
......
...@@ -808,11 +808,6 @@ const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEnt ...@@ -808,11 +808,6 @@ const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEnt
return &pEntryData->GetItem(nItemPos); return &pEntryData->GetItem(nItemPos);
} }
std::unique_ptr<SvViewDataEntry> SvTreeListBox::CreateViewData( SvTreeListEntry* )
{
return o3tl::make_unique<SvViewDataEntry>();
}
void SvTreeListBox::InitViewData( SvViewDataEntry* pData, SvTreeListEntry* pEntry ) void SvTreeListBox::InitViewData( SvViewDataEntry* pData, SvTreeListEntry* pEntry )
{ {
SvTreeListEntry* pInhEntry = pEntry; SvTreeListEntry* pInhEntry = pEntry;
......
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