Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:57:57 Modified: dba/dbaccess/source/ui/dlg/directsql.cxx
Log: RESYNC: (1.5-1.6); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: directsql.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/directsql.cxx?r1=1.5.4.3&r2=1.5.4.4 Delta lines: +18 -19 --------------------- --- directsql.cxx 25 Apr 2006 13:02:56 -0000 1.5.4.3 +++ directsql.cxx 4 Jul 2006 07:57:54 -0000 1.5.4.4 @@ -153,12 +153,12 @@ //-------------------------------------------------------------------- void DirectSQLDialog::_disposing( const EventObject& _rSource ) { - { ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); ::osl::MutexGuard aGuard(m_aMutex); OSL_ENSURE(Reference< XConnection >(_rSource.Source, UNO_QUERY).get() == m_xConnection.get(), "DirectSQLDialog::_disposing: where does this come from?"); + (void)_rSource; { String sMessage(ModuleRes(STR_DIRECTSQL_CONNECTIONLOST)); @@ -168,7 +168,6 @@ PostUserEvent(LINK(this, DirectSQLDialog, OnClose)); } - } //-------------------------------------------------------------------- void DirectSQLDialog::addHistoryEntry(const String& _rStatement) @@ -348,28 +347,28 @@ } //-------------------------------------------------------------------- - IMPL_LINK( DirectSQLDialog, OnStatementModified, void*, NOTINTERESTEDIN ) + IMPL_LINK( DirectSQLDialog, OnStatementModified, void*, /*NOTINTERESTEDIN*/ ) { m_aExecute.Enable(0 != m_aSQL.GetText().Len()); return 0L; } //-------------------------------------------------------------------- - IMPL_LINK( DirectSQLDialog, OnClose, void*, NOTINTERESTEDIN ) + IMPL_LINK( DirectSQLDialog, OnClose, void*, /*NOTINTERESTEDIN*/ ) { EndDialog( RET_OK ); return 0L; } //-------------------------------------------------------------------- - IMPL_LINK( DirectSQLDialog, OnExecute, void*, NOTINTERESTEDIN ) + IMPL_LINK( DirectSQLDialog, OnExecute, void*, /*NOTINTERESTEDIN*/ ) { executeCurrent(); return 0L; } //-------------------------------------------------------------------- - IMPL_LINK( DirectSQLDialog, OnListEntrySelected, void*, NOTINTERESTEDIN ) + IMPL_LINK( DirectSQLDialog, OnListEntrySelected, void*, /*NOTINTERESTEDIN*/ ) { if (!m_pSQLHistory->IsTravelSelect()) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
