diff options
Diffstat (limited to 'dbaccess/source/ui/uno/copytablewizard.cxx')
| -rw-r--r-- | dbaccess/source/ui/uno/copytablewizard.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 2b36c63e7..1efac1617 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1018,18 +1018,18 @@ namespace else (m_xDest.get()->*_pSetter)( m_rDestPos, value ); } - - template< typename VALUE_TYPE > + template< typename VALUE_TYPE > void transferComplexValue( VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ), void (SAL_CALL XParameters::*_pSetter)( sal_Int32, const VALUE_TYPE& ) ) { - VALUE_TYPE value( (m_xSource.get()->*_pGetter)( m_rSourcePos ) ); + const VALUE_TYPE value( (m_xSource.get()->*_pGetter)( m_rSourcePos ) ); + { if ( m_xSource->wasNull() ) m_xDest->setNull( m_rDestPos, m_rColTypes[ m_rSourcePos ] ); else (m_xDest.get()->*_pSetter)( m_rDestPos, value ); + } } - private: const sal_Int32& m_rSourcePos; const sal_Int32& m_rDestPos; @@ -1193,7 +1193,9 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou bContinue = _rxSourceResultSet->next(); if ( !bContinue ) + { break; + } ++nRowCount; sal_Bool bInsertAutoIncrement = sal_True; @@ -1219,7 +1221,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou // otherwise we don't get the correct value when only the 2nd source column was selected continue; } - + if ( bAutoIncrement && bInsertAutoIncrement ) { xStatementParams->setInt( 1, nRowCount ); |