CWS-TOOLING: integrate CWS dba31g_OOO310

2009-02-06 09:31:37 +0100 fs  r267443 : line ends
2009-02-06 09:31:16 +0100 fs  r267442 : line ends
2009-01-26 09:21:13 +0100 msc  r266904 : #i10000# reactive tests
2009-01-21 12:38:53 +0100 msc  r266657 : #i98316# add bugid
2009-01-20 14:49:04 +0100 msc  r266584 : i97307
2009-01-20 13:43:22 +0100 oj  r266572 : #i978i97860# merge changes from dba31h
2009-01-19 12:12:27 +0100 oj  r266487 : #i97307# wrong shortcuts
2009-01-12 11:45:03 +0100 fs  r266139 : #i97867# ImplPaint: don't paint if there are not items (yet)
2009-01-08 20:34:46 +0100 fs  r266039 : ignore output paths
2009-01-08 20:25:45 +0100 fs  r266038 : spelling: unxols4 -> unxsols4
2009-01-08 20:16:10 +0100 fs  r266037 : BUILD_QADEVOOO
2009-01-08 20:15:35 +0100 fs  r266036 : ignore output paths
2009-01-07 22:47:01 +0100 fs  r265978 : close the document after the test
2009-01-07 22:40:22 +0100 fs  r265977 : tweak the test, some behavior worked in a timing-dependent fashion only
2009-01-07 13:21:48 +0100 lla  r265961 : #i96526# need FileAccess instead of File due to URL incompatibity
2009-01-07 12:27:19 +0100 lla  r265959 : #i96526# need FileAccess instead of File due to URL incompatibity
2009-01-06 13:30:04 +0100 fs  r265917 : #158964# GetFormControl: don't accept requests for model which do not belong to the page displayed in the given view
2009-01-06 13:30:04 +0100 fs  r265916 : #158964# GetUnoControl: don't accept requests for a view where a foreign page is displayed
2009-01-06 13:26:37 +0100 fs  r265915 : #158964# FmXPageViewWinRec::dispose: catch exceptions (fixes the symptom, the root cause is fixed elsewhere)
2009-01-06 09:52:38 +0100 oj  r265897 : #i97307# shortcuts
2009-01-06 09:41:26 +0100 fs  r265896 : #i10000#
2009-01-05 13:40:38 +0100 fs  r265866 : CWS-TOOLING: rebase CWS dba31g to trunk@265758 (milestone: DEV300:m38)
2008-12-18 11:35:43 +0100 fs  r265678 : document the new InputRequired property
2008-12-17 07:25:18 +0100 oj  r265578 : #i97307# insert new Accelerators handling in configuration
2008-12-16 09:52:27 +0100 lla  r265526 : #i96526# error message is a problem with no existance default.otr occur
2008-12-16 09:33:14 +0100 oj  r265525 : #i96948# remove merge conflict with StreamName
2008-12-16 09:22:12 +0100 oj  r265524 : #i96935# set reportcomponent for custom shape
2008-12-15 10:32:38 +0100 oj  r265463 : #i96965# do not add connection for selfreferencing table
2008-12-12 14:00:56 +0100 fs  r265416 : #i97044# EnableFocusSelectionHide=FALSE => don't hide selection when not focused (this is more of a side effect), and preserve the selection when gaining the focus (this is the desired effect)
2008-12-11 15:32:32 +0100 fs  r265319 : prevent a deadlock during complex.dbaccess.DatabaseDocument test
2008-12-11 15:31:25 +0100 fs  r265317 : prevent a deadlock during complex.dbaccess.DatabaseDocument test
2008-12-11 13:45:06 +0100 fs  r265296 : #i97137#
2008-12-11 12:43:00 +0100 fs  r265285 : #i97134#
2008-12-10 13:20:28 +0100 lla  r265175 : #94067# add (APP|SYS)FONT to XUnitConversion interface implementation
2008-12-10 13:08:22 +0100 lla  r265173 : #i94067# add (APP|SYS)FONT
2008-12-10 09:21:39 +0100 fs  r265151 : #i95010# implement a non-hacky solution for #i94033#, by making Begin/Do/EndCompleteRedraw virtual
2008-12-09 17:29:32 +0100 fs  r265120 : #i96636#

3 files changed, 3 insertions, 1 deletions

diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index efd2d04135..931beb7254 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -38,9 +38,9 @@ using namespace connectivity;
 // -----------------------------------------------------------------------------
 OSkipDeletedSet::OSkipDeletedSet(IResultSetHelper* _pHelper)
     : m_pHelper(_pHelper)
+    ,m_bDeletedVisible(false)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen@sun.com", "OSkipDeletedSet::OSkipDeletedSet" );
-    m_bDeletedVisible = m_pHelper->deletedVisible();
     m_aBookmarksPositions.reserve(256);
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index ba0c2d7cf1..880573431a 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -135,6 +135,7 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator&	_aSQLIterat
 
     m_nResultSetConcurrency = isCount() ? ResultSetConcurrency::READ_ONLY : ResultSetConcurrency::UPDATABLE;
     construct();
+    m_aSkipDeletedSet.SetDeleted(m_bShowDeleted);
     osl_decrementInterlockedCount( &m_refCount );
 }
 
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 7f2f962056..de69379e66 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -101,6 +101,7 @@ namespace connectivity
             @return the last position
         */
         inline sal_Int32	getLastPosition() const { return m_aBookmarksPositions.size(); }
+        inline void SetDeleted(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
     };
 }
 #endif // CONNECTIVITY_SKIPDELETEDSSET_HXX