[Libreoffice-commits] core.git: connectivity/source

[Lionel Elie Mamane]

 connectivity/source/parse/sqlnode.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed9f8387201b1b70ea14af47d25e9133c7bfcd3c
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jun 18 13:06:45 2013 +0200

    Revert "fdo#65653, fdo#65619, fdo#65216: Missing check"
    
    This reverts commit 10777b37536be16c6d2e167b59e9e31e37ba3517.
    
    The problem has been fixed in a more safe way by making columnMatchP
    treat the case where rParam.xField is not set instead of requiring
    it from all callers.
    
    Change-Id: Ic68a764e08446a7b669c6030c2bcd55c7d31772b

diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index bcc72fc..07c2daf 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -755,7 +755,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, c
     SQLParseNodeParameter aNewParam(rParam);
     //aNewParam.bQuote = sal_True; // why setting this to true? @see http://www.openoffice.org/issues/show_bug.cgi?id=75557
 
-    if (bSimple && (!rParam.xField.is() || !columnMatchP(m_aChildren[0], rParam)))
+    if (bSimple && !columnMatchP(m_aChildren[0], rParam))
         m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam, bSimple );
 
     const OSQLParseNode* pPart2 = m_aChildren[1];