diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 19:20:31 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 19:20:31 -0600 |
commit | 1f9060d1e01be5f4f830ee772950d0a98b362064 (patch) | |
tree | ac38d493baa982fa99d38a34aa1c453d7b939b8f /dbaccess/source | |
parent | 256f6ca67d03b875e8e6a355a6cf5130ea7404a3 (diff) |
fix mis-merge
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 1 | ||||
-rwxr-xr-x | dbaccess/source/ui/misc/dbaundomanager.cxx | 5 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 29e243823b67..6e07b440565e 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2723,6 +2723,7 @@ void SbaXDataBrowserController::initializeParser() const { // (only if the statement isn't native) // (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid) xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser; + } } catch(Exception&) { diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx index 1e60a027a693..83f55e0cbc5e 100755 --- a/dbaccess/source/ui/misc/dbaundomanager.cxx +++ b/dbaccess/source/ui/misc/dbaundomanager.cxx @@ -34,7 +34,6 @@ #include <svl/undo.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> #include <framework/undomanagerhelper.hxx> //...................................................................................................................... @@ -263,7 +262,7 @@ namespace dbaui //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // (all our UndoActions work directly on VCL code, usually, so ...) UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.undo( aGuard ); @@ -272,7 +271,7 @@ namespace dbaui //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // (all our UndoActions work directly on VCL code, usually, so ...) UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.redo( aGuard ); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 3ade5bd4aaf2..a0d273e10a56 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -453,7 +453,7 @@ namespace else if ( nNewThumbPos == _pView->GetScrollOffset().Y() ) return sal_False; - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- sal_Bool getMovementImpl(OJoinTableView* _pView,const Point& _rPoint,const Size& _rSize,long& _nScrollX,long& _nScrollY) |