[PATCH] [REVIEW:3-5,3-5-5] fdo#51619 crash regression in 3.5.5 wrt to 3.5.4

The fix to fdo#47473 exposed (the underlying reason for) fdo#51619
which could not be triggered before. So from the point of view of the
user, this is a regression in 3.5.5 wrt to 3.5.4: 3.5.4 did not crash
and 3.5.5 does.

Attached patch fixes that. Please apply to libreoffice-3-5; is there
still any chance for libreoffice-3-5-5? It would be nice to avoid
3.5.5 having a crash regression wrt to 3.5.4, but at this point I fear
this would mean adding a 3.5.5.rc3 and thus delaying the 3.5.5
release. Do we want to do that? (Note that as of right now the fix has
been texted only by myself.)


Thanks.

-- 
Lionel

From 4b51fb0b56c19d8c32d32adb8ea10ab5b586b403 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Mon, 2 Jul 2012 14:52:58 +0200
Subject: [PATCH] fdo#51619 do not ask for parameters if all have already been
 given

Change-Id: I1c1b1e46e7269bbfa24fbc0c0ebf5ba0f5aad7b9
---
 connectivity/source/commontools/dbtools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index 755fe9e..9286efd 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1819,7 +1819,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& 
_xComposer,
     Reference<XIndexAccess>  xParamsAsIndicies = xParameters.is() ? xParameters->getParameters() : 
Reference<XIndexAccess>();
     sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
     ::std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet );
-    if ( nParamCount || ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != 
nParamCount )
+    if ( nParamCount && ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != 
nParamCount )
     {
         static const ::rtl::OUString 
PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
         aNewParameterSet.resize(nParamCount ,false);
-- 
1.7.10