summaryrefslogtreecommitdiff
path: root/dbaccess/source
diff options
context:
space:
mode:
authorFrank Schönheit <fs@openoffice.org>2001-04-06 08:00:47 +0000
committerFrank Schönheit <fs@openoffice.org>2001-04-06 08:00:47 +0000
commitbc000e6f173b35a2e37804447cd5e4cd963f6133 (patch)
tree10dd3194bdc8f4f71e2002f3315a3da9457633bd /dbaccess/source
parent75b41d8a0cc6ab015eb5fba5fdb24192c2f32493 (diff)
#84845# OColumns need an IColumnFactory in the ctor, not in loadSettings
Diffstat (limited to 'dbaccess/source')
-rw-r--r--dbaccess/source/core/api/querydescriptor.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index c61c7d702a1f..16a900ee142f 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: querydescriptor.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: fs $ $Date: 2001-04-03 14:12:34 $
+ * last change: $Author: fs $ $Date: 2001-04-06 09:00:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -140,7 +140,7 @@ void OQueryDescriptor::registerProperties()
//--------------------------------------------------------------------------
OQueryDescriptor::OQueryDescriptor()
:ODataSettings(m_aBHelper)
- ,m_aColumns(*this, m_aMutex, sal_True,::std::vector< ::rtl::OUString>())
+ ,m_aColumns(*this, m_aMutex, sal_True,::std::vector< ::rtl::OUString>(), this)
{
registerProperties();
}
@@ -148,7 +148,7 @@ OQueryDescriptor::OQueryDescriptor()
//--------------------------------------------------------------------------
OQueryDescriptor::OQueryDescriptor(const ::com::sun::star::uno::Reference< XPropertySet >& _rxCommandDefinition)
:ODataSettings(m_aBHelper)
- ,m_aColumns(*this, m_aMutex, sal_True,::std::vector< ::rtl::OUString>())
+ ,m_aColumns(*this, m_aMutex, sal_True,::std::vector< ::rtl::OUString>(), this)
{
registerProperties();
@@ -173,7 +173,7 @@ OQueryDescriptor::OQueryDescriptor(const ::com::sun::star::uno::Reference< XProp
//--------------------------------------------------------------------------
OQueryDescriptor::OQueryDescriptor(const OQueryDescriptor& _rSource)
:ODataSettings(_rSource, m_aBHelper)
- ,m_aColumns(*this, m_aMutex, sal_True,::std::vector< ::rtl::OUString>())
+ ,m_aColumns(*this, m_aMutex, sal_True,::std::vector< ::rtl::OUString>(), this)
{
registerProperties();
@@ -379,7 +379,7 @@ void OQueryDescriptor::readColumnSettings(const OConfigurationNode& _rConfigLoca
OConfigurationNode aColumnsNode = _rConfigLocation.openNode(CONFIGKEY_QRYDESCR_COLUMNS);
m_aColumns.clearColumns();
if (aColumnsNode.isValid())
- m_aColumns.loadSettings(aColumnsNode, this);
+ m_aColumns.loadSettings(aColumnsNode);
}
// -----------------------------------------------------------------------------
//==========================================================================