Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:21:13 Modified: dba/dbaccess/source/ui/querydesign/querycontroller.cxx
Log: RESYNC: (1.102-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.102.4.1&r2=1.102.4.2 Delta lines: +18 -15 --------------------- --- querycontroller.cxx 3 Jan 2006 07:49:25 -0000 1.102.4.1 +++ querycontroller.cxx 4 Jul 2006 08:21:10 -0000 1.102.4.2 @@ -173,6 +173,9 @@ #ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" #endif +#ifndef _DBAUI_LOCALRESACCESS_HXX_ +#include "localresaccess.hxx" +#endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif @@ -303,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() ) @@ -335,7 +338,7 @@ } else { - ensureToolbars( _pController, _pWindow, _rbDesign ); + ensureToolbars( _pController, _rbDesign ); } } } @@ -371,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 ) { @@ -869,9 +872,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 ); } // ----------------------------------------------------------------------------- @@ -1516,7 +1519,7 @@ String sMessageText( ModuleRes( STR_QUERY_SAVEMODIFIED ) ); String sObjectType; { - ::svt::OLocalResourceAccess aLocalRes( ModuleRes( RSC_QUERY_OBJECT_TYPE ), RSC_RESOURCE ); + LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE ); sObjectType = String( ResId( m_bIndependent ? 3 : m_bCreateView ? 2 : 1 ) ); } sMessageText.SearchAndReplace( String::CreateFromAscii( "$object$" ), sObjectType ); @@ -1664,7 +1667,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]
