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

Michaël Lefèvre lefevre00 at yahoo.fr
Thu Mar 12 15:29:50 PDT 2015


 dbaccess/source/ui/misc/WNameMatch.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit aa580276e5415bdf7c5e6eba445f812acd1cbe32
Author: Michaël Lefèvre <lefevre00 at yahoo.fr>
Date:   Thu Mar 12 21:27:17 2015 +0100

    CppCheck cleaning : reduce scope
    
    Change-Id: Iefb21089b9b2a088430314b715df39129fc394bd
    Reviewed-on: https://gerrit.libreoffice.org/14845
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 6ff7531..52af008 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -157,13 +157,15 @@ bool OWizNameMatching::LeavePage()
             OSL_ENSURE((nPos) < static_cast<sal_Int32>(m_pParent->m_vColumnPos.size()),"m_pParent->m_vColumnPos: Illegal index for vector");
             m_pParent->m_vColumnPos[nPos].first = ++nParamPos;
             m_pParent->m_vColumnPos[nPos].second = ::std::distance(rDestColumns.begin(),aDestIter) + 1;
-            bool bNotConvert = true;
 
             TOTypeInfoSP pTypeInfo;
 
             assert(aDestIter != aDestEnd);
             if (aDestIter != aDestEnd)
-                pTypeInfo = m_pParent->convertType((*aDestIter)->second->getSpecialTypeInfo(),bNotConvert);
+            {
+                bool bNotConvert = true;
+                pTypeInfo = m_pParent->convertType((*aDestIter)->second->getSpecialTypeInfo(), bNotConvert);
+            }
 
             sal_Int32 nType = ::com::sun::star::sdbc::DataType::VARCHAR;
             if ( pTypeInfo.get() )


More information about the Libreoffice-commits mailing list