Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:49:28 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: RESYNC: (1.25-1.28); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.25.24.1&r2=1.25.24.2 Delta lines: +7 -10 -------------------- --- AppController.cxx 24 Mar 2006 15:35:59 -0000 1.25.24.1 +++ AppController.cxx 7 Apr 2006 20:49:25 -0000 1.25.24.2 @@ -205,9 +205,6 @@ #ifndef SVX_DBAOBJECTEX_HXX #include <svx/dbaobjectex.hxx> #endif -#ifndef _DBAUI_DLGRENAME_HXX -#include "dlgrename.hxx" -#endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif @@ -366,7 +363,7 @@ { // temporary (hopefully!) hack for #i55274# Reference< XFlushable > xFlush( m_xDataSourceConnection, UNO_QUERY ); - if ( xFlush.is() ) + if ( xFlush.is() && m_xMetaData.is() && !m_xMetaData->isReadOnly() ) xFlush->flush(); } catch( const Exception& ) @@ -1266,9 +1263,9 @@ break; case SID_MAIL_SENDDOC: { - SfxMailModel aSendMail(m_xCurrentFrame); - if ( aSendMail.AttachDocument(SfxMailModel::TYPE_SELF,getModel()) == SfxMailModel::SEND_MAIL_OK ) - aSendMail.Send(); + SfxMailModel aSendMail; + if ( aSendMail.AttachDocument(rtl::OUString(),getModel(), rtl::OUString()) == SfxMailModel::SEND_MAIL_OK ) + aSendMail.Send(m_xCurrentFrame); } break; case SID_DB_APP_SENDREPORTASMAIL: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
