User: rt Date: 2008-06-16 12:33:14+0000 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: INTEGRATION: CWS rptchart02 (1.87.2); FILE MERGED 2008/06/11 12:40:17 oj 1.87.2.4: RESYNC: (1.88-1.89); FILE MERGED 2008/05/21 11:57:37 oj 1.87.2.3: RESYNC: (1.87-1.88); FILE MERGED 2008/04/16 10:19:59 oj 1.87.2.2: remove class as well 2008/04/16 09:26:03 oj 1.87.2.1: remove helper class again File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.89&r2=1.90 Delta lines: +3 -1 ------------------- --- genericcontroller.cxx 2008-06-06 14:08:24+0000 1.89 +++ genericcontroller.cxx 2008-06-16 12:33:12+0000 1.90 @@ -130,6 +130,7 @@ #endif #include <algorithm> #include <hash_map> +#include <cppuhelper/implbase1.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -155,6 +156,7 @@ typedef ::std::hash_map< sal_Int16, sal_Int16 > CommandHashMap; typedef ::std::list< DispatchInformation > DispatchInfoList; + // ------------------------------------------------------------------------- const ::rtl::OUString& getConfirmDeletionURL() { @@ -669,7 +671,7 @@ || ( m_aSupportedFeatures.find( aURL.Complete ) != m_aSupportedFeatures.end() ) ) { - xReturn = static_cast< XDispatch* >( this ); + xReturn = this; } // no? -> ask the slave dispatcher else if ( m_xSlaveDispatcher.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
