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

[Lionel Elie Mamane]

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

New commits:
commit 961564738d846973344d976f21a61c40ba549fc0
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

diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index ebed52b..b4bb052 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1800,7 +1800,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);