Tag: cws_src680_oj14 User: oj Date: 2007/02/20 12:44:20 Modified: dba/dbaccess/source/ui/querydesign/querycontroller.cxx
Log: mere conflict 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.6&r2=1.102.4.7 Delta lines: +4 -25 -------------------- --- querycontroller.cxx 20 Feb 2007 15:51:45 -0000 1.102.4.6 +++ querycontroller.cxx 20 Feb 2007 20:44:17 -0000 1.102.4.7 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.102.4.6 $ + * $Revision: 1.102.4.7 $ * - * last change: $Author: oj $ $Date: 2007/02/20 15:51:45 $ + * last change: $Author: oj $ $Date: 2007/02/20 20:44:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -448,9 +448,6 @@ } // ----------------------------------------------------------------------------- -IMPLEMENT_FORWARD_XINTERFACE2(OQueryController,OSingleDocumentController,OQueryController_PBASE) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(OQueryController,OSingleDocumentController,OQueryController_PBASE) -// ----------------------------------------------------------------------------- void OQueryController::deleteIterator() { if(m_pSqlIterator) @@ -464,7 +461,7 @@ // ----------------------------------------------------------------------------- void OQueryController::disposing() { - OQueryController_PBASE::disposing(); + OQueryController_PBase::disposing(); deleteIterator(); @@ -1673,25 +1670,7 @@ } // ----------------------------------------------------------------------------- -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); -} } // namespace dbaui // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
