diff options
| author | Frank Schönheit <fs@openoffice.org> | 2001-05-17 08:09:44 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2001-05-17 08:09:44 +0000 |
| commit | 8a5c2e7c8f1271f8951805b7ab1ada7b44179d7e (patch) | |
| tree | 80e7e7947392a5ebad5863b4e018b4f78d19bd0f /dbaccess/source/ui/uno/dbinteraction.cxx | |
| parent | #86509# release the mutex before calling into the interaction handler (diff) | |
| download | core-8a5c2e7c8f1271f8951805b7ab1ada7b44179d7e.tar.gz core-8a5c2e7c8f1271f8951805b7ab1ada7b44179d7e.zip | |
#86509# acquire the solar mutex in all implHandle methods (needed for opening the dialogs)
Diffstat (limited to 'dbaccess/source/ui/uno/dbinteraction.cxx')
| -rw-r--r-- | dbaccess/source/ui/uno/dbinteraction.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 57fac65c3700..a2b7f676e915 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbinteraction.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fs $ $Date: 2001-01-05 12:16:07 $ + * last change: $Author: fs $ $Date: 2001-05-17 09:09:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,6 +104,12 @@ #ifndef _DBAUI_PARAMDIALOG_HXX_ #include "paramdialog.hxx" #endif +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif +#ifndef _VOS_MUTEX_HXX_ +#include <vos/mutex.hxx> +#endif //========================================================================== @@ -182,6 +188,9 @@ namespace dbaui //------------------------------------------------------------------------- void OInteractionHandler::implHandle(const ParametersRequest& _rParamRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { + ::vos::OGuard aGuard(Application::GetSolarMutex()); + // want to open a dialog .... + sal_Int32 nAbortPos = getContinuation(ABORT, _rContinuations); sal_Int32 nParamPos = getContinuation(SUPPLY_PARAMETERS, _rContinuations); @@ -223,6 +232,9 @@ namespace dbaui //------------------------------------------------------------------------- void OInteractionHandler::implHandle(const AuthenticationRequest& _rAuthRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { + ::vos::OGuard aGuard(Application::GetSolarMutex()); + // want to open a dialog .... + // search the continuations we can handle sal_Int32 nAbortPos = getContinuation(ABORT, _rContinuations); sal_Int32 nRetryPos = getContinuation(RETRY, _rContinuations); @@ -335,6 +347,9 @@ namespace dbaui //------------------------------------------------------------------------- void OInteractionHandler::implHandle(const SQLExceptionInfo& _rSqlInfo, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { + ::vos::OGuard aGuard(Application::GetSolarMutex()); + // want to open a dialog .... + sal_Int32 nApprovePos = getContinuation(APPROVE, _rContinuations); sal_Int32 nAbortPos = getContinuation(ABORT, _rContinuations); sal_Int32 nRetryPos = getContinuation(RETRY, _rContinuations); @@ -425,6 +440,9 @@ namespace dbaui /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.6 2001/01/05 12:16:07 fs + * adjusted the implementation name + * * Revision 1.5 2000/12/15 15:48:13 fs * #82151# two instances of the registration helper module - one for every library in this project * |