connectivity/qa/complex/connectivity/DBaseDriverTest.java | 1 connectivity/qa/complex/connectivity/HsqlDriverTest.java | 1 connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java | 1 connectivity/qa/complex/connectivity/TestCase.java | 1 connectivity/source/drivers/file/FPreparedStatement.cxx | 8 -- sc/source/ui/inc/tpcompatibility.hxx | 31 +-------- sc/source/ui/optdlg/tpcompatibility.cxx | 32 +--------- 7 files changed, 16 insertions(+), 59 deletions(-)
New commits: commit 13cb9d9d1ac672d6ef22cee98237b0285e03cda3 Author: Michael Meeks <[email protected]> Date: Tue Jun 19 14:59:55 2012 +0100 misc dead code and cosmetic cleanup. diff --git a/connectivity/qa/complex/connectivity/DBaseDriverTest.java b/connectivity/qa/complex/connectivity/DBaseDriverTest.java index ef943d2..1a5a6c4 100644 --- a/connectivity/qa/complex/connectivity/DBaseDriverTest.java +++ b/connectivity/qa/complex/connectivity/DBaseDriverTest.java @@ -15,6 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + package complex.connectivity; import complex.connectivity.dbase.DBaseDateFunctions; diff --git a/connectivity/qa/complex/connectivity/HsqlDriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java index 2b240c2..9bfbb02 100644 --- a/connectivity/qa/complex/connectivity/HsqlDriverTest.java +++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java @@ -15,6 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + package complex.connectivity; import complex.connectivity.hsqldb.TestCacheSize; diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java index f96fd28..02dad0a 100644 --- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java +++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java @@ -15,6 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + package complex.connectivity; import com.sun.star.beans.PropertyState; diff --git a/connectivity/qa/complex/connectivity/TestCase.java b/connectivity/qa/complex/connectivity/TestCase.java index 5db3495..36c8003 100644 --- a/connectivity/qa/complex/connectivity/TestCase.java +++ b/connectivity/qa/complex/connectivity/TestCase.java @@ -15,6 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + package complex.connectivity; import share.LogWriter; diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 93685c8..bdfed9f 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -126,7 +126,6 @@ void OPreparedStatement::construct(const ::rtl::OUString& sql) throw(SQLExcepti Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) { - //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "[email protected]", "OPreparedStatement::queryInterface" ); Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, static_cast< XPreparedStatement*>(this), @@ -136,7 +135,6 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { - //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "[email protected]", "OPreparedStatement::getTypes" ); ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 )); @@ -577,8 +575,6 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult) continue; // this AssignValue is no Parameter ++nParaCount; // now the Parameter is valid - // Replace Parameter. If the Parameter isn't available, set value to NULL - // (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter]; } if (m_aParameterRow.is() && (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() ) @@ -591,13 +587,9 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult) if ( !(m_aParameterRow->get())[i].is() ) (m_aParameterRow->get())[i] = new ORowSetValueDecorator; } - //m_aParameterRow->resize(m_xParamColumns->size()+1); } if (m_aParameterRow.is() && nParaCount < m_aParameterRow->get().size() ) - { - m_pSQLAnalyzer->bindParameterRow(m_aParameterRow); - } } } // ----------------------------------------------------------------------------- commit 15bfc2866d1ccbe3739de1333a6a2722244fae08 Author: Michael Meeks <[email protected]> Date: Fri Jun 15 20:47:23 2012 +0100 fix license header for new files. diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index ec7a81f..8b1c733 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -1,30 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2010 Novell, Inc. - * - * LibreOffice - a multi-platform office productivity suite - * - * This file is part of LibreOffice. - * - * LibreOffice 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. - * - * LibreOffice 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 LibreOffice. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #ifndef __SC_TPCOMPATIBILITY_HXX__ #define __SC_TPCOMPATIBILITY_HXX__ diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 32b3e12..00f9ef4 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -1,31 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2010 Novell, Inc. - * - * LibreOffice - a multi-platform office productivity suite - * - * This file is part of LibreOffice. - * - * LibreOffice 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. - * - * LibreOffice 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 LibreOffice. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #undef SC_DLLIMPLEMENTATION _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
