diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/directsql.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/directsql.cxx | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 30d0e669687b2..96541a21da170 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,33 +29,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbui.hxx" -#ifndef _DBACCESS_UI_DIRECTSQL_HXX_ #include "directsql.hxx" -#endif -#ifndef _DBACCESS_UI_DIRECTSQL_HRC_ #include "directsql.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif -#ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _VOS_MUTEX_HXX_ -#include <vos/mutex.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H +#include <osl/mutex.hxx> #include <tools/diagnose_ex.h> -#endif //........................................................................ namespace dbaui @@ -151,7 +134,7 @@ DBG_NAME(DirectSQLDialog) //-------------------------------------------------------------------- void DirectSQLDialog::_disposing( const EventObject& _rSource ) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); OSL_ENSURE(Reference< XConnection >(_rSource.Source, UNO_QUERY).get() == m_xConnection.get(), @@ -325,7 +308,7 @@ DBG_NAME(DirectSQLDialog) m_aSQL.SetSelection(Selection(sStatement.Len(), sStatement.Len())); } else - OSL_ENSURE(sal_False, "DirectSQLDialog::switchToHistory: invalid position!"); + OSL_FAIL("DirectSQLDialog::switchToHistory: invalid position!"); } //-------------------------------------------------------------------- @@ -365,3 +348,4 @@ DBG_NAME(DirectSQLDialog) } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |