Kaydet (Commit) 69aef611 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Michael Stahl

tdf#114596 dbaccess: fix mysterious dataloss bug (part 2)

Same problem as in 96ae2a33

Regression from 497e40ad

Change-Id: I00e7bf3559e688e7fbc5429ace2b5c18221c9890
Reviewed-on: https://gerrit.libreoffice.org/73146Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
(cherry picked from commit 58f121ef)
Reviewed-on: https://gerrit.libreoffice.org/73153
(cherry picked from commit ebae54a6)
Reviewed-on: https://gerrit.libreoffice.org/73543Tested-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 202bf0d5
...@@ -553,7 +553,7 @@ void ODBTableDecorator::refreshColumns() ...@@ -553,7 +553,7 @@ void ODBTableDecorator::refreshColumns()
OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions ); OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions );
m_xColumnMediator = pMediator; m_xColumnMediator = pMediator;
pCol->setMediator( pMediator ); pCol->setMediator( pMediator );
m_pColumns = pCol; m_pColumns.reset(pCol);
} }
else else
m_pColumns->reFill(aVector); m_pColumns->reFill(aVector);
......
...@@ -71,10 +71,11 @@ namespace dbaccess ...@@ -71,10 +71,11 @@ namespace dbaccess
css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormats; css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormats;
// <properties> // <properties>
mutable sal_Int32 m_nPrivileges; mutable sal_Int32 m_nPrivileges;
// </properties> // </properties>
rtl::Reference<::connectivity::sdbcx::OCollection> m_pColumns; // note: this thing uses the ref-count of "this", see OCollection::acquire()!
std::unique_ptr<::connectivity::sdbcx::OCollection> m_pColumns;
// IColumnFactory // IColumnFactory
virtual OColumn* createColumn(const OUString& _rName) const override; virtual OColumn* createColumn(const OUString& _rName) const override;
......
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