diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-02 00:56:57 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-02 00:57:50 +0200 |
| commit | 369e2d3e007fd9177c3500813feee22fc3a8a823 (patch) | |
| tree | 3404e68b03e5d20f32f4d33c092db3e70bcf51ed /dbaccess | |
| parent | ed76237e41ecdb58f524e14ea6b8866f8dacf6a9 (diff) | |
fdo#66464 initialise static join info at construct time
to ensure that isReadOnly returns something sensible as soon as construct() finishes
Change-Id: I5f9bef049297c5232df0ecdb9084add968a0052f
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/api/OptimisticSet.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index ac73c44f3150..8fed9a30945a 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -136,11 +136,6 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OU OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)); m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue)); m_aKeyIter = m_aKeyMap.begin(); -} - -void OptimisticSet::makeNewStatement( ) -{ - OUStringBuffer aFilter = createKeyFilter(); Reference< XSingleSelectQueryComposer> xSourceComposer(m_xComposer,UNO_QUERY); Reference< XMultiServiceFactory > xFactory(m_xConnection, UNO_QUERY_THROW); @@ -156,6 +151,17 @@ void OptimisticSet::makeNewStatement( ) m_aSqlIterator.traverseAll(); fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions()); +} + +void OptimisticSet::makeNewStatement( ) +{ + OUStringBuffer aFilter = createKeyFilter(); + + Reference< XSingleSelectQueryComposer> xSourceComposer(m_xComposer,UNO_QUERY); + Reference< XMultiServiceFactory > xFactory(m_xConnection, UNO_QUERY_THROW); + Reference<XSingleSelectQueryComposer> xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY); + xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery()); + const OUString sComposerFilter = m_xComposer->getFilter(); if ( !m_sRowSetFilter.isEmpty() || !sComposerFilter.isEmpty() ) { |