diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-16 15:50:45 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-16 15:50:45 +0100 |
| commit | b7caadff93f5b147cfa9f63bc056566256641165 (patch) | |
| tree | 91a3892eddf41e3c3e556070df69bcbff45415d7 | |
| parent | c6b2dff376fa217003808e6b001cd9c3eb113f5f (diff) | |
autorecovery: do not show errors when we're recovering the query designer
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 05bac818cdee..380c8646c5bf 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1664,13 +1664,13 @@ short OQueryController::saveModified() return nRet; } // ----------------------------------------------------------------------------- -void OQueryController::impl_reset( const bool i_bIgnoreQuerySettings ) +void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings ) { bool bValid = false; Sequence< PropertyValue > aLayoutInformation; // get command from the query if a query name was supplied - if ( !i_bIgnoreQuerySettings && !editingCommand() ) + if ( !i_bForceCurrentControllerSettings && !editingCommand() ) { if ( m_sName.getLength() ) { @@ -1751,7 +1751,7 @@ void OQueryController::impl_reset( const bool i_bIgnoreQuerySettings ) m_pSqlIterator->traverseAll(); if ( m_pSqlIterator->hasErrors() ) { - if ( !editingView() ) + if ( !i_bForceCurrentControllerSettings && !editingView() ) { impl_showAutoSQLViewError( makeAny( m_pSqlIterator->getErrors() ) ); } @@ -1760,7 +1760,7 @@ void OQueryController::impl_reset( const bool i_bIgnoreQuerySettings ) } else { - if ( !editingView() ) + if ( !i_bForceCurrentControllerSettings && !editingView() ) { String aTitle(ModuleRes(STR_SVT_SQL_SYNTAX_ERROR)); OSQLMessageBox aDlg(getView(),aTitle,aErrorMsg); |