[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/api/RowSet.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 69e264131334134bef9a7069df959ba1ce1406e7
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Mon Dec 16 05:50:34 2013 +0100

    Revert "fdo#72163 after updating m_xComposer, command facets are not dirty"
    
    This reverts commit 938f0e7fe4216d135815b98fdb918f97e747c6bd.
    
    This caused too many bugs to be cleaned up this late in the 4.2
    development cycle:
     - unittest failure; fixed only for the unittested driver.
       (commit 917f9576349240796dfc0cef0f38c9b861c316e7
        Issue of RowSet and Statement each thinking they own
        the ResultSet, and both calling dispose on it...
        After this revert, will not happen because RowSet
        will never generate two ResultSets from the same Statement.)
       Still needs fixing for all other drivers... Not realistic
       in timeframe for 4.2.0.
     - fdo#72696
     - fdo#72463
    
    The following commit still keeps fdo#72163 fixed.
    
    commit 5bfdb6cd5f80f87c5bc6b0bccdad5aad00a45ba3
       fdo#72163 belts and suspenders
    
    Change-Id: Ieb8c8cf1ce9b681b644f34b74a2c6929b3bc300b
    Reviewed-on: https://gerrit.libreoffice.org/7093
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index f2c4345..0429c5e 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2292,8 +2292,6 @@ sal_Bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
 
     _out_rCommandToExecute = m_xComposer->getQueryWithSubstitution();
 
-    m_bCommandFacetsDirty = sal_False;
-
     return bUseEscapeProcessing;
 }