[Libreoffice-commits] .: Branch 'integration/dev300_m101' - dbaccess/source

[Norbert Thiebaud]

 dbaccess/source/ui/browser/brwctrlr.cxx          |    1 +
 dbaccess/source/ui/misc/dbaundomanager.cxx       |    5 ++---
 dbaccess/source/ui/querydesign/JoinTableView.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d8021d7d67ced311667c65eae6ae9891841dc5cf
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 19:20:31 2011 -0600

    fix mis-merge

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index b4beba5..6b33ddf 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 a6a820f..f08186f 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 9569fc1..f12684b 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)