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

[Lionel Elie Mamane]

 connectivity/source/drivers/macab/MacabStatement.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 291aa47b6039acb80472769362ce6dca14bd98cb
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Jan 31 17:01:15 2015 +0100

    tdf#88814 parameters are kinda-partially supported, so follow the suggestion
    
    Change-Id: I1a39378d521f128e6b8f35a0bce781435f94e5a8

diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index daa5d07..954252f 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -85,7 +85,6 @@ void MacabCommonStatement::disposing()
 
 void MacabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc::SQLException)
 {
-    impl_throwError(STR_PARA_ONLY_PREPARED);
 }
 
 void MacabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException)
@@ -325,9 +324,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ
     {
         if (SQL_ISRULE(pParseNode, where_clause))
         {
-            // Since we don't support parameters, don't reset them. If we ever
-            // support them, uncomment this line and fix resetParameters.
-            //resetParameters();
+            resetParameters();
             pParseNode = pParseNode->getChild(1);
             MacabCondition *pCondition = analyseWhereClause(pParseNode);
             if (pCondition->isAlwaysTrue())