[PATCH libreoffice-4-1] Revert "fdo#65653, fdo#65619, fdo#65216: Missing check"

Lionel Elie Mamane (via Code Review) gerrit at gerrit.libreoffice.org
Tue Jun 18 04:08:40 PDT 2013


I have submitted a patch for review:


To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/4337/1

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
M connectivity/source/parse/sqlnode.cxx
1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
     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];

To view, visit https://gerrit.libreoffice.org/4337
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic68a764e08446a7b669c6030c2bcd55c7d31772b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Lionel Elie Mamane <lionel at mamane.lu>

More information about the LibreOffice mailing list