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 | d8021d7d67ced311667c65eae6ae9891841dc5cf (patch) | |
| tree | 4ccaf52effe82aee6b500fec6269b08f6a5a32bb | |
| parent | 9da3711604902d631ce93f45f74cfe30d1ec9409 (diff) | |
fix mis-merge
| -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 b4beba5de..6b33ddfd5 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 a6a820fd8..f08186f8e 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 9569fc1c5..f12684b42 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) |