Tag: cws_src680_os63
User: os      
Date: 06/02/08 09:33:23

Modified:
 /dba/dbaccess/source/ui/browser/
  brwctrlr.cxx

Log:
 RESYNC: (1.89-1.90); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/ui/browser/
===========================================

File [changed]: brwctrlr.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.86.60.4&r2=1.86.60.5
Delta lines:  +27 -9
--------------------
--- brwctrlr.cxx        16 Nov 2005 10:24:10 -0000      1.86.60.4
+++ brwctrlr.cxx        8 Feb 2006 17:33:19 -0000       1.86.60.5
@@ -148,6 +148,9 @@
 #ifndef _TOOLS_COLOR_HXX
 #include <tools/color.hxx>
 #endif
+#ifndef TOOLS_DIAGNOSE_EX_H
+#include <tools/diagnose_ex.h>
+#endif
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>
 #endif
@@ -2367,15 +2370,30 @@
 {
        Reference< ::com::sun::star::sdbcx::XRowLocate >  xCursor(getRowSet(), 
UNO_QUERY);
 
-       DBG_ASSERT(xCursor.is(), "SbaXDataBrowserController::OnCanceledNotFound 
: shit happens. sometimes. but this is simply impossible !");   // move the 
cursor
+    try
+    {
+           DBG_ASSERT(xCursor.is(), 
"SbaXDataBrowserController::OnCanceledNotFound : shit happens. sometimes. but 
this is simply impossible !");
+        // move the cursor
        xCursor->moveToBookmark(pInfo->aPosition);
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 
+    try
+    {
        // let the grid snyc it's display with the cursor
        Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
        DBG_ASSERT(xModelSet.is(), 
"SbaXDataBrowserController::OnCanceledNotFound : no model set ?!");
        Any aOld = 
xModelSet->getPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"));
        
xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"),
 ::comphelper::makeBoolAny(sal_Bool(sal_True)));
        
xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"),
 aOld);
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 
        return 0L;
 }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to