svx/source/fmcomp/gridctrl.cxx | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit aa7b9062f68b1cfdd76ad1987bde5eed170ed6cf
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue Jun 24 20:02:00 2014 +0200
Revert "Resolves fdo#75339 : No Error-Dialog appears in specific cases..."
This reverts commit 701bbaf93f0d31ae73e94e0cebccb1cfba0e5882.
+ a824b27a6a8fc11f8378157aae04c08ebace8348
Conflicts:
svx/source/fmcomp/gridctrl.cxx
Change-Id: I03b40d1350328df5f789d9ea45cf6d7f53058926
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index fb71936..fd54088 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -40,7 +40,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/exc_hlp.hxx>
#include <tools/resid.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/menu.hxx>
@@ -3142,9 +3141,6 @@ bool DbGridControl::SaveRow()
catch(SQLException&)
{
EndCursorAction();
- Any aError = cppu::getCaughtException();
- if ( aError.hasValue() )
- displayException( aError );
m_bUpdating = false;
return false;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
