#i10000# Fix even more line ends

2 files changed, 130 insertions, 130 deletions

diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 0142f02404..c628840d80 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1939,20 +1939,20 @@ void ORowSetValue::fill(const Any& _rValue)
             setSigned(sal_False);
             break;
         }
-        case TypeClass_HYPER:

-        {

-            sal_Int64 nValue(0);

-            _rValue >>= nValue;

-            (*this) = nValue;

-            break;

-        }

-        case TypeClass_UNSIGNED_HYPER:

-        {

-            sal_uInt64 nValue(0);

-            _rValue >>= nValue;

-            (*this) = static_cast<sal_Int64>(nValue);

-            setSigned(sal_False);

-            break;

+        case TypeClass_HYPER:
+        {
+            sal_Int64 nValue(0);
+            _rValue >>= nValue;
+            (*this) = nValue;
+            break;
+        }
+        case TypeClass_UNSIGNED_HYPER:
+        {
+            sal_uInt64 nValue(0);
+            _rValue >>= nValue;
+            (*this) = static_cast<sal_Int64>(nValue);
+            setSigned(sal_False);
+            break;
         }
         case TypeClass_UNSIGNED_LONG:
         {
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 7dc64e0a27..0628e4a392 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -1,61 +1,61 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $

- * $Revision: 1.24 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-#include "precompiled_connectivity.hxx"

-#include "ParameterSubstitution.hxx"

-#include "connectivity/sqlparse.hxx"

-#include <comphelper/sequenceashashmap.hxx>

-

-namespace connectivity

-{

-    using namespace ::com::sun::star::uno;

-    using namespace ::com::sun::star::sdbc;

-    using namespace ::com::sun::star::lang;

-    using namespace ::com::sun::star;

-

-    ParameterSubstitution::ParameterSubstitution(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)

-    {

-    }

-    void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException)

-    {

-        ::osl::MutexGuard aGuard(m_aMutex);

-        comphelper::SequenceAsHashMap aArgs(_aArguments);

-        uno::Reference< sdbc::XConnection > xConnection;

-        xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection);

-        m_xConnection = xConnection;

-    }

-    //------------------------------------------------------------------------------

-    rtl::OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)

-    {

-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution"));

-    }

-    //------------------------------------------------------------------------------

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
+ * $Revision: 1.24 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include "precompiled_connectivity.hxx"
+#include "ParameterSubstitution.hxx"
+#include "connectivity/sqlparse.hxx"
+#include <comphelper/sequenceashashmap.hxx>
+
+namespace connectivity
+{
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::sdbc;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    ParameterSubstitution::ParameterSubstitution(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)
+    {
+    }
+    void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard(m_aMutex);
+        comphelper::SequenceAsHashMap aArgs(_aArguments);
+        uno::Reference< sdbc::XConnection > xConnection;
+        xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection);
+        m_xConnection = xConnection;
+    }
+    //------------------------------------------------------------------------------
+    rtl::OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution"));
+    }
+    //------------------------------------------------------------------------------
     ::rtl::OUString SAL_CALL ParameterSubstitution::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
@@ -75,61 +75,61 @@ namespace connectivity
     Sequence< ::rtl::OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
-    }

-    //------------------------------------------------------------------

-    Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)

-    {

-        Sequence< ::rtl::OUString > aSNS( 1 );

-        aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ParameterSubstitution");

-        return aSNS;

-    }

-

-    //------------------------------------------------------------------

-    Reference< XInterface >  ParameterSubstitution::create(const Reference< XComponentContext >& _xContext)

-    {

-        return *(new ParameterSubstitution(_xContext));

-    }

-    //------------------------------------------------------------------

-    ::rtl::OUString SAL_CALL ParameterSubstitution::substituteVariables( const ::rtl::OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)

-    {

-        ::rtl::OUString sRet = _sText;

-        uno::Reference< sdbc::XConnection > xConnection = m_xConnection;

-        if ( xConnection.is() )

-        {

-            try

-            {

-                uno::Reference< XMultiServiceFactory> xFac(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW);

-                OSQLParser aParser( xFac );

-                ::rtl::OUString sErrorMessage;

-                ::rtl::OUString sNewSql;

-                OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText);

-                if(pNode)

-                {	// special handling for parameters

-                    OSQLParseNode::substituteParameterNames(pNode);

-                    pNode->parseNodeToStr( sNewSql, xConnection );

-                    delete pNode;

-                    sRet = sNewSql;

-                }

-            }

-            catch(const Exception&)

-            {

-            }

-        }

-        return sRet;

-    }

-    //------------------------------------------------------------------

-    ::rtl::OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const ::rtl::OUString& _sText ) throw (::com::sun::star::uno::RuntimeException)

-    {

-        return _sText;

-    }

-    //------------------------------------------------------------------

-    ::rtl::OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const ::rtl::OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)

-    {

-        throw container::NoSuchElementException();

-    }

-    //------------------------------------------------------------------

-

-

-// ==================================

-} // connectivity

-// ==================================

+    }
+    //------------------------------------------------------------------
+    Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aSNS( 1 );
+        aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ParameterSubstitution");
+        return aSNS;
+    }
+
+    //------------------------------------------------------------------
+    Reference< XInterface >  ParameterSubstitution::create(const Reference< XComponentContext >& _xContext)
+    {
+        return *(new ParameterSubstitution(_xContext));
+    }
+    //------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ParameterSubstitution::substituteVariables( const ::rtl::OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
+    {
+        ::rtl::OUString sRet = _sText;
+        uno::Reference< sdbc::XConnection > xConnection = m_xConnection;
+        if ( xConnection.is() )
+        {
+            try
+            {
+                uno::Reference< XMultiServiceFactory> xFac(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW);
+                OSQLParser aParser( xFac );
+                ::rtl::OUString sErrorMessage;
+                ::rtl::OUString sNewSql;
+                OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText);
+                if(pNode)
+                {	// special handling for parameters
+                    OSQLParseNode::substituteParameterNames(pNode);
+                    pNode->parseNodeToStr( sNewSql, xConnection );
+                    delete pNode;
+                    sRet = sNewSql;
+                }
+            }
+            catch(const Exception&)
+            {
+            }
+        }
+        return sRet;
+    }
+    //------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const ::rtl::OUString& _sText ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        return _sText;
+    }
+    //------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const ::rtl::OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
+    {
+        throw container::NoSuchElementException();
+    }
+    //------------------------------------------------------------------
+
+
+// ==================================
+} // connectivity
+// ==================================