Tag: cws_src680_qiq User: fs Date: 2006/06/27 05:57:12 Modified: dba/dbaccess/source/ui/querydesign/querycontroller.cxx
Log: RESYNC: (1.103-1.104); 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.103.4.9&r2=1.103.4.10 Delta lines: +16 -16 --------------------- --- querycontroller.cxx 19 Jun 2006 10:46:28 -0000 1.103.4.9 +++ querycontroller.cxx 27 Jun 2006 12:57:09 -0000 1.103.4.10 @@ -312,7 +312,7 @@ namespace { - void ensureToolbars( OQueryController* _pController, OQueryContainerWindow* _pWindow, sal_Bool _bDesign ) + void ensureToolbars( OQueryController* _pController, sal_Bool _bDesign ) { Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = _pController->getLayoutManager(_pController->getFrame()); if ( xLayoutManager.is() ) @@ -346,7 +346,7 @@ } else { - ensureToolbars( _pController, _pWindow, _rbDesign ); + ensureToolbars( _pController, _rbDesign ); } _pController->setModified( isModified ); @@ -384,20 +384,20 @@ DBG_NAME(OQueryController); // ----------------------------------------------------------------------------- OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM) - : OJoinController(_rM) + :OJoinController(_rM) + ,m_pParseContext( new svxform::OSystemParseContext ) + ,m_aSqlParser( _rM, m_pParseContext ) + ,m_pSqlIterator(NULL) + ,m_nVisibleRows(0x400) + ,m_nSplitPos(-1) ,m_bDesign(sal_False) ,m_bDistinct(sal_False) ,m_bViewAlias(sal_False) ,m_bViewTable(sal_False) ,m_bViewFunction(sal_False) ,m_bEsacpeProcessing(sal_True) - ,m_nSplitPos(-1) - ,m_nVisibleRows(0x400) ,m_bCreateView(sal_False) ,m_bIndependent( sal_False ) - ,m_pParseContext( new svxform::OSystemParseContext ) - ,m_aSqlParser( _rM, m_pParseContext ) - ,m_pSqlIterator(NULL) { DBG_CTOR(OQueryController,NULL); InvalidateAll(); @@ -874,9 +874,9 @@ } // ----------------------------------------------------------------------------- -void OQueryController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void OQueryController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& /*_xLayoutManager*/) { - ensureToolbars( this, getContainer(), m_bDesign ); + ensureToolbars( this, m_bDesign ); } // ----------------------------------------------------------------------------- @@ -1665,7 +1665,7 @@ } // ----------------------------------------------------------------------------- -IMPL_LINK( OQueryController, OnExecuteAddTable, void*, pNotInterestedIn ) +IMPL_LINK( OQueryController, OnExecuteAddTable, void*, /*pNotInterestedIn*/ ) { Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() ); return 0L; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
