User: hr      
Date: 06/06/19 18:04:52

Modified:
 /dba/connectivity/source/commontools/
  TSortIndex.cxx

Log:
 INTEGRATION: CWS warnings01 (1.6.30); FILE MERGED
 2005/12/22 11:44:03 fs 1.6.30.2: #i57457# warning-free code
 2005/11/07 14:42:59 fs 1.6.30.1: #i57457# warning-free code

File Changes:

Directory: /dba/connectivity/source/commontools/
================================================

File [changed]: TSortIndex.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/TSortIndex.cxx?r1=1.6&r2=1.7
Delta lines:  +13 -11
---------------------
--- TSortIndex.cxx      8 Sep 2005 05:13:14 -0000       1.6
+++ TSortIndex.cxx      20 Jun 2006 01:04:50 -0000      1.7
@@ -81,6 +81,8 @@
                                                return nGreater;
                                }
                                break;
+                case SQL_ORDERBYKEY_NONE:
+                    break;
                        }
                }
 
@@ -105,10 +107,10 @@
 }
 // 
-----------------------------------------------------------------------------
 OSortIndex::OSortIndex(        const ::std::vector<OKeyType>& _aKeyType,       
        
-                                               const ::std::vector<sal_Int16>& 
_aAscending)    
-       : m_bFrozen(sal_False) 
+                        const ::std::vector<TAscendingOrder>& _aAscending)
+       :m_aKeyType(_aKeyType)
         ,m_aAscending(_aAscending)
-        ,m_aKeyType(_aKeyType)
+    ,m_bFrozen(sal_False)
 {
 }
 //------------------------------------------------------------------
@@ -152,7 +154,7 @@
 sal_Int32 OSortIndex::GetValue(sal_Int32 nPos) const
 {
        OSL_ENSURE(nPos > 0,"OSortIndex::GetValue: nPos == 0");
-       OSL_ENSURE(nPos <= m_aKeyValues.size(),"OSortIndex::GetValue: Zugriff 
ausserhalb der Array-Grenzen");
+       OSL_ENSURE((size_t)nPos <= m_aKeyValues.size(),"OSortIndex::GetValue: 
Zugriff ausserhalb der Array-Grenzen");
 
        if (!m_bFrozen && m_aKeyType[0] != SQL_ORDERBYKEY_NONE)
        {




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

Reply via email to