User: hr      
Date: 06/06/19 19:01:39

Modified:
 /dba/connectivity/source/inc/file/
  FStatement.hxx

Log:
 INTEGRATION: CWS warnings01 (1.21.30); FILE MERGED
 2005/12/22 11:45:01 fs 1.21.30.2: #i57457# warning-free code
 2005/11/07 14:44:08 fs 1.21.30.1: #i57457# warning-free code

File Changes:

Directory: /dba/connectivity/source/inc/file/
=============================================

File [changed]: FStatement.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/file/FStatement.hxx?r1=1.21&r2=1.22
Delta lines:  +10 -6
--------------------
--- FStatement.hxx      8 Sep 2005 07:09:18 -0000       1.21
+++ FStatement.hxx      20 Jun 2006 02:01:37 -0000      1.22
@@ -90,6 +90,9 @@
 #ifndef _COMPHELPER_BROADCASTHELPER_HXX_
 #include <comphelper/broadcasthelper.hxx>
 #endif
+#ifndef CONNECTIVITY_TSORTINDEX_HXX
+#include "TSortIndex.hxx"
+#endif
 
 #define SQL_COLUMN_NOTFOUND STRING_NOTFOUND
 
@@ -116,7 +119,7 @@
                        ::std::vector<sal_Int32>                                
        m_aColMapping; // pos 0 is unused so we don't have to decrement 1 
everytime
                        ::std::vector<sal_Int32>                                
        m_aParameterIndexes; // maps the parameter index to column index
                        ::std::vector<sal_Int32>                                
        m_aOrderbyColumnNumber;
-                       ::std::vector<sal_Int16>                                
        m_aOrderbyAscending;
+            ::std::vector<TAscendingOrder>              m_aOrderbyAscending;
 
                        ::com::sun::star::sdbc::SQLWarning                      
                     m_aLastWarning;
                        ::com::sun::star::uno::WeakReference< 
::com::sun::star::sdbc::XResultSet>    m_xResultSet;   // The last ResultSet 
created
@@ -150,6 +153,8 @@
                        sal_Int32                                               
                        m_nResultSetConcurrency;
                        sal_Bool                                                
                        m_bEscapeProcessing;
                        
+            ::cppu::OBroadcastHelper&                   rBHelper;
+
                protected:
                        // initialize the column index map (mapping select 
columns to table columns)
                        void createColumnMapping();
@@ -187,7 +192,6 @@
                public:
                        connectivity::OSQLParseNode* getParseTree() const { 
return m_pParseTree;}
 
-                       ::cppu::OBroadcastHelper& rBHelper;
                        OStatement_Base(OConnection* _pConnection );
 
                        OConnection* getOwnConnection() const { return 
m_pConnection;}




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

Reply via email to