Tag: cws_src680_dba22b
User: fs      
Date: 2006/12/09 14:46:50

Modified:
   dba/dbaccess/source/ui/querydesign/querycontroller.cxx

Log:
 #i72432# PropertyContainer and PropertyArrayUsageHelper not inherited from 
SingleDocController anymore, own implementations now

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.106.54.3&r2=1.106.54.4
Delta lines:  +30 -3
--------------------
--- querycontroller.cxx 9 Dec 2006 21:50:18 -0000       1.106.54.3
+++ querycontroller.cxx 9 Dec 2006 22:46:47 -0000       1.106.54.4
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: querycontroller.cxx,v $
  *
- *  $Revision: 1.106.54.3 $
+ *  $Revision: 1.106.54.4 $
  *
- *  last change: $Author: fs $ $Date: 2006/12/09 21:50:18 $
+ *  last change: $Author: fs $ $Date: 2006/12/09 22:46:47 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -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()
@@ -930,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]

Reply via email to