diff options
| -rw-r--r-- | dbaccess/source/core/api/RowSetBase.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/ASqlNameEdit.cxx | 11 | ||||
| -rw-r--r-- | dbaccess/source/sdbtools/connection/objectnames.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/SqlNameEdit.cxx | 13 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 4 |
6 files changed, 21 insertions, 13 deletions
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 14a608368..ca40f51af 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -739,10 +739,12 @@ sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException) return sal_False; if ( rowDeleted() ) + { if ( !m_pCache->m_bRowCountFinal ) return sal_False; else return ( m_nDeletedPosition == impl_getRowCount() ); + } positionCache( MOVE_NONE_REFRESH_ONLY ); sal_Bool bIsLast = m_pCache->isLast(); diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx index d255b7171..cf245d3b1 100644 --- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx +++ b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx @@ -36,11 +36,12 @@ namespace adabasui //------------------------------------------------------------------ sal_Bool isCharOk(sal_Unicode _cChar) { - return (_cChar >= 'A' && _cChar <= 'Z' || - _cChar == '_' || - (_cChar >= '0' && _cChar <= '9') || - (_cChar >= 'a' && _cChar <= 'z')); - + return ( + (_cChar >= 'A' && _cChar <= 'Z') || + _cChar == '_' || + ((_cChar >= '0' && _cChar <= '9')) || + ((_cChar >= 'a' && _cChar <= 'z')) + ); } //------------------------------------------------------------------ sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 918704157..91a994897 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -436,10 +436,12 @@ namespace sdbtools String sBaseName( _BaseName ); if ( sBaseName.Len() == 0 ) + { if ( _CommandType == CommandType::TABLE ) sBaseName = String( SdbtRes( STR_BASENAME_TABLE ) ); else sBaseName = String( SdbtRes( STR_BASENAME_QUERY ) ); + } ::rtl::OUString sName( sBaseName ); sal_Int32 i = 1; diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 04752b2bb..bf9e2b4af 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2358,10 +2358,12 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn { Reference< XInterface > xCurrent(aColumnControls->getByIndex(nViewPos),UNO_QUERY); if (IsSearchableControl(xCurrent)) + { if (pInfo->nFieldPos) --pInfo->nFieldPos; else break; + } } Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 45dbb7500..dce6c4bd3 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -38,12 +38,13 @@ namespace dbaui //------------------------------------------------------------------ sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars) { - return (_cChar >= 'A' && _cChar <= 'Z' || - _cChar == '_' || - _sAllowedChars.indexOf(_cChar) != -1 || - (!_bFirstChar && (_cChar >= '0' && _cChar <= '9')) || - (!_bUpperCase && (_cChar >= 'a' && _cChar <= 'z'))); - + return ( + (_cChar >= 'A' && _cChar <= 'Z') || + _cChar == '_' || + _sAllowedChars.indexOf(_cChar) != -1 || + (!_bFirstChar && (_cChar >= '0' && _cChar <= '9')) || + (!_bUpperCase && (_cChar >= 'a' && _cChar <= 'z')) + ); } //------------------------------------------------------------------ sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 5d7768a16..2e93f9b31 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1301,8 +1301,8 @@ void adjustToolBoxSize(ToolBox* _pToolBox) aSize.Height() = aOldSize.Height(); Size aTbSize = _pToolBox->GetSizePixel(); - if (aSize.Width() && aSize.Width() != aTbSize.Width() || - aSize.Height() && aSize.Height() != aTbSize.Height()) + if ( (aSize.Width() && aSize.Width() != aTbSize.Width()) || + (aSize.Height() && aSize.Height() != aTbSize.Height()) ) { _pToolBox->SetPosSizePixel( _pToolBox->GetPosPixel(), aSize ); _pToolBox->Invalidate(); |