Kaydet (Commit) 7ea5d339 authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#119954 do not copy the old parent, init with new parent instead

The parent is always the ScDBCollection that contains the
ScDBCollection::NamedDBs container, not the one the
ScDBCollection::NamedDBs was copy-constructed from.

Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2
Reviewed-on: https://gerrit.libreoffice.org/60833Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: Jenkins
üst 4cc71fef
...@@ -240,7 +240,8 @@ public: ...@@ -240,7 +240,8 @@ public:
DBsType m_DBs; DBsType m_DBs;
ScDBCollection& mrParent; ScDBCollection& mrParent;
NamedDBs(ScDBCollection& rParent, ScDocument& rDoc); NamedDBs(ScDBCollection& rParent, ScDocument& rDoc);
NamedDBs(const NamedDBs& r); NamedDBs(const NamedDBs& r, ScDBCollection& rParent);
NamedDBs(const NamedDBs&) = delete;
virtual ~NamedDBs() override; virtual ~NamedDBs() override;
NamedDBs & operator=(NamedDBs const&) = delete; NamedDBs & operator=(NamedDBs const&) = delete;
void initInserted( ScDBData* p ); void initInserted( ScDBData* p );
......
...@@ -1072,9 +1072,9 @@ ScRangeList& ScDBDataContainerBase::GetDirtyTableColumnNames() ...@@ -1072,9 +1072,9 @@ ScRangeList& ScDBDataContainerBase::GetDirtyTableColumnNames()
ScDBCollection::NamedDBs::NamedDBs(ScDBCollection& rParent, ScDocument& rDoc) : ScDBCollection::NamedDBs::NamedDBs(ScDBCollection& rParent, ScDocument& rDoc) :
ScDBDataContainerBase(rDoc), mrParent(rParent) {} ScDBDataContainerBase(rDoc), mrParent(rParent) {}
ScDBCollection::NamedDBs::NamedDBs(const NamedDBs& r) ScDBCollection::NamedDBs::NamedDBs(const NamedDBs& r, ScDBCollection& rParent)
: ScDBDataContainerBase(r.mrDoc) : ScDBDataContainerBase(r.mrDoc)
, mrParent(r.mrParent) , mrParent(rParent)
{ {
for (auto const& it : r.m_DBs) for (auto const& it : r.m_DBs)
{ {
...@@ -1288,7 +1288,7 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) : ...@@ -1288,7 +1288,7 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) :
pDoc(pDocument), nEntryIndex(1), maNamedDBs(*this, *pDocument) {} pDoc(pDocument), nEntryIndex(1), maNamedDBs(*this, *pDocument) {}
ScDBCollection::ScDBCollection(const ScDBCollection& r) : ScDBCollection::ScDBCollection(const ScDBCollection& r) :
pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), maAnonDBs(r.maAnonDBs) {} pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs, *this), maAnonDBs(r.maAnonDBs) {}
const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const
{ {
......
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