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

[Lionel Elie Mamane]

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

New commits:
commit 5f9d293732bfbf39c2663f28d7f59a2a94339f5a
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Mon Dec 16 06:14:19 2013 +0100

    Revert "fdo#72163 after updating m_xComposer, command facets are not dirty"
    
    This reverts commit d4a709cbf4710555b1518816f1eaa9b43dc5cae7.
    
    This caused too many bugs to be cleaned up within a stable branch:
     - unittest failure; fixed (in master) 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 a stable branch.
     - fdo#72696
     - fdo#72463
    
    fdo#72163 is now fixed in libreoffice-4-1 by what was originally
    thought as the "belts and suspenders" approach, in commit
    "fdo#72163: fix safer way".
    
    Change-Id: I7af95aa73f2001989ec3679f58eb455ebfd7eb38
    Reviewed-on: https://gerrit.libreoffice.org/7095
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

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