User: hr Date: 06/06/19 20:29:59 Modified: /dba/dbaccess/source/ui/querydesign/ querycontroller.cxx
Log: INTEGRATION: CWS warnings01 (1.102.74); FILE MERGED 2006/05/24 00:00:47 sb 1.102.74.2: RESYNC: (1.102-1.103); FILE MERGED 2006/03/24 15:36:28 fs 1.102.74.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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&r2=1.104 Delta lines: +11 -11 --------------------- --- querycontroller.cxx 4 May 2006 08:46:35 -0000 1.103 +++ querycontroller.cxx 20 Jun 2006 03:29:57 -0000 1.104 @@ -306,7 +306,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() ) @@ -338,7 +338,7 @@ } else { - ensureToolbars( _pController, _pWindow, _rbDesign ); + ensureToolbars( _pController, _rbDesign ); } } } @@ -374,16 +374,16 @@ DBG_NAME(OQueryController); // ----------------------------------------------------------------------------- OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM) - : OJoinController(_rM) + :OJoinController(_rM) + ,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_pSqlIterator(NULL) - ,m_nSplitPos(-1) - ,m_nVisibleRows(0x400) ,m_bCreateView(sal_False) ,m_bIndependent( sal_False ) { @@ -888,9 +888,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 ); } // ----------------------------------------------------------------------------- @@ -1683,7 +1683,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]
