Tag: cws_src680_dba201
User: oj      
Date: 05/05/09 23:11:17

Modified:
 /dba/dbaccess/source/ui/misc/
  DExport.cxx, WCopyTable.cxx

Log:
 cast to sal_Int32 in debug version

File Changes:

Directory: /dba/dbaccess/source/ui/misc/
========================================

File [changed]: DExport.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/DExport.cxx?r1=1.24&r2=1.24.78.1
Delta lines:  +4 -4
-------------------
--- DExport.cxx 26 Nov 2004 18:19:33 -0000      1.24
+++ DExport.cxx 10 May 2005 06:11:14 -0000      1.24.78.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DExport.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.24.78.1 $
  *
- *  last change: $Author: rt $ $Date: 2004/11/26 18:19:33 $
+ *  last change: $Author: oj $ $Date: 2005/05/10 06:11:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -340,7 +340,7 @@
                OFieldDescription* pField = m_vDestVector[m_nColumnPos]->second;
                if(pField)
                {
-                       OSL_ENSURE((m_bIsAutoIncrement ? m_nColumnPos+1 : 
m_nColumnPos) < m_vColumns.size(),"Illegal index for vector");
+                       OSL_ENSURE((m_bIsAutoIncrement ? m_nColumnPos+1 : 
m_nColumnPos) < static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for 
vector");
                        sal_Int32 nPos = m_vColumns[m_bIsAutoIncrement ? 
m_nColumnPos+1 : m_nColumnPos].first;
                        if(nPos != CONTAINER_ENTRY_NOTFOUND)
                        {
@@ -353,7 +353,7 @@
                                {
                                        sal_Int32 nNumberFormat = 0;
                                        double fOutNumber = 0.0;
-                                       OSL_ENSURE((m_bIsAutoIncrement ? 
m_nColumnPos+1 : m_nColumnPos) < m_vColumnTypes.size(),"Illegal index for 
vector");
+                                       OSL_ENSURE((m_bIsAutoIncrement ? 
m_nColumnPos+1 : m_nColumnPos) < 
static_cast<sal_Int32>(m_vColumnTypes.size()),"Illegal index for vector");
                                        if (m_vColumnTypes[m_bIsAutoIncrement ? 
m_nColumnPos+1 : m_nColumnPos] != DataType::VARCHAR)
                                        {
                                                Reference<XNumberFormatTypes> 
xNumType(m_xFormatter->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY);
@@ -424,7 +424,7 @@
                fOutNumber = 
m_xFormatter->convertStringToNumber(nFormat,aCheckToken);
 
                {
-                       OSL_ENSURE((m_nColumnPos) < m_vColumns.size(),"Illegal 
index for vector");
+                       OSL_ENSURE((m_nColumnPos) < 
static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector");
                        m_vFormatKey[m_vColumns[m_nColumnPos].first] = nFormat; 
// wird sp"ater f"ur die Column gebraucht
                        switch(nType)
                        {
@@ -526,7 +526,7 @@
        }
        catch(Exception&)
        {
-               OSL_ENSURE((m_nColumnPos) < m_vColumns.size(),"Illegal index 
for vector");
+               OSL_ENSURE((m_nColumnPos) < 
static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector");
                m_vFormatKey[m_vColumns[m_nColumnPos].first] =  100;
                nFormat = NumberFormat::TEXT; // Text "uberschreibt alles
        }

File [changed]: WCopyTable.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.39&r2=1.39.68.1
Delta lines:  +1 -1
-------------------
--- WCopyTable.cxx      21 Jan 2005 17:20:11 -0000      1.39
+++ WCopyTable.cxx      10 May 2005 06:11:14 -0000      1.39.68.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WCopyTable.cxx,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.39.68.1 $
  *
- *  last change: $Author: kz $ $Date: 2005/01/21 17:20:11 $
+ *  last change: $Author: oj $ $Date: 2005/05/10 06:11:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -900,7 +900,7 @@
                                        if ( m_vColumnPos.end() != aPosFind )
                                        {
                                                aPosFind->second = nNewPos;
-                                               
OSL_ENSURE(m_vColumnTypes.size() > (aPosFind - m_vColumnPos.begin()),"Invalid 
index for vector!");
+                                               
OSL_ENSURE(static_cast<sal_Int32>(m_vColumnTypes.size()) > (aPosFind - 
m_vColumnPos.begin()),"Invalid index for vector!");
                                                m_vColumnTypes[aPosFind - 
m_vColumnPos.begin()] = (*aFind)->second->GetType();
                                        }
                                }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to