diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:25 -0400 |
| commit | 8dcf22abfc6a07ececcef6bb830fdea825d416ec (patch) | |
| tree | 7e0b3686991aef9689218ed309f462987f36e273 /connectivity | |
| parent | b91e39cf1b2d0c4201993d768a1b2c686eeff0de (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit a238b1f8d304bf1e2ffb357937f3ec888ee8ac89)
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Diffstat (limited to 'connectivity')
152 files changed, 0 insertions, 326 deletions
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 26ef016aae29..aa60abf8c3e2 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -252,5 +252,4 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 34ed9b8f0152..484e0fd2d945 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -244,7 +244,6 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t } - sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { return 0; @@ -275,7 +274,6 @@ Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*c } - Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; @@ -311,15 +309,12 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - - ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } - ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); @@ -436,7 +431,6 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, SAL_WNOUNREACHABLE_CODE_POP - sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { return m_bBOF; diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index e6927497e9c4..be18ec286b1e 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1342,7 +1342,6 @@ sal_uInt8 ORowSetValue::getUInt8() const } - sal_Int16 ORowSetValue::getInt16() const { sal_Int16 nRet = 0; diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index ebe096f0f232..95a8ebb5bdac 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -110,8 +110,6 @@ namespace connectivity } - - } // connectivity diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index ef03cecd3d30..134e03b1025f 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -33,7 +33,6 @@ #include <tools/fract.hxx> - #if (OSL_DEBUG_LEVEL > 0) #include <iostream> #endif @@ -122,12 +121,9 @@ public: }; - - // FUNCTION PARSER - typedef const sal_Char* StringIteratorT; struct ParserContext diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index fef9a9f07c51..26ec91946edc 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -214,6 +214,4 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/, const OUString& _sElementNa } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 2dc5164caa8e..6069bc227e65 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -245,6 +245,4 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementNam } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 11323dec47ed..f746121e9823 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -135,5 +135,4 @@ void OKeyColumnsHelper::impl_refresh() throw(::com::sun::star::uno::RuntimeExcep } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 7856f522b568..3c2639583b0d 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - OKeysHelper::OKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, const TStringVector& _rVector diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 1decb69a5618..c140474fbcd1 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -220,7 +220,6 @@ namespace dbtools } - } // namespace dbtools diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index 0d8e5c022339..b95cafac3754 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -58,7 +58,6 @@ namespace dbtools using namespace ::com::sun::star::beans; - css::util::Date DBTypeConversion::getStandardDate() { static css::util::Date STANDARD_DB_DATE(1,1,1900); @@ -449,5 +448,4 @@ namespace dbtools } // namespace dbtools - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index da440efd1a13..1765236e2850 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -511,9 +511,7 @@ OUString getStandardSQLState( StandardSQLState _eState ) } - } // namespace dbtools - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 632345565d91..616785da4957 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -203,7 +203,6 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons } - OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern) { OUStringBuffer aSql("CREATE TABLE "); diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 31e563511d0d..7de98df961df 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -61,7 +61,6 @@ namespace dbtools using ::connectivity::OSQLParseNode; - static sal_Unicode lcl_getSeparatorChar( const OUString& _rSeparator, sal_Unicode _nFallback ) { OSL_ENSURE( !_rSeparator.isEmpty(), "::lcl_getSeparatorChar: invalid separator string!" ); @@ -445,5 +444,4 @@ namespace dbtools } // namespace dbtools - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index af6d2fba0488..eaf2762a7190 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -118,5 +118,4 @@ namespace connectivity } // namespace connectivity - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index 2a388385ae54..92d5b0edbb9f 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -55,7 +55,6 @@ namespace connectivity ); - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 77d1c19d247d..cf205eef1de8 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -503,5 +503,4 @@ m_xDesktop.clear(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index b66718d75013..b9c1bd629a60 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -52,7 +52,6 @@ Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) throw(Runt } - sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeException) { return m_aValue.isNull(); @@ -170,7 +169,6 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet } - Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this ); @@ -222,5 +220,4 @@ void SAL_CALL OCallableStatement::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index 0e25ab6d20fa..a492286d2984 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> - using namespace connectivity; using namespace connectivity::ado; @@ -113,5 +112,4 @@ void OCatalog::refreshUsers() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index e1a98033a00f..5fa9708eeeea 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -281,6 +281,4 @@ void SAL_CALL OAdoColumn::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index c19d8a756bd6..e878effc8ecd 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -126,6 +126,4 @@ void OColumns::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index c1d6ee7eb5d0..ce526c4eaa03 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -286,7 +286,6 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, checkDisposed(OConnection_BASE::rBHelper.bDisposed); - m_pAdoConnection->put_Mode(readOnly ? adModeRead : adModeReadWrite); ADOS::ThrowException(*m_pAdoConnection,*this); } @@ -611,6 +610,4 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 42c28c6be72d..db6e5d63c45b 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -590,5 +590,4 @@ void WpADOUser::Create() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 98450024280d..cbed47b68d4a 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -299,7 +299,6 @@ Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*c } - Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); @@ -369,15 +368,12 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - - ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } - ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); @@ -1215,5 +1211,4 @@ OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQ } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 79f602628941..c76f64e4bbf3 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -119,7 +119,6 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu } - sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -220,5 +219,4 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 colu } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 3b9907d275fe..0fbc2da541c6 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; - ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ODriver_BASE(m_aMutex) ,m_xORB(_xORB) diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 473573e0cadc..a866422472df 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -174,5 +174,4 @@ void SAL_CALL OAdoGroup::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 5e49dd347c76..ebcf88d0efbd 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -72,7 +72,4 @@ void OGroups::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index d0764651c348..f061df161735 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -54,7 +54,6 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection) } - void OAdoIndex::refreshColumns() { TStringVector aVector; @@ -142,7 +141,4 @@ void SAL_CALL OAdoIndex::release() throw() } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index 5dfc2930bc7c..15aa437d535f 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -77,5 +77,4 @@ void OIndexes::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index d76bf93823b8..06b0d3f1b372 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -154,5 +154,4 @@ void SAL_CALL OAdoKey::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 4958d0ccbc08..95d2ca0a72a6 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -104,5 +104,4 @@ void OKeys::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 7e7f553c9c05..47ef748a29ad 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -147,7 +147,6 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep } - sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -306,7 +305,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); @@ -345,15 +343,12 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept } - - ::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } - ::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); @@ -1173,6 +1168,4 @@ void SAL_CALL OResultSet::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 03f8057b1c90..aed8eae119c1 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -176,7 +176,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } - sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index a6a893a4523d..90b825fe8533 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -42,7 +42,6 @@ using namespace ::comphelper; ADOS::ThrowException(*m_pConnection->getConnection(),*this); - using namespace connectivity::ado; @@ -130,7 +129,6 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime } - void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -389,7 +387,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } - sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -473,7 +470,6 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } - Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -484,7 +480,6 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } - void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index cdd7df2775c3..88c33ca3825f 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -99,5 +99,4 @@ void OTables::appendNew(const OUString& _rsNewTable) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 810946ecb1e1..98ffd0e73389 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -209,8 +209,4 @@ void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUStr } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index 081edbcbb2d9..b9b0a1f55868 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -72,5 +72,4 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index dba3c8e894e2..96ccd9d8029a 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -110,5 +110,4 @@ void SAL_CALL OAdoView::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index 155866c1ec30..9702d79a79c2 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -90,6 +90,4 @@ void OViews::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 1319f024c934..e3728bc72675 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -750,6 +750,4 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index fcb5b365ebed..12b1cb966a9b 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -322,7 +322,4 @@ WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) thr } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx index 203e8709751b..4703f1ff7f07 100644 --- a/connectivity/source/drivers/calc/CCatalog.cxx +++ b/connectivity/source/drivers/calc/CCatalog.cxx @@ -61,6 +61,4 @@ void OCalcCatalog::refreshTables() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 9859e65962b5..0cda5f3e6ec8 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -42,7 +42,6 @@ using namespace connectivity::file; typedef connectivity::file::OConnection OConnection_BASE; - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; @@ -52,7 +51,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::sheet; - OCalcConnection::OCalcConnection(ODriver* _pDriver) : OConnection(_pDriver),m_nDocCount(0) { // m_aFilenameExtension is not used @@ -196,7 +194,6 @@ void OCalcConnection::disposing() IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connection", "com.sun.star.sdbc.Connection") - Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -214,7 +211,6 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S } - ::com::sun::star::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -229,7 +225,6 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S } - Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -242,7 +237,6 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE } - Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { @@ -258,7 +252,6 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons } - Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index b58dae027531..8ed737ba4d48 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -47,13 +47,11 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::sheet; - OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon) { } - OCalcDatabaseMetaData::~OCalcDatabaseMetaData() { } @@ -138,7 +136,6 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( ) } - Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) @@ -235,7 +232,6 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( } - OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -244,14 +240,12 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE } - sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { return SAL_MAX_INT32; } - sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { return SAL_MAX_INT32; @@ -273,7 +267,6 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExce } - static bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const OUString& rName ) { Any aAny = xSheets->getByName( rName ); @@ -345,7 +338,6 @@ static bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUSt } - Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types ) @@ -441,5 +433,4 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 132ed1708c73..f1548ba05d9e 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - // static ServiceInfo OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) @@ -50,7 +49,6 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std // service names from file::OFileDriver - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::calc::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index cc464639e3d1..31f82eeb9ca5 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -172,5 +172,4 @@ void SAL_CALL OCalcResultSet::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index acc7a139e61f..1c871adad62d 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -305,7 +305,6 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe } - static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, sal_Int32 nStartCol, sal_Int32 nStartRow, bool bHasHeaders, const ::Date& rNullDate, @@ -420,7 +419,6 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x } - static OUString lcl_GetColumnStr( sal_Int32 nColumn ) { if ( nColumn < 26 ) diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 9daa41c42a5e..6ad63143a4cd 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -391,5 +391,4 @@ bool ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index ca398f824cd5..80e5211211c2 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -115,5 +115,4 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index f325fea7d3fe..9ad366c3f78b 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -615,6 +615,4 @@ void SAL_CALL ODbaseIndex::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index eeccd0289693..7aa3df1e625d 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -84,5 +84,4 @@ sdbcx::ObjectType ODbaseIndexColumns::appendObject( const OUString& /*_rForName* } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index 38a6d1ebb302..939fd8a2a0a5 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.cxx @@ -117,5 +117,4 @@ void ODbaseIndexes::dropObject(sal_Int32 _nPos, const OUString& /*_sElementName* } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index f3fc19a83921..e83e2702f8aa 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -218,5 +218,4 @@ sal_Int32 ODbaseResultSet::getCurrentFilePos() const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 1098ef233957..2aab28139ea3 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1819,7 +1819,6 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, cons } - ++nPos; // the row values start at 1 const ORowSetValue &thisColVal = rRow.get()[nPos]->get(); const bool thisColIsBound = thisColVal.isBound(); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 1f94999c1903..04211f521b5d 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -131,5 +131,4 @@ Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeExc } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 2b83ef806152..84d7cad7ce81 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -65,7 +65,6 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec) } - // index page ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent) @@ -430,7 +429,6 @@ bool ONDXPage::Delete(sal_uInt16 nNodePos) } - ONDXNode ONDXPage::Split(ONDXPage& rPage) { DBG_ASSERT(IsFull(), "Incorrect Splitting"); @@ -667,7 +665,6 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage) // ONDXNode - void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex) { rStream.ReadUInt32( aKey.nRecord ); // key @@ -733,7 +730,6 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const } - ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent) { if (!aChild.Is() && pIndex) diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index 7d670e3a3f90..a978254f0d12 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> - using namespace connectivity::evoab; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 1d5bdaf823f1..d12162c9848e 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -204,7 +204,6 @@ void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, } - void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setFloat", *this ); @@ -290,7 +289,6 @@ void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, c } - void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setCharacterStream", *this ); diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 56119d9ea456..6b86c967efbb 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -490,7 +490,6 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData } - Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index 9d9564ba7de1..12dd47a4076c 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -100,5 +100,4 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException, std } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index 761214e3c0fe..2956e5e0fed6 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -81,8 +81,4 @@ void OColumns::impl_refresh() throw(RuntimeException) } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index fe5c84e424fc..6424a25b6e4a 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -449,6 +449,4 @@ void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsM } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 56299a018dcd..cc976f988fa1 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -230,7 +230,4 @@ OOperandAttr::OOperandAttr(sal_uInt16 _nPos,const Reference< XPropertySet>& _xCo } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 1706910472e7..aa46c7cb38d4 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -238,7 +238,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x } - void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) { setParameter(parameterIndex,x); @@ -340,7 +339,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { setBinaryStream(parameterIndex,x,length ); @@ -559,5 +557,4 @@ void OPreparedStatement::parseParamterElem(const OUString& _sColumnName, OSQLPar } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index c7223c77f573..26a051c78662 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -314,7 +314,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; @@ -1181,7 +1180,6 @@ void OResultSet::sortRows() } - bool OResultSet::OpenImpl() { OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!"); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 1b868e64f122..12b3b3d39555 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -261,7 +261,6 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, } - Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 06fdb5dad407..331251b137bf 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; - OCode::OCode() { } @@ -103,7 +102,6 @@ OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos) } - const ORowSetValue& OOperandValue::getValue() const { return m_aValue; @@ -150,14 +148,12 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS // Implementation of the operators - bool OBoolOperator::operate(const OOperand*, const OOperand*) const { return false; } - void OBoolOperator::Exec(OCodeStack& rCodeStack) { OOperand *pRight = rCodeStack.top(); @@ -404,6 +400,4 @@ void OUnaryOperator::Exec(OCodeStack& rCodeStack) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index c0008d4f8572..a58136702e6a 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -388,7 +388,6 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr } - OBoolOperator* pBoolOp = nullptr; if ( bNot ) pBoolOp = new OOp_OR(); @@ -905,5 +904,4 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index c0e93f126295..91555c65394b 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -741,7 +741,6 @@ void Connection::buildTypeInfo() throw( SQLException) aInfo.nNumPrecRadix = (sal_Int16)xRow->getInt(18); - // Now that we have the type info, save it // in the Hashtable if we don't already have an // entry for this SQL type. diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index 03bdae0e996e..2a8f2bd63f35 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -1742,6 +1742,4 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& cat } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 5e3758ae619f..7b9218cc9518 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -527,7 +527,6 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, } - void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; @@ -625,7 +624,6 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index 89145f47d361..764f561c245d 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -650,7 +650,6 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) } - uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; @@ -696,9 +695,6 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< } - - - void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "close()."); diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 069402ac1558..48b7391932e8 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -407,7 +407,6 @@ sal_Int32 OStatementCommonBase::getStatementChangeCount() const short aStatementType = getSqlInfoItem(isc_info_sql_stmt_type); - ISC_STATUS_ARRAY aStatusVector; ISC_STATUS aErr; diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx index 1b3e227be816..f2d3e7cd23bc 100644 --- a/connectivity/source/drivers/flat/ECatalog.cxx +++ b/connectivity/source/drivers/flat/ECatalog.cxx @@ -57,6 +57,4 @@ void OFlatCatalog::refreshTables() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index 033f0a9aafd2..00cdfd623b13 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.cxx @@ -42,5 +42,4 @@ sdbcx::ObjectType OFlatColumns::createObject(const OUString& _rName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index 090d4f6f3f17..fe5d88f64cab 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; - OFlatDatabaseMetaData::OFlatDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) { } @@ -244,5 +243,4 @@ OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index d697fdc98134..c227ee3d57e5 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -133,5 +133,4 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 797c51f71915..13cc609cfb8a 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -26,7 +26,6 @@ #include <comphelper/types.hxx> - using namespace connectivity; using namespace connectivity::hsqldb; using namespace ::com::sun::star::uno; @@ -150,5 +149,4 @@ Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException, std::e } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 0276998745b2..fcd14fc22b80 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -896,8 +896,6 @@ namespace connectivity } - - } // namespace connectivity diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 38d8e79af05c..79c85879fbf8 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -143,7 +143,6 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nati } - jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key, DataLogFile* logger ) { std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); @@ -186,7 +185,6 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: read @@ -207,7 +205,6 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ } - jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger ) { #ifdef HSQLDB_DBG @@ -281,7 +278,6 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: readInt @@ -462,7 +458,6 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: write @@ -521,7 +516,6 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: writeInt diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 5cec116c7a59..0894a4b06fa7 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -102,5 +102,4 @@ void OUsers::dropObject(sal_Int32 /*nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 07c9668c0a36..c8d422931aa0 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -129,5 +129,4 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index ce872fc5dfd1..0858b4b9de89 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -352,5 +352,4 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index efd0de8200f0..0a887ded4f92 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx @@ -67,7 +67,6 @@ namespace connectivity { namespace java { namespace sql { } } } // namespace connectivity::java::sql - namespace comphelper { namespace log { namespace convert { diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx index f2f19db3cd3b..82c3ebfc670d 100644 --- a/connectivity/source/drivers/jdbc/Date.cxx +++ b/connectivity/source/drivers/jdbc/Date.cxx @@ -39,6 +39,4 @@ jclass java_util_Date::getMyClass() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index 16d46f5efcc4..48e907819704 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - //************ Class: java.sql.Driver diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 314c2c60c584..611367c9d9eb 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -247,5 +247,4 @@ sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) throw(RuntimeException, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index c767011ddd0c..d4a4c45dbc2f 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - //************ Class: java.sql.Statement @@ -187,7 +186,6 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) } - void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -337,7 +335,6 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com: } - sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -382,7 +379,6 @@ sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(::com::sun:: } - Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; @@ -809,7 +805,6 @@ void java_sql_Statement::createStatement(JNIEnv* _pEnv) } - IMPLEMENT_SERVICE_INFO(java_sql_Statement,"com.sun.star.sdbcx.JStatement","com.sun.star.sdbc.Statement"); void SAL_CALL java_sql_Statement_Base::acquire() throw() @@ -838,5 +833,4 @@ void SAL_CALL java_sql_Statement::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 588cca1c095c..e6381454b3ca 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM2(const ::rtl::Reference< jvmaccess::VirtualMachine >& _rVM = ::rtl::Reference< jvmaccess::VirtualMachine >(), bool _bSet = false) { diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 9aa42c8bc030..7ff97b20b37e 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -201,7 +201,6 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con } - void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIME_PARAMETER, parameterIndex, x ); @@ -693,6 +692,4 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 88fbf7d72d6c..403629147318 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -355,7 +355,6 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S } - OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(nullptr); @@ -363,7 +362,6 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S } - ::com::sun::star::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -374,7 +372,6 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S } - ::com::sun::star::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -606,7 +603,6 @@ void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x } - void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); @@ -998,6 +994,4 @@ void SAL_CALL java_sql_ResultSet::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index fa72a45eb23f..c06d4e15301c 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -147,7 +147,6 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column } - sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(nullptr); diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 791b86fc4ed2..89cf8972d017 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -189,5 +189,4 @@ java_sql_Timestamp::operator ::com::sun::star::util::DateTime() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 3ef8a7fa37e8..7e0dd97adbbb 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -100,7 +100,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL jdbc_component_getFactory( } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx index eeb36a3d068a..4be299c1cdb7 100644 --- a/connectivity/source/drivers/mork/MColumns.cxx +++ b/connectivity/source/drivers/mork/MColumns.cxx @@ -89,6 +89,4 @@ void OColumns::impl_refresh() throw(RuntimeException) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index e836938ca6c1..f86d5799e9d2 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -44,7 +44,6 @@ namespace connectivity { namespace mork { static const int defaultScope = 0x80; - OConnection::OConnection(MorkDriver* _pDriver) :OSubComponent<OConnection, OConnection_BASE>(static_cast<cppu::OWeakObject*>(_pDriver), this) ,m_pDriver(_pDriver) @@ -386,7 +385,6 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() } - void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext ) { if ( _rError.getResId() != 0 ) diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index 001221100dac..0d6ca812fd55 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -19,7 +19,6 @@ #include <com/sun/star/uno/Sequence.hxx> - namespace connectivity { namespace mork diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index df22af3b012b..50b2fafde8ee 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -225,7 +225,6 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const D } - void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTime", *this ); @@ -244,7 +243,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, doubl } - void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setFloat", *this ); @@ -328,7 +326,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this ); @@ -514,5 +511,4 @@ sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(::com::sun::star: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 2b42921df0c1..a03e3501fbc9 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -143,7 +143,6 @@ sal_Int32 MQueryHelper::getResultCount() const } - bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow ) { /* diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index b0e2f3e2713e..f293f0f4c1c6 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -279,7 +279,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; @@ -325,7 +324,6 @@ sal_uInt32 OResultSet::currentRowCount() } - bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -391,7 +389,6 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI } - OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -413,7 +410,6 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLExceptio } - DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -1029,7 +1025,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } - void OResultSet::fillRowData() throw (css::sdbc::SQLException, css::uno::RuntimeException) { @@ -1314,8 +1309,6 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep } - - void OResultSet::setBoundedColumns(const OValueRow& _rRow, const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, const Reference<XIndexAccess>& _xNames, @@ -1397,7 +1390,6 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, } - bool OResultSet::isCount() const { return (m_pParseTree && @@ -1410,7 +1402,6 @@ bool OResultSet::isCount() const } - // Check for valid row in m_aQuery bool OResultSet::validRow( sal_uInt32 nRow) diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 7335995418d1..ea00095a6b7a 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -85,7 +85,6 @@ namespace connectivity sal_Int32 m_nResultSetConcurrency; - std::shared_ptr< ::connectivity::OSQLParseTreeIterator > m_pSQLIterator; const connectivity::OSQLParseNode* m_pParseTree; diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 5cfa0dc2425c..2fd13f872b94 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -139,7 +139,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, } - OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted) throw ( SQLException, RuntimeException ) { @@ -320,7 +319,6 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept } - void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx index f76f11405a3f..55873de64784 100644 --- a/connectivity/source/drivers/mork/MTable.cxx +++ b/connectivity/source/drivers/mork/MTable.cxx @@ -74,7 +74,4 @@ sdbcx::OCollection* OTable::createIndexes(const TStringVector& _rNames) } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index 6556755ef1fa..6c98d12ea94e 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -26,7 +26,6 @@ #include <comphelper/types.hxx> - using namespace connectivity; using namespace connectivity::mysql; using namespace connectivity::sdbcx; @@ -143,5 +142,4 @@ Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException, st } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 7cd111b0cc15..d9390c3a7dff 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -362,6 +362,4 @@ OUString OMySQLTable::getRenameStart() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index ee39cb1a39a8..e43f540295d8 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -104,5 +104,4 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 5d34e21aea1f..cb5052bf5dd5 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -563,6 +563,4 @@ void OConnection::freeStatementHandle(SQLHANDLE& _pHandle) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 39ca423c7412..72b525cfdf4f 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -405,8 +405,6 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - - ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { @@ -424,7 +422,6 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index 21c013a2845c..a727ee643ef6 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -207,6 +207,4 @@ sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) throw(RuntimeException, std:: } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index a8e9fee5bb4f..84583c4ea73f 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -232,5 +232,4 @@ bool LoadFunctions(oslModule pODBCso) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 95a9f21d7d4e..b5e185faeec4 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -492,7 +492,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x } - void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) { setScalarParameter(parameterIndex, DataType::FLOAT, 15, x); @@ -645,7 +644,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { // LEM: It is quite unclear to me what the interface here is. @@ -691,11 +689,9 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLExc } - // methods - // initBoundParam // Initialize the bound parameter objects @@ -720,7 +716,6 @@ void OPreparedStatement::initBoundParam () throw(SQLException) } - // allocBindBuf // Allocate storage for the permanent data buffer for the bound // parameter. @@ -741,7 +736,6 @@ void* OPreparedStatement::allocBindBuf( sal_Int32 index,sal_Int32 bufLen) } - // getLengthBuf // Gets the length buffer for the given parameter index @@ -762,7 +756,6 @@ SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index) } - // putParamData // Puts parameter data from a previously bound input stream. The // input stream was bound using SQL_LEN_DATA_AT_EXEC. @@ -879,8 +872,6 @@ void OPreparedStatement::setStream( } - - void OPreparedStatement::FreeParams() { numParams = 0; diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 42d081866ca8..f1bab6f05b6d 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -593,7 +593,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx index 8b197eba9a26..060e94057262 100644 --- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx @@ -224,7 +224,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } - sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE; diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 104a98f4b625..24d5268b79ff 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -44,7 +44,6 @@ using namespace ::comphelper; OTools::ThrowException(m_pConnection,x,m_aStatementHandle,SQL_HANDLE_STMT,*this) - using namespace connectivity::odbc; using namespace com::sun::star::uno; @@ -520,7 +519,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } - sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -629,7 +627,6 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } - Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -640,7 +637,6 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } - void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 8f59ea8a32fe..5928eaeeec48 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -101,7 +101,6 @@ namespace pq_sdbc_driver { - // Helper class for statement lifetime management class ClosableReference : public cppu::WeakImplHelper< com::sun::star::uno::XReference > { @@ -660,7 +659,6 @@ Reference< XNameAccess > Connection::getViews() } - Reference< XNameAccess > Connection::getUsers() throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -684,7 +682,6 @@ Reference< XInterface > ConnectionCreateInstance( } - bool isLog( ConnectionSettings *settings, int loglevel ) { return settings->loglevel >= loglevel && settings->logFile; @@ -728,7 +725,6 @@ void log( ConnectionSettings *settings, sal_Int32 level, const char *str ) } - static const struct cppu::ImplementationEntry g_entries[] = { { diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index ef1c7e24966f..cdfd4463512c 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -78,8 +78,6 @@ public: struct ConnectionSettings; - - // Logging API namespace LogLevel @@ -155,7 +153,6 @@ typedef std::unordered_map< typedef ::std::vector< OString > OStringVector; - typedef std::unordered_map < sal_Int32, diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index fcd4847f75ac..267831bbf433 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1447,7 +1447,6 @@ static void columnMetaData2DatabaseTypeDescription( } - ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 801c2f132e0c..5cd030c6178c 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -169,8 +169,6 @@ Reference< XInterface > DriverCreateInstance( const Reference < XComponentContex } - - class OOneInstanceComponentFactory : public MutexHolder, public cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo > diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index 548aee69001a..f0d7a74ff88d 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -129,7 +129,6 @@ OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQL } - sal_Int32 SequenceResultSetMetaData::getPrecision( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 57d26df07f97..68ff3a14670b 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -986,7 +986,6 @@ sal_Bool Statement::getMoreResults( ) } - void Statement::disposing() { close(); diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 661f696616a9..1eeabfa69219 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -319,7 +319,6 @@ Statics & getStatics() keyDescDef, sizeof(keyDescDef)/sizeof(PropertyDef), 0 ); - // KeyColumn props set statics.refl.keycolumn.implName = "org.openoffice.comp.pq.sdbcx.KeyColumn"; statics.refl.keycolumn.serviceNames = Sequence< OUString > ( 1 ); @@ -727,7 +726,6 @@ Statics & getStatics() } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 071fbd7b84fc..0c70c9db06ee 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -959,8 +959,6 @@ OUString sqltype2string( const Reference< XPropertySet > & desc ) } - - static void keyType2String( OUStringBuffer & buf, sal_Int32 keyType ) { if( com::sun::star::sdbc::KeyRule::CASCADE == keyType ) diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index 040f2bb08218..325b3b4b4383 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -171,7 +171,6 @@ public: }; - } #endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_UPDATEABLERESULTSET_HXX diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index 7a3e053814b9..68259ebe9e17 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -91,9 +91,6 @@ Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) throw (Runt } - - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index 333192d848f5..d5d61cae2e98 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -568,7 +568,6 @@ Reference< com::sun::star::container::XNameAccess > Columns::create( } - ColumnDescriptors::ColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 6ce1c9c2099a..da865cc95ed1 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -160,7 +160,6 @@ Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std:: } - IndexDescriptor::IndexDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, @@ -233,8 +232,6 @@ Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index 5bc09afd0aab..d22312e4fd2c 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -301,7 +301,6 @@ Reference< com::sun::star::container::XNameAccess > Indexes::create( } - IndexDescriptors::IndexDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index e47a0434706e..2f216dd4d1f8 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -162,7 +162,6 @@ Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::ex } - KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index bfdfd24f1e8f..f22cc3e87cb2 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -169,7 +169,6 @@ void KeyColumns::refresh() } - void KeyColumns::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& future ) throw (::com::sun::star::sdbc::SQLException, diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index 39165fec26df..916034dfe6e6 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -346,8 +346,6 @@ void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::Runti } - - TableDescriptor::TableDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index 6812c25ff7c1..38e4a5c733a9 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -134,7 +134,6 @@ public: }; - class TableDescriptor : public ReflectionBase, public com::sun::star::sdbcx::XColumnsSupplier, diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index e090562cbaf5..9bb698273061 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -227,7 +227,6 @@ void View::setName( const OUString& aName ) throw (::com::sun::star::uno::Runtim } - ViewDescriptor::ViewDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index fbc2ebaebddb..db4cf6fbefaf 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -249,7 +249,6 @@ void Views::disposing() } - }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index fba73837c02d..7f2b75153ec0 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -138,7 +138,6 @@ namespace connectivity {WpOLEBase<Ts>::operator=(rhs); return *this;}; - inline void Refresh(){pInterface->Refresh();} inline sal_Int32 GetItemCount() const diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 9907e828013c..f97ba0673b17 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -60,7 +60,6 @@ namespace connectivity {WpOLEBase<ADOConnection>::operator=(rhs); return *this;} - WpADOProperties get_Properties() const; OUString GetConnectionString() const; @@ -154,7 +153,6 @@ namespace connectivity WpOLEBase<ADOCommand>::operator=(rhs); return *this;} - sal_Bool putref_ActiveConnection( WpADOConnection *pCon); void put_ActiveConnection(/* [in] */ const OLEVariant& vConn); @@ -192,7 +190,6 @@ namespace connectivity {WpOLEBase<ADOError>::operator=(rhs); return *this;} - OUString GetDescription() const; OUString GetSource() const ; sal_Int32 GetNumber() const ; @@ -201,8 +198,6 @@ namespace connectivity }; - - class WpADOField : public WpOLEBase<ADOField> { // friend class WpADOFields; @@ -251,8 +246,6 @@ namespace connectivity }; - - class WpADOProperty: public WpOLEBase<ADOProperty> { public: diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 18b143ac8dd0..9c137a02be49 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -78,9 +78,6 @@ namespace connectivity }; - - - class ONDXPage; // Index Page Pointer @@ -327,8 +324,6 @@ namespace connectivity } - - #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 9037f6dfd44f..cdb88fa15213 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -88,7 +88,6 @@ namespace connectivity OKeySet::Vector::iterator m_aFileSetIter; - OSortIndex* m_pSortIndex; ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index 85576b9c837e..7134fb1c8d59 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -76,7 +76,6 @@ namespace connectivity { namespace jdbc }; - } } // namespace connectivity::jdbc diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 760e01886c99..8a23976eefb1 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -99,7 +99,6 @@ namespace connectivity { namespace jdbc }; - } } // namespace connectivity::jdbc diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx index 44af7ef3a87d..e222bd055f4a 100644 --- a/connectivity/source/inc/java/sql/Timestamp.hxx +++ b/connectivity/source/inc/java/sql/Timestamp.hxx @@ -47,7 +47,6 @@ namespace connectivity }; - //************ Class: java.sql.Time diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index ff544c9fb047..b617f431e685 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -227,7 +227,6 @@ namespace connectivity } - } } #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OTOOLS_HXX diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx index e6ea846b7cfe..860d5cabce6d 100644 --- a/connectivity/source/parse/internalnode.cxx +++ b/connectivity/source/parse/internalnode.cxx @@ -55,7 +55,6 @@ OSQLInternalNode::OSQLInternalNode(const OUString &_NewValue, } - OSQLInternalNode::~OSQLInternalNode() { // remove the node from the garbage list diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 2aeb49f19ece..a32e5e5ca9f7 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1017,7 +1017,6 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele } - bool OSQLParseTreeIterator::traverseOrderByColumnNames(const OSQLParseNode* pSelectNode) { traverseByColumnNames( pSelectNode, true ); diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 7f7fdebfc9ad..6a7bb9956464 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -750,7 +750,6 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, c } - bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode, ::com::sun::star::uno::Any &_rCatalog, OUString &_rSchema, @@ -1300,7 +1299,6 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString } - OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext) :m_pContext(_pContext) ,m_pParseTree(nullptr) diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 15953687c993..7e41705efcb0 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -169,5 +169,4 @@ void SAL_CALL OGroup::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index 9c478f335233..6357b88c676b 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.cxx @@ -107,6 +107,4 @@ void OIndexColumn::construct() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index bec457e0a1cc..d47b1a6f7fd9 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.cxx @@ -111,7 +111,4 @@ void OKeyColumn::construct() } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 376f55889309..af4385024d4b 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -184,5 +184,4 @@ void SAL_CALL OUser::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index a1c9813b4a33..fe3b0ff1ebdc 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -130,5 +130,4 @@ void SAL_CALL OView::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index 3769c478e72d..422627f80559 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::beans; using namespace cppu; - void main( int argc, char * argv[] ) { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index 433964b8ef0f..e8ff2b91133d 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -102,7 +102,6 @@ namespace connectivity void releaseBuffer(); - // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper |