Tag: cws_src680_oj14 User: oj Date: 2007/02/20 07:51:48 Modified: dba/dbaccess/source/ui/querydesign/querycontroller.cxx
Log: RESYNC: (1.107-1.108); FILE MERGED 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.102.4.5&r2=1.102.4.6 Delta lines: +35 -16 --------------------- --- querycontroller.cxx 21 Dec 2006 12:30:03 -0000 1.102.4.5 +++ querycontroller.cxx 20 Feb 2007 15:51:45 -0000 1.102.4.6 @@ -388,7 +388,7 @@ // ----------------------------------------------------------------------------- OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM) :OJoinController(_rM) - ,OQueryController_PBASE( getBroadcastHelper() ) + ,OQueryController_PBase( getBroadcastHelper() ) ,m_pParseContext( new svxform::OSystemParseContext ) ,m_aSqlParser( _rM, m_pParseContext ) ,m_pSqlIterator(NULL) @@ -422,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); +} + // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OQueryController,OSingleDocumentController,OQueryController_PBASE) IMPLEMENT_FORWARD_XTYPEPROVIDER2(OQueryController,OSingleDocumentController,OQueryController_PBASE) @@ -450,6 +475,7 @@ ::comphelper::disposeComponent(m_xComposer); OJoinController::disposing(); + OQueryController_PBase::disposing(); } // ----------------------------------------------------------------------------- void OQueryController::clearFields() @@ -773,19 +799,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; @@ -927,7 +946,7 @@ m_pView = new OQueryContainerWindow(pParent,this,getORB()); - return OSingleDocumentController::Construct(pParent); + return OJoinController::Construct(pParent); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
