diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-10 11:12:57 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-10 11:12:57 +0100 |
| commit | 7ac57e56a25cb5ff3236553260987dc4894aa452 (patch) | |
| tree | bf86766fde5a15987bf11a8b183b3a16d119c6f4 /dbaccess/source/ui/browser | |
| parent | c38ac7124a3a0f55b155569b8574f1ba4dc734ab (diff) | |
| parent | c78f979010fe079a6e484d139144098571902e05 (diff) | |
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34c
Diffstat (limited to 'dbaccess/source/ui/browser')
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 103267154da0..e8a1b84a5d1f 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -736,7 +736,7 @@ sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _r const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); if (::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING))) xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser; - +#if 0 { const Reference< XPropertySet > xRowSetProps( getRowSet(), UNO_QUERY ); const Reference< XSingleSelectQueryAnalyzer > xAnalyzer( xRowSetProps->getPropertyValue( PROPERTY_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY ); @@ -756,15 +756,23 @@ sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _r } } } +#endif Reference< XWarningsSupplier > xWarnings( _rxLoadable, UNO_QUERY ); if ( xWarnings.is() ) { - SQLExceptionInfo aInfo( xWarnings->getWarnings() ); - if ( aInfo.isValid() ) + try + { + SQLExceptionInfo aInfo( xWarnings->getWarnings() ); + if ( aInfo.isValid() ) + { + showError( aInfo ); + impl_checkForCannotSelectUnfiltered( aInfo ); + } + } + catch(const SQLException& e) { - showError( aInfo ); - impl_checkForCannotSelectUnfiltered( aInfo ); + (void)e; } } |