1. mst
  2. ooo340

Commits

rt  committed 03b9d71

#i96331# Patch by jpryor to fix build breakage in 'connectivity'.

  • Participants
  • Parent commits 625d466
  • Branches default

Comments (0)

Files changed (2)

File connectivity/source/drivers/evoab2/NResultSetMetaData.cxx

View file
                 guint nFieldNumber = findEvoabField(aFieldName);
 		        if (nFieldNumber == (guint)-1)
                 {
-                    :.connectivity::SharedResource aResource;
+                    connectivity::SharedResources aResource;
                     const ::rtl::OUString sError( aResource.getResourceStringWithSubstitution(
                             STR_INVALID_COLUMNNAME,
                             "$columnname$", aFieldName

File connectivity/source/drivers/evoab2/NStatement.cxx

View file
 #include "NConnection.hxx"
 #include "NResultSet.hxx"
 #include "NDebug.hxx"
+#include <resource/common_res.hrc>
 #include <connectivity/dbexception.hxx>
 
 using namespace connectivity::evoab;
 			   // odbc date
 			   (SQL_ISRULE( parseTree->getChild( 2 ), set_fct_spec ) &&
 				SQL_ISPUNCTUATION( parseTree->getChild( 2 )->getChild( 0 ), "{" ) ) ) )
-			    getConnection()->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
+			    m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
 
         if (pPrec->getNodeType() != SQL_NODE_EQUAL && pPrec->getNodeType() != SQL_NODE_NOTEQUAL)
-            getConnection()->throwGenericSQLException(STR_OPERATOR_TOO_COMPLEX,*this);
+            m_pConnection->throwGenericSQLException(STR_OPERATOR_TOO_COMPLEX,*this);
 
 		rtl::OUString aMatchString;
 		rtl::OUString aColumnName;
 		}
                                                                                                     
         if( ! SQL_ISRULE( parseTree->getChild( 0 ), column_ref) )
-            getConnection()->throwGenericSQLException(STR_QUERY_INVALID_LIKE_COLUMN,*this);
+            m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_COLUMN,*this);
                                                                                                     
         OSQLParseNode *pColumn    = parseTree->getChild( 0 );                          // Match Item
         OSQLParseNode *pAtom      = parseTree->getChild( parseTree->count() - 2 );     // Match String
 			   ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_STRING ) ) )
         {
             OSL_TRACE( "analyseSQL : pAtom->count() = %d\n", pAtom->count() );
-            getConnection()->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,*this);
+            m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,*this);
         }
 
         const sal_Unicode WILDCARD = '%';
 			else if( bNotLike )
 			{
 				// We currently can't handle a 'NOT LIKE' when there are '%' 
-                getConnection()->throwGenericSQLException(STR_QUERY_NOT_LIKE_TOO_COMPLEX,*this);
+                m_pConnection->throwGenericSQLException(STR_QUERY_NOT_LIKE_TOO_COMPLEX,*this);
 			}
 			else if( (aMatchString.indexOf ( WILDCARD ) == aMatchString.lastIndexOf ( WILDCARD ) ) )
 			{   // One occurance of '%'  matches...
                 else if ( aMatchString.indexOf ( WILDCARD ) == aMatchString.getLength() - 1 )
 					pResult = createTest( aColumnName, E_BOOK_QUERY_BEGINS_WITH, aMatchString.copy( 0, aMatchString.getLength() - 1 ) );
 				else
-                    getConnection()->throwGenericSQLException(STR_QUERY_LIKE_WILDCARD,*this);
+                    m_pConnection->throwGenericSQLException(STR_QUERY_LIKE_WILDCARD,*this);
 
 				if( pResult && bNotLike )
 					pResult = e_book_query_not( pResult, TRUE );
 				pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, aMatchString.copy (1, aMatchString.getLength() - 2) );
 			}
 			else
-                getConnection()->throwGenericSQLException(STR_QUERY_LIKE_WILDCARD_MANY,*this);
+                m_pConnection->throwGenericSQLException(STR_QUERY_LIKE_WILDCARD_MANY,*this);
 		}
 		else
 			OSL_ASSERT( "Serious internal error" );
 		e_book_query_unref( pQuery );
 		xColumns = m_aSQLIterator.getSelectColumns();
 		if (!xColumns.isValid())
-            getConnection()->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
+            m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
 
         OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) pResult->getMetaData().get();
 		pMeta->setEvoabFields(xColumns);