User: vg Date: 2007/01/15 06:37:16 Modified: dba/dbaccess/source/ui/querydesign/querycontroller.cxx
Log: INTEGRATION: CWS dba22b (1.106.54); FILE MERGED 2006/12/09 22:46:47 fs 1.106.54.4: #i72432# PropertyContainer and PropertyArrayUsageHelper not inherited from SingleDocController anymore, own implementations now 2006/12/09 21:50:18 fs 1.106.54.3: #i72428# NamedValueCollection API changes 2006/12/09 21:23:19 fs 1.106.54.2: #i72428# properly determine whether we're independent 2006/12/04 22:41:16 fs 1.106.54.1: #i72252# parseNodeTo*/getColumnRange: use XConnection instead of XDatabaseMetaData File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.107&r2=1.108 Delta lines: +32 -12 --------------------- --- querycontroller.cxx 13 Dec 2006 16:55:02 -0000 1.107 +++ querycontroller.cxx 15 Jan 2007 14:37:14 -0000 1.108 @@ -388,6 +388,7 @@ // ----------------------------------------------------------------------------- OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM) :OJoinController(_rM) + ,OQueryController_PBase( getBroadcastHelper() ) ,m_pParseContext( new svxform::OSystemParseContext ) ,m_aSqlParser( _rM, m_pParseContext ) ,m_pSqlIterator(NULL) @@ -421,6 +422,31 @@ dispose(); } } + +IMPLEMENT_FORWARD_XINTERFACE2( OQueryController, OJoinController, OQueryController_PBase ) +IMPLEMENT_FORWARD_XTYPEPROVIDER2( OQueryController, OJoinController, OQueryController_PBase ) + +//------------------------------------------------------------------------- +Reference< XPropertySetInfo > SAL_CALL OQueryController::getPropertySetInfo() throw(RuntimeException) +{ + Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + return xInfo; +} + +//------------------------------------------------------------------------- +::cppu::IPropertyArrayHelper& OQueryController::getInfoHelper() +{ + return *const_cast< OQueryController* >( this )->getArrayHelper(); +} + +//-------------------------------------------------------------------- +::cppu::IPropertyArrayHelper* OQueryController::createArrayHelper( ) const +{ + Sequence< Property > aProps; + describeProperties(aProps); + return new ::cppu::OPropertyArrayHelper(aProps); +} + // ----------------------------------------------------------------------------- void OQueryController::deleteIterator() { @@ -444,6 +470,7 @@ ::comphelper::disposeComponent(m_xComposer); OJoinController::disposing(); + OQueryController_PBase::disposing(); } // ----------------------------------------------------------------------------- void OQueryController::clearFields() @@ -767,19 +794,12 @@ if ( xConnection.is() ) initializeConnection( xConnection ); - if ( !rArguments.getIfExists_ensureType( (::rtl::OUString)PROPERTY_CURRENTQUERY, m_sName ) ) - throw Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid argument type for CurrentQuery.")),*this); - - if ( !rArguments.getIfExists_ensureType( (::rtl::OUString)PROPERTY_QUERYDESIGNVIEW, m_bDesign ) ) - throw Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid argument type for QueryDesignView.")),*this); - - if ( !rArguments.getIfExists_ensureType( (::rtl::OUString)PROPERTY_CREATEVIEW, m_bCreateView ) ) - throw Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid argument type for CreateView.")),*this); + rArguments.get_ensureType( (::rtl::OUString)PROPERTY_CURRENTQUERY, m_sName ); + rArguments.get_ensureType( (::rtl::OUString)PROPERTY_QUERYDESIGNVIEW, m_bDesign ); + rArguments.get_ensureType( (::rtl::OUString)PROPERTY_CREATEVIEW, m_bCreateView ); ::rtl::OUString sIndependentSQLCommand; - if ( !rArguments.getIfExists_ensureType( (::rtl::OUString)PARAM_INDEPENDENT_SQL_COMMAND, sIndependentSQLCommand ) ) - throw Exception( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Invalid argument type for IndependentSQLCommand." ) ),*this); - if ( sIndependentSQLCommand.getLength() ) + if ( rArguments.get_ensureType( (::rtl::OUString)PARAM_INDEPENDENT_SQL_COMMAND, sIndependentSQLCommand ) ) { m_bIndependent = sal_True; m_bEsacpeProcessing = sal_True; @@ -937,7 +957,7 @@ m_pView = new OQueryContainerWindow(pParent,this,m_xMultiServiceFacatory); - return OSingleDocumentController::Construct(pParent); + return OJoinController::Construct(pParent); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
