dba34d: merge from dba34c

6 files changed, 128 insertions, 91 deletions

diff --git a/dbaccess/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java
index e78f6859fb88..40af4387bb5c 100644
--- a/dbaccess/qa/complex/dbaccess/Query.java
+++ b/dbaccess/qa/complex/dbaccess/Query.java
@@ -40,7 +40,8 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 // ------------------------------------------
 
-public class Query extends TestCase {
+public class Query extends TestCase
+{
 
     connectivity.tools.HsqlDatabase m_database;
 
@@ -49,17 +50,17 @@ public class Query extends TestCase {
     {
         try
         {
-            if ( m_database == null )
+            if (m_database == null)
             {
-                final CRMDatabase database = new CRMDatabase( getMSF(), false );
+                final CRMDatabase database = new CRMDatabase(getMSF(), false);
                 m_database = database.getDatabase();
             }
         }
-        catch( Exception e )
+        catch (Exception e)
         {
-            System.out.println( "could not create the test case, error message:\n" + e.getMessage() );
-            e.printStackTrace( System.err );
-            fail( "failed to created the test case");
+            System.out.println("could not create the test case, error message:\n" + e.getMessage());
+            e.printStackTrace(System.err);
+            fail("failed to created the test case");
         }
     }
 
@@ -68,7 +69,6 @@ public class Query extends TestCase {
 //    {
 //        return (XMultiServiceFactory)param.getMSF();
 //    }
-
     // --------------------------------------------------------------------------------------------------------
     @Test
     public void testQueryColumns()
@@ -90,23 +90,26 @@ public class Query extends TestCase {
 
             for ( int i = 0; i < queryNames.length; ++i )
             {
-                final XPropertySet query = UnoRuntime.queryInterface(
-                    XPropertySet.class, queries.getByName( queryNames[i] ) );
+                if (queries.hasByName(queryNames[i]))
+                {
+                    final XPropertySet query = UnoRuntime.queryInterface(
+                        XPropertySet.class, queries.getByName( queryNames[i] ) );
 
-                final XColumnsSupplier suppCols = UnoRuntime.queryInterface(
-                    XColumnsSupplier.class, query);
-                final XIndexAccess columns = UnoRuntime.queryInterface(
-                    XIndexAccess.class, suppCols.getColumns());
+                    final XColumnsSupplier suppCols = UnoRuntime.queryInterface(
+                        XColumnsSupplier.class, query);
+                    final XIndexAccess columns = UnoRuntime.queryInterface(
+                                XIndexAccess.class, suppCols.getColumns());
 
-                // check whether the columns supplied by the query match what we expected
-                assertTrue( "invalid column count (found " + columns.getCount() + ", expected: " + expectedColumnNames[i].length + ") for query \"" + queryNames[i] + "\"",
-                    columns.getCount() == expectedColumnNames[i].length );
-                for ( int col = 0; col < columns.getCount(); ++col )
-                {
-                    final XNamed columnName = UnoRuntime.queryInterface(
-                        XNamed.class, columns.getByIndex(col) );
-                    assertTrue( "column no. " + col + " of query \"" + queryNames[i] + "\" not matching",
-                        columnName.getName().equals( expectedColumnNames[i][col] ) );
+                    // check whether the columns supplied by the query match what we expected
+                    assertTrue( "invalid column count (found " + columns.getCount() + ", expected: " + expectedColumnNames[i].length + ") for query \"" + queryNames[i] + "\"",
+                        columns.getCount() == expectedColumnNames[i].length );
+                    for ( int col = 0; col < columns.getCount(); ++col )
+                    {
+                        final XNamed columnName = UnoRuntime.queryInterface(
+                            XNamed.class, columns.getByIndex(col) );
+                        assertTrue( "column no. " + col + " of query \"" + queryNames[i] + "\" not matching",
+                            columnName.getName().equals( expectedColumnNames[i][col] ) );
+                    }
                 }
             }
         }
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index 7716f7f30512..921aff2046ef 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -435,6 +435,10 @@ public class RowSet extends TestCase
         testCursorMove(m_resultSet, cResSet.getMethod(NEXT, (Class[]) null), pRow, moves, null);
 
         moves[RowSetEventListener.IS_MODIFIED] = false;
+        updRow.updateString(2, m_row.getString(2));
+        testCursorMove(m_resultSet, cResSet.getMethod(NEXT, (Class[]) null), pRow, moves, null);
+
+        moves[RowSetEventListener.IS_MODIFIED] = false;
         final Class cupd = Class.forName("com.sun.star.sdbc.XResultSetUpdate");
         final XResultSetUpdate upd = UnoRuntime.queryInterface( XResultSetUpdate.class, m_resultSet );
         testCursorMove(upd, cupd.getMethod("moveToInsertRow", (Class[]) null), pRow, moves, null);
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 4118794d5b52..38220bcade48 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -595,6 +595,7 @@ void ORowSet::freeResources( bool _bComplete )
         m_bAfterLast    = sal_False;
         m_bNew          = sal_False;
         m_bModified     = sal_False;
+        m_bIsInsertRow  = sal_False;
         m_bLastKnownRowCountFinal = sal_False;
         m_nLastKnownRowCount      = 0;
         if ( m_aOldRow.isValid() )
@@ -707,6 +708,7 @@ void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x)
     ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get());
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateValue(columnIndex,x,rRow,aNotify.getChangedColumns());
+    m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
     aNotify.firePropertyChange();
 }
 // -------------------------------------------------------------------------
@@ -722,6 +724,7 @@ void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, R
     ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get());
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateNull(columnIndex,rRow,aNotify.getChangedColumns());
+    m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
     aNotify.firePropertyChange();
 }
 // -------------------------------------------------------------------------
@@ -819,6 +822,7 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer
     ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get());
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateCharacterStream(columnIndex,x,length,rRow,aNotify.getChangedColumns());
+    m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
     aNotify.firePropertyChange();
 }
 // -------------------------------------------------------------------------
@@ -862,6 +866,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw
         ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get());
         ORowSetNotifier aNotify(this,rRow);
         m_pCache->updateObject(columnIndex,aNewValue,rRow,aNotify.getChangedColumns());
+        m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
         aNotify.firePropertyChange();
     }
 }
@@ -875,6 +880,7 @@ void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x,
     ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get());
     ORowSetNotifier aNotify(this,rRow);
     m_pCache->updateNumericObject(columnIndex,x,scale,rRow,aNotify.getChangedColumns());
+    m_bModified = m_bModified || !aNotify.getChangedColumns().empty();
     aNotify.firePropertyChange();
 }
 // -------------------------------------------------------------------------
@@ -892,52 +898,49 @@ void SAL_CALL ORowSet::insertRow(  ) throw(SQLException, RuntimeException)
     if(!m_pCache || !m_bNew || !m_bModified || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
         throwFunctionSequenceException(*this);
 
-    if(m_bModified)
-    {
-        // remember old value for fire
-        sal_Bool bOld = m_bNew;
+    // remember old value for fire
+    sal_Bool bOld = m_bNew;
 
-        ORowSetRow aOldValues;
-        if ( !m_aCurrentRow.isNull() )
-            aOldValues = new ORowSetValueVector( m_aCurrentRow->getBody() );
-        Sequence<Any> aChangedBookmarks;
-        RowsChangeEvent aEvt(*this,RowChangeAction::INSERT,1,aChangedBookmarks);
-        notifyAllListenersRowBeforeChange(aGuard,aEvt);
+    ORowSetRow aOldValues;
+    if ( !m_aCurrentRow.isNull() )
+        aOldValues = new ORowSetValueVector( m_aCurrentRow->getBody() );
+    Sequence<Any> aChangedBookmarks;
+    RowsChangeEvent aEvt(*this,RowChangeAction::INSERT,1,aChangedBookmarks);
+    notifyAllListenersRowBeforeChange(aGuard,aEvt);
 
-        ::std::vector< Any > aBookmarks;
-        sal_Bool bInserted = m_pCache->insertRow(aBookmarks);
+    ::std::vector< Any > aBookmarks;
+    sal_Bool bInserted = m_pCache->insertRow(aBookmarks);
 
-        // make sure that our row is set to the new inserted row before clearing the insert flags in the cache
-        m_pCache->resetInsertRow(bInserted);
+    // make sure that our row is set to the new inserted row before clearing the insert flags in the cache
+    m_pCache->resetInsertRow(bInserted);
 
-        // notification order
-        // - column values
-        setCurrentRow( sal_False, sal_True, aOldValues, aGuard ); // we don't move here
+    // notification order
+    // - column values
+    setCurrentRow( sal_False, sal_True, aOldValues, aGuard ); // we don't move here
 
-        // read-only flag restored
-        impl_restoreDataColumnsWriteable_throw();
+    // read-only flag restored
+    impl_restoreDataColumnsWriteable_throw();
 
-        // - rowChanged
-        notifyAllListenersRowChanged(aGuard,aEvt);
+    // - rowChanged
+    notifyAllListenersRowChanged(aGuard,aEvt);
 
-        if ( !aBookmarks.empty() )
-        {
-            RowsChangeEvent aUpEvt(*this,RowChangeAction::UPDATE,aBookmarks.size(),Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size()));
-            notifyAllListenersRowChanged(aGuard,aUpEvt);
-        }
+    if ( !aBookmarks.empty() )
+    {
+        RowsChangeEvent aUpEvt(*this,RowChangeAction::UPDATE,aBookmarks.size(),Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size()));
+        notifyAllListenersRowChanged(aGuard,aUpEvt);
+    }
 
-        // - IsModified
-        if(!m_bModified)
-            fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
-        OSL_ENSURE( !m_bModified, "ORowSet::insertRow: just updated, but _still_ modified?" );
+    // - IsModified
+    if(!m_bModified)
+        fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
+    OSL_ENSURE( !m_bModified, "ORowSet::insertRow: just updated, but _still_ modified?" );
 
-        // - IsNew
-        if(m_bNew != bOld)
-            fireProperty(PROPERTY_ID_ISNEW,m_bNew,bOld);
+    // - IsNew
+    if(m_bNew != bOld)
+        fireProperty(PROPERTY_ID_ISNEW,m_bNew,bOld);
 
-        // - RowCount/IsRowCountFinal
-        fireRowcount();
-    }
+    // - RowCount/IsRowCountFinal
+    fireRowcount();
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ORowSet::getRow(  ) throw(SQLException, RuntimeException)
@@ -946,7 +949,7 @@ sal_Int32 SAL_CALL ORowSet::getRow(  ) throw(SQLException, RuntimeException)
     checkCache();
 
     // check if we are inserting a row
-    return (m_pCache && ( m_pCache->m_bNew || m_bModified )) ? 0 : ORowSetBase::getRow();
+    return (m_pCache && isInsertRow()) ? 0 : ORowSetBase::getRow();
 }
 // -------------------------------------------------------------------------
 void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException)
@@ -975,6 +978,7 @@ void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException)
         aEvt.Rows += aBookmarks.size();
         m_aBookmark     = m_pCache->getBookmark();
         m_aCurrentRow   = m_pCache->m_aMatrixIter;
+        m_bIsInsertRow  = sal_False;
         if ( m_pCache->m_aMatrixIter != m_pCache->getEnd() && (*m_pCache->m_aMatrixIter).isValid() )
         {
             if ( m_pCache->isResultSetChanged() )
@@ -1085,6 +1089,7 @@ void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQL
 
     m_aBookmark     = m_pCache->getBookmark();
     m_aCurrentRow   = m_pCache->m_aMatrixIter;
+    m_bIsInsertRow  = sal_False;
     m_aCurrentRow.setBookmark(m_aBookmark);
 
     // notification order
@@ -1219,6 +1224,7 @@ void SAL_CALL ORowSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 
         m_pCache->moveToInsertRow();
         m_aCurrentRow = m_pCache->m_aInsertRow;
+        m_bIsInsertRow  = sal_True;
 
         // set read-only flag to false
         impl_setDataColumnsWriteable_throw();
@@ -1829,6 +1835,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
             }
             m_pCache->setFetchSize(m_nFetchSize);
             m_aCurrentRow   = m_pCache->createIterator(this);
+            m_bIsInsertRow  = sal_False;
             m_aOldRow       = m_pCache->registerOldRow();
         }
 
@@ -2716,6 +2723,7 @@ void ORowSet::doCancelModification( )
         m_pCache->cancelRowModification();
     }
     m_bModified = sal_False;
+    m_bIsInsertRow = sal_False;
 }
 
 // -----------------------------------------------------------------------------
@@ -2739,14 +2747,12 @@ sal_Bool ORowSet::isNew( )
 // -----------------------------------------------------------------------------
 void ORowSet::checkUpdateIterator()
 {
-    if(!m_bModified && !m_bNew)
+    if(!m_bIsInsertRow)
     {
         m_pCache->setUpdateIterator(m_aCurrentRow);
         m_aCurrentRow = m_pCache->m_aInsertRow;
-        m_bModified = sal_True;
-    } // if(!m_bModified && !m_bNew)
-    else if ( m_bNew ) // here we are modifing a value
-        m_bModified = sal_True;
+        m_bIsInsertRow = sal_True;
+    }
 }
 // -----------------------------------------------------------------------------
 void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 4cb218d628b6..b8f489d65728 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -112,6 +112,7 @@ ORowSetBase::ORowSetBase( const ::comphelper::ComponentContext& _rContext, ::cpp
     ,m_bIgnoreResult(sal_False)
     ,m_bBeforeFirst(sal_True) // changed from sal_False
     ,m_bAfterLast(sal_False)
+    ,m_bIsInsertRow(sal_False)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::ORowSetBase" );
     DBG_CTOR(ORowSetBase,NULL);
@@ -257,6 +258,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
         // currentrow is null when the clone moves the window
         positionCache( MOVE_NONE_REFRESH_ONLY );
         m_aCurrentRow   = m_pCache->m_aMatrixIter;
+        m_bIsInsertRow  = sal_False;
         OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
 
         bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->isValid() );
@@ -398,6 +400,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
     {
         positionCache( MOVE_NONE_REFRESH_ONLY );
         m_aCurrentRow   = m_pCache->m_aMatrixIter;
+        m_bIsInsertRow  = sal_False;
         OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getBinaryStream: we don't stand on a valid row! Row is null.");
 
         bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->isValid() );
@@ -1121,6 +1124,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
         m_aBookmark     = m_pCache->getBookmark();
         OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
         m_aCurrentRow   = m_pCache->m_aMatrixIter;
+        m_bIsInsertRow  = sal_False;
         OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!");
         m_aCurrentRow.setBookmark(m_aBookmark);
         OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!");
@@ -1136,6 +1140,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
 #endif
         OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion");
         m_aCurrentRow   = m_pCache->m_aMatrixIter;
+        m_bIsInsertRow  = sal_False;
         OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
 #if OSL_DEBUG_LEVEL > 0
         ORowSetRow rRow = (*m_aCurrentRow);
@@ -1147,6 +1152,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
         {
             positionCache( MOVE_NONE_REFRESH_ONLY );
             m_aCurrentRow   = m_pCache->m_aMatrixIter;
+            m_bIsInsertRow  = sal_False;
             OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
         }
     }
@@ -1574,7 +1580,8 @@ void ORowSetNotifier::firePropertyChange()
         {
             m_pRowSet->firePropertyChange((*aIter)-1 ,m_pImpl->aRow[(*aIter)-1], ORowSetBase::GrantNotifierAccess());
         }
-        m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess());
+        if ( !m_pImpl->aChangedColumns.empty() )
+            m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess());
     }
 }
 }   // namespace dbaccess
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 9a7e9182e1d0..83b4d2fb74ef 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -158,6 +158,7 @@ namespace dbaccess
         sal_Bool                                m_bIgnoreResult ;
         sal_Bool                                m_bBeforeFirst  : 1;
         sal_Bool                                m_bAfterLast    : 1;
+        sal_Bool                                m_bIsInsertRow  : 1;
 
     protected:
         ORowSetBase(
@@ -383,7 +384,7 @@ namespace dbaccess
         inline  sal_Bool    isModification( const GrantNotifierAccess& ) { return isModification(); }
         inline  sal_Bool    isModified( const GrantNotifierAccess& ) { return isModified(); }
         inline  sal_Bool    isNew( const GrantNotifierAccess& ) { return isNew(); }
-        inline  sal_Bool    isInsertRow() { return isNew() || isModified(); }
+        inline  sal_Bool    isInsertRow() { return m_bIsInsertRow; } // isNew() || isModified(); }
         inline  void        fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld, const GrantNotifierAccess& )
         {
             fireProperty( _nProperty, _bNew, _bOld );
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 7401a1016e53..68ea76e7244c 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -563,13 +563,16 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector&
     checkUpdateConditions(columnIndex);
 
     ORowSetValueVector::Vector& rInsert = ((*m_aInsertRow)->get());
-    rInsert[columnIndex].setBound(sal_True);
-    rInsert[columnIndex].setNull();
-    rInsert[columnIndex].setModified();
-    io_aRow[columnIndex].setNull();
+    if ( !rInsert[columnIndex].isNull() )
+    {
+        rInsert[columnIndex].setBound(sal_True);
+        rInsert[columnIndex].setNull();
+        rInsert[columnIndex].setModified();
+        io_aRow[columnIndex].setNull();
 
-    m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
-    impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+        m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
+        impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+    }
 }
 // -----------------------------------------------------------------------------
 void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
@@ -580,13 +583,16 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
     checkUpdateConditions(columnIndex);
 
     ORowSetValueVector::Vector& rInsert = ((*m_aInsertRow)->get());
-    rInsert[columnIndex].setBound(sal_True);
-    rInsert[columnIndex] = x;
-    rInsert[columnIndex].setModified();
-    io_aRow[columnIndex] = rInsert[columnIndex];
+    if ( rInsert[columnIndex] != x )
+    {
+        rInsert[columnIndex].setBound(sal_True);
+        rInsert[columnIndex] = x;
+        rInsert[columnIndex].setModified();
+        io_aRow[columnIndex] = rInsert[columnIndex];
 
-    m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
-    impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+        m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
+        impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+    }
 }
 // -------------------------------------------------------------------------
 void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x
@@ -618,13 +624,18 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
     checkUpdateConditions(columnIndex);
 
     ORowSetValueVector::Vector& rInsert = ((*m_aInsertRow)->get());
-    rInsert[columnIndex].setBound(sal_True);
-    rInsert[columnIndex] = x;
-    rInsert[columnIndex].setModified();
-    io_aRow[columnIndex] = rInsert[columnIndex];
+    ORowSetValue aTemp;
+    aTemp.fill(x);
+    if ( rInsert[columnIndex] != aTemp )
+    {
+        rInsert[columnIndex].setBound(sal_True);
+        rInsert[columnIndex] = aTemp;
+        rInsert[columnIndex].setModified();
+        io_aRow[columnIndex] = rInsert[columnIndex];
 
-    m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
-    impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+        m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
+        impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+    }
 }
 // -------------------------------------------------------------------------
 void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/
@@ -635,13 +646,18 @@ void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal
     checkUpdateConditions(columnIndex);
 
     ORowSetValueVector::Vector& rInsert = ((*m_aInsertRow)->get());
-    rInsert[columnIndex].setBound(sal_True);
-    rInsert[columnIndex] = x;
-    rInsert[columnIndex].setModified();
-    io_aRow[columnIndex] = rInsert[columnIndex];
+    ORowSetValue aTemp;
+    aTemp.fill(x);
+    if ( rInsert[columnIndex] != aTemp )
+    {
+        rInsert[columnIndex].setBound(sal_True);
+        rInsert[columnIndex] = aTemp;
+        rInsert[columnIndex].setModified();
+        io_aRow[columnIndex] = rInsert[columnIndex];
 
-    m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
-    impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+        m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
+        impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
+    }
 }
 // -------------------------------------------------------------------------
 // XResultSet