[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source

[Michael Stahl]

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

New commits:
commit 578128bea222938a38a1fa979264464e5e9ba4b0
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Mon Jul 2 14:52:58 2012 +0200

    fdo#51619 do not ask for parameters if all have already been given
    
    Change-Id: I1c1b1e46e7269bbfa24fbc0c0ebf5ba0f5aad7b9
    (cherry picked from commit c34ef6b710bd9f3a5beac3be856c970c70e68610)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 35482a2..5113e4f 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1820,7 +1820,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
     Reference<XNameAccess>   xParamsAsNames(xParamsAsIndicies, UNO_QUERY);
     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);