dba33d: merge with DEV300_m67

4 files changed, 17 insertions, 3 deletions

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index f82839664973..8db327fb8b85 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1495,7 +1495,10 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr
         m_aCurrentError = aInfo;
     }
     else
+    {
+        m_aCurrentError = aInfo;
         m_aAsyncDisplayError.Call();
+    }
 }
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 87f924129c16..913dea5c54fe 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -324,7 +324,16 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
         }
         catch(const Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION();
+            // Does this need to be shown to the user?
+            bSuccess = false;
+            try
+            {
+                ::comphelper::disposeComponent( xController );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
         }
     }
 
@@ -342,7 +351,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
     }
     else
         if ( rListener.is() )
-        rListener->loadCancelled( this );
+            rListener->loadCancelled( this );
 }
 
 // -----------------------------------------------------------------------
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index a24c2d4e30dc..9d81d9c47c86 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -282,6 +282,7 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto
     }
 }
 
+#ifdef WNT
 // -----------------------------------------------------------------------------
 OGenericUnoController::OGenericUnoController()
     :OGenericUnoController_Base( getMutex() )
@@ -302,6 +303,7 @@ OGenericUnoController::OGenericUnoController()
     // we simply abort here.
     abort();
 }
+#endif
 
 // -----------------------------------------------------------------------------
 OGenericUnoController::~OGenericUnoController()
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 9f3403b690c5..b2cfbe04a515 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3467,7 +3467,7 @@ sal_Bool SbaTableQueryBrowser::isHiContrast() const
 {
     sal_Bool bRet = sal_False;
     if ( m_pTreeView )
-        bRet = m_pTreeView->getListBox().GetBackground().GetColor().IsDark();
+        bRet = m_pTreeView->getListBox().GetSettings().GetStyleSettings().GetHighContrastMode();
     return bRet;
 }
 // -----------------------------------------------------------------------------