strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS qiq (1.63.18); FILE MERGED

Browse source 
2006/06/28 10:31:07 fs 1.63.18.2: #i10000#
2006/05/10 14:22:26 fs 1.63.18.1: no need to instantiate a SingleSelectQueryComposer directly
This commit is contained in:
Oliver Bolte 2006-07-10 14:06:14 +00:00
parent 870d575aff
commit c2c057a834
1 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dbaccess/source/core/api/querycomposer.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: querycomposer.cxx,v $
*
* $Revision: 1.63 $
* $Revision: 1.64 $
*
* last change: $Author: vg $ $Date: 2006-04-07 14:10:56 $
* last change: $Author: obo $ $Date: 2006-07-10 15:06:14 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -96,9 +96,6 @@
#ifndef DBA_HELPERCOLLECTIONS_HXX
#include "HelperCollections.hxx"
#endif
#ifndef DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX
#include "SingleSelectQueryComposer.hxx"
#endif
#ifndef DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
#include "composertools.hxx"
#endif
@ -124,32 +121,15 @@ using namespace ::utl;
DBG_NAME(OQueryComposer)
// -------------------------------------------------------------------------
OQueryComposer::OQueryComposer(const Reference< XNameAccess>& _xTableSupplier,
const Reference< XConnection>& _xConnection,
const Reference< XMultiServiceFactory >& _xServiceFactory)
OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection)
: OSubComponent(m_aMutex,_xConnection)
{
DBG_CTOR(OQueryComposer,NULL);
OSL_ENSURE(_xConnection.is()," Connection cant be null!");
try
{
Reference<XMultiServiceFactory> xFac(_xConnection,UNO_QUERY);
if ( xFac.is() )
{
m_xComposer.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY );
m_xComposerHelper.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY );
}
else
{
m_xComposer = new OSingleSelectQueryComposer(_xTableSupplier,_xConnection, _xServiceFactory );
m_xComposerHelper = new OSingleSelectQueryComposer(_xTableSupplier,_xConnection, _xServiceFactory );
}
}
catch(Exception)
{
}
OSL_ENSURE( m_xComposer.is(), "OQueryComposer::OQueryComposer: Composer copuld be created!" );
Reference<XMultiServiceFactory> xFac( _xConnection, UNO_QUERY_THROW );
m_xComposer.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW );
m_xComposerHelper.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW );
}
// -------------------------------------------------------------------------
OQueryComposer::~OQueryComposer()