User: hr      
Date: 2007-11-01 14:50:40+0000
Modified:
   dba/connectivity/source/drivers/file/fcomp.cxx

Log:
 INTEGRATION: CWS dba24b (1.26.124); FILE MERGED
 2007/09/28 11:12:43 oj 1.26.124.2: RESYNC: (1.26-1.27); FILE MERGED
 2007/08/23 12:17:54 oj 1.26.124.1: #i31030 chanfge to in too

File Changes:

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

File [changed]: fcomp.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/fcomp.cxx?r1=1.27&r2=1.28
Delta lines:  +4 -4
-------------------
--- fcomp.cxx   2007-09-26 14:29:12+0000        1.27
+++ fcomp.cxx   2007-11-01 14:50:37+0000        1.28
@@ -146,7 +146,7 @@
                                OSQLParseNode *pColumnRef = 
pSelection->getChild(i)->getChild(0);
                                if ( SQL_ISRULE(pColumnRef,general_set_fct) && 
pColumnRef->count() != 4 )
                                {
-                                       
::dbtools::throwGenericSQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Statement
 to complex. Only \"COUNT(*)\" is supported.")),NULL);
+                                       
::dbtools::throwGenericSQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Statement
 too complex. Only \"COUNT(*)\" is supported.")),NULL);
                                }
                        }
                }
@@ -287,7 +287,7 @@
                  // upper, lower etc.
                  SQL_ISRULE(pPredicateNode->getChild(2),fold)) )
        {
-               
::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Statement 
to complex"),NULL);
+               
::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Statement 
too complex"),NULL);
                return NULL;
        }
 
@@ -614,7 +614,7 @@
                        }
                }
                else
-                       
::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Statement 
to complex"),NULL);
+                       
::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Statement 
too complex"),NULL);
 
        }
        else if( SQL_ISRULE(pPredicateNode,fold) )
@@ -634,7 +634,7 @@
        }
        else
        {
-               
::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Statement 
to complex"),NULL);
+               
::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Statement 
too complex"),NULL);
        }
        if (pOperand)
                m_aCodeList.push_back(pOperand);




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

Reply via email to