#65293# last changes converted into correct unix file format

1 files changed, 55 insertions, 55 deletions

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index f9aaffeccd68..d16d96191380 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1,7 +1,7 @@
 %{
 //--------------------------------------------------------------------------
 //
-// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.14 2001-02-01 13:42:35 oj Exp $
+// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.15 2001-02-05 16:38:15 rt Exp $
 //
 // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
 //
@@ -9,7 +9,7 @@
 //	OJ
 //
 // Last change:
-//	$Author: oj $ $Date: 2001-02-01 13:42:35 $ $Revision: 1.14 $
+//	$Author: rt $ $Date: 2001-02-05 16:38:15 $ $Revision: 1.15 $
 //
 // Description:
 //
@@ -37,13 +37,13 @@
 #endif
 #ifndef _COM_SUN_STAR_UTIL_DATE_HPP_
 #include <com/sun/star/util/Date.hpp>
-#endif

-#ifndef _COM_SUN_STAR_UTIL_DATETIME_HPP_

-#include <com/sun/star/util/DateTime.hpp>

-#endif

-#ifndef _COM_SUN_STAR_UTIL_TIME_HPP_

-#include <com/sun/star/util/Time.hpp>

-#endif

+#endif
+#ifndef _COM_SUN_STAR_UTIL_DATETIME_HPP_
+#include <com/sun/star/util/DateTime.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_TIME_HPP_
+#include <com/sun/star/util/Time.hpp>
+#endif
 #ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #endif
@@ -61,22 +61,22 @@
 #endif
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif

-#ifndef _COM_SUN_STAR_I18N_KPARSETYPE_HPP_

-#include <com/sun/star/i18n/KParseType.hpp>

-#endif

-#ifndef _COM_SUN_STAR_I18N_KPARSETOKENS_HPP_

-#include <com/sun/star/i18n/KParseTokens.hpp>

-#endif

+#endif
+#ifndef _COM_SUN_STAR_I18N_KPARSETYPE_HPP_
+#include <com/sun/star/i18n/KParseType.hpp>
+#endif
+#ifndef _COM_SUN_STAR_I18N_KPARSETOKENS_HPP_
+#include <com/sun/star/i18n/KParseTokens.hpp>
+#endif
 #ifndef _CONNECTIVITY_SQLSCAN_HXX
 #include "sqlscan.hxx"
 #endif
 #ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif

-#ifndef _DBHELPER_DBCONVERSION_HXX_

-#include "connectivity/dbconversion.hxx"

-#endif

+#endif
+#ifndef _DBHELPER_DBCONVERSION_HXX_
+#include "connectivity/dbconversion.hxx"
+#endif
 
 static ::rtl::OUString aEmptyString;
 
@@ -2666,8 +2666,8 @@ derived_column:
 	;
 /* Tabellenname */
 table_node:
-		table_name

-	|	schema_name

+		table_name
+	|	schema_name
 	|	catalog_name
 ;
 catalog_name:
@@ -2737,13 +2737,13 @@ column_ref:
 			$$->append($1);
 			$$->append($2 = newNode(".", SQL_NODE_PUNCTUATION));
 			$$->append($3);}
-*/	

-	|       SQL_TOKEN_NAME '.' column_val %prec '.'

-			{$$ = SQL_NEW_RULE;

-			$$->append($1);

-			$$->append($2 = newNode(".", SQL_NODE_PUNCTUATION));

-			$$->append($3);

-			}

+*/	
+	|       SQL_TOKEN_NAME '.' column_val %prec '.'
+			{$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2 = newNode(".", SQL_NODE_PUNCTUATION));
+			$$->append($3);
+			}
 	|       SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val %prec '.'
 			{$$ = SQL_NEW_RULE;
 			$$->append($1);
@@ -4142,32 +4142,32 @@ void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank)
 void OSQLParser::error(sal_Char *fmt)
 {
 	if(!m_sErrorMessage.getLength())
-	{

-		::rtl::OUString sStr(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);

-		::rtl::OUString sSQL_TOKEN(::rtl::OUString::createFromAscii("SQL_TOKEN_"));

-

-		sal_Int32 nPos1 = sStr.indexOf(sSQL_TOKEN);

-		if(nPos1 != -1)

-		{

-			::rtl::OUString sFirst  = sStr.copy(0,nPos1);

-			sal_Int32 nPos2 = sStr.indexOf(sSQL_TOKEN,nPos1+1);

-			if(nPos2 != -1)

-			{

-				::rtl::OUString sSecond = sStr.copy(nPos1+sSQL_TOKEN.getLength(),nPos2-nPos1-sSQL_TOKEN.getLength());

-				sFirst  += sSecond;

-				sFirst  += sStr.copy(nPos2+sSQL_TOKEN.getLength());

-			}

-

-			m_sErrorMessage = sFirst;

-		}

-		else

-			m_sErrorMessage = sStr;

-

-		::rtl::OUString aError = s_pScanner->getErrorMessage();

-		if(aError.getLength())

-		{

-			m_sErrorMessage += ::rtl::OUString::createFromAscii(", ");

-			m_sErrorMessage += aError;

+	{
+		::rtl::OUString sStr(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
+		::rtl::OUString sSQL_TOKEN(::rtl::OUString::createFromAscii("SQL_TOKEN_"));
+
+		sal_Int32 nPos1 = sStr.indexOf(sSQL_TOKEN);
+		if(nPos1 != -1)
+		{
+			::rtl::OUString sFirst  = sStr.copy(0,nPos1);
+			sal_Int32 nPos2 = sStr.indexOf(sSQL_TOKEN,nPos1+1);
+			if(nPos2 != -1)
+			{
+				::rtl::OUString sSecond = sStr.copy(nPos1+sSQL_TOKEN.getLength(),nPos2-nPos1-sSQL_TOKEN.getLength());
+				sFirst  += sSecond;
+				sFirst  += sStr.copy(nPos2+sSQL_TOKEN.getLength());
+			}
+
+			m_sErrorMessage = sFirst;
+		}
+		else
+			m_sErrorMessage = sStr;
+
+		::rtl::OUString aError = s_pScanner->getErrorMessage();
+		if(aError.getLength())
+		{
+			m_sErrorMessage += ::rtl::OUString::createFromAscii(", ");
+			m_sErrorMessage += aError;
 		}
 	}
 }