./packages/libreoffice/3.3.0/experimental r2180: rediff smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
------------------------------------------------------------
revno: 2180
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-11-10 11:32:10 +0100
message:
rediff smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
modified:
changelog
smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
=== modified file 'changelog'
--- a/changelog 2010-11-09 09:09:30 +0000
+++ b/changelog 2010-11-10 10:32:10 +0000
@@ -38,8 +38,10 @@
backports to debian-backports@l.d.o
* debian/rules, debian/control.in: hi-IN -> hi
* debian/watch: update to look for libreoffice-build
+ * debian/smoketest/smoketest-disable-db-insert-delete-seek-tests.diff:
+ rediff (closes: #603008)
- -- Rene Engelhard <rene@debian.org> Sat, 06 Nov 2010 16:36:32 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Nov 2010 11:30:30 +0100
libreoffice (1:3.3.0~beta2-2) experimental; urgency=low
=== modified file 'smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff'
--- a/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff 2010-07-14 14:48:51 +0000
+++ b/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff 2010-11-10 10:32:10 +0000
@@ -10,58 +10,58 @@
const cMessageDatabaseClose = "Close Database"
Sub TestDB (FilterType as Integer)
-@@ -61,54 +58,6 @@
- SetStatus (FilterType, cDBService, not IsNull (oRowSet))
- End If
-
-- nCurrentAction = cDBInsert
-- sCurrentMessage = cMessageDatabaseInsert
--
-- oRowSet.ActiveConnection = oDBConnection
+@@ -87,54 +87,6 @@ Const sTestString = "Automatical Test"
+ SetStatus (FilterType, cDBService, not IsNull (oRowSet))
+ End If
+
+- nCurrentAction = cDBInsert
+- sCurrentMessage = cMessageDatabaseInsert
+-
+- oRowSet.ActiveConnection = oDBConnection
-
- oRowSet.CommandType = com.sun.star.sdb.CommandType.COMMAND
- oRowSet.Command = "SELECT * FROM " + sTable
-- oRowSet.execute()
--
-- oRowSet.moveToInsertRow
-- oRowSet.updateString(5, sTestString)
--
-- oRowSet.insertRow()
-- nRowCount=oRowSet.RowCount
--
-- oRowSet.moveToCurrentRow()
--
-- bResult = (oRowSet.getString(5) = sTestString)
-- LogState (bResult, "Database "+ cMessageDatabaseInsert, FileChannel)
-- LogState (bResult, "Database "+ cMessageDatabaseInsert, MainFileChannel)
-- SetStatus (FilterType, cDBInsert, bResult)
--
-- 'delete only if insert passed
--
-- if (bResult) Then
-- nCurrentAction = cDBDelete
-- sCurrentMessage = cMessageDatabaseDelete
-- oRowSet.deleteRow()
-- bResult = (nRowCount - oRowSet.RowCount = 0)
-- if ( bResult ) Then
-- oRowSet.next()
-- bResult = (nRowCount - oRowSet.RowCount = 1)
-- End If
-- LogState (bResult, "Database "+ cMessageDatabaseDelete, FileChannel)
-- LogState (bResult, "Database "+ cMessageDatabaseDelete, MainFileChannel)
-- SetStatus (FilterType, cDBDelete, bResult)
-- End If
--
-- ' read other record
--
-- nCurrentAction = cDBSeek
-- sCurrentMessage = cMessageDatabaseSeek
-- oRowSet.first()
-- bResult = not (oRowSet.getString(5) = sTestString)
-- LogState (bResult, "Database "+ cMessageDatabaseSeek, FileChannel)
-- LogState (bResult, "Database "+ cMessageDatabaseSeek, MainFileChannel)
-- SetStatus (FilterType, cDBSeek, bResult)
--
- nCurrentAction = cDBClose
- sCurrentMessage = cMessageDatabaseClose
- oDBConnection.Dispose()
+- oRowSet.execute()
+-
+- oRowSet.moveToInsertRow
+- oRowSet.updateString(5, sTestString)
+-
+- oRowSet.insertRow()
+- nRowCount=oRowSet.RowCount
+-
+- oRowSet.moveToCurrentRow()
+-
+- bResult = (oRowSet.getString(5) = sTestString)
+- LogState (bResult, "Database "+ cMessageDatabaseInsert, FileChann
+- LogState (bResult, "Database "+ cMessageDatabaseInsert, MainFileC
+- SetStatus (FilterType, cDBInsert, bResult)
+-
+- 'delete only if insert passed
+-
+- if (bResult) Then
+- nCurrentAction = cDBDelete
+- sCurrentMessage = cMessageDatabaseDelete
+- oRowSet.deleteRow()
+- bResult = (nRowCount - oRowSet.RowCount = 0)
+- if ( bResult ) Then
+- oRowSet.next()
+- bResult = (nRowCount - oRowSet.RowCount = 1)
+- End If
+- LogState (bResult, "Database "+ cMessageDatabaseDelete, FileC
+- LogState (bResult, "Database "+ cMessageDatabaseDelete, MainF
+- SetStatus (FilterType, cDBDelete, bResult)
+- End If
+-
+- ' read other record
+-
+- nCurrentAction = cDBSeek
+- sCurrentMessage = cMessageDatabaseSeek
+- oRowSet.first()
+- bResult = not (oRowSet.getString(5) = sTestString)
+- LogState (bResult, "Database "+ cMessageDatabaseSeek, FileChannel
+- LogState (bResult, "Database "+ cMessageDatabaseSeek, MainFileCha
+- SetStatus (FilterType, cDBSeek, bResult)
+-
+ nCurrentAction = cDBClose
+ sCurrentMessage = cMessageDatabaseClose
+ oDBConnection.Dispose()
Reply to: