[Libreoffice-commits] core.git: connectivity/qa connectivity/source connectivity/workben
Alexander Wilms
f.alexander.wilms at gmail.com
Thu Feb 27 04:55:00 PST 2014
connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 2
connectivity/qa/connectivity/tools/AbstractDatabase.java | 4
connectivity/qa/connectivity/tools/CRMDatabase.java | 16 +-
connectivity/qa/connectivity/tools/CsvDatabase.java | 4
connectivity/qa/connectivity/tools/DbaseDatabase.java | 4
connectivity/qa/connectivity/tools/FlatFileDatabase.java | 4
connectivity/qa/connectivity/tools/HsqlDatabase.java | 4
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 4
connectivity/source/commontools/FValue.cxx | 10 -
connectivity/source/commontools/ParamterSubstitution.cxx | 4
connectivity/source/commontools/RowFunctionParser.cxx | 16 +-
connectivity/source/commontools/conncleanup.cxx | 14 +-
connectivity/source/commontools/dbcharset.cxx | 20 +--
connectivity/source/commontools/dbconversion.cxx | 8 -
connectivity/source/commontools/dbexception.cxx | 16 +-
connectivity/source/commontools/dbmetadata.cxx | 26 ++--
connectivity/source/commontools/dbtools2.cxx | 8 -
connectivity/source/commontools/filtermanager.cxx | 12 +-
connectivity/source/commontools/formattedcolumnvalue.cxx | 22 +--
connectivity/source/commontools/parameters.cxx | 16 +-
connectivity/source/commontools/paramwrapper.cxx | 16 +-
connectivity/source/commontools/predicateinput.cxx | 14 +-
connectivity/source/commontools/propertyids.cxx | 4
connectivity/source/commontools/sqlerror.cxx | 24 ++--
connectivity/source/commontools/statementcomposer.cxx | 16 +-
connectivity/source/commontools/warningscontainer.cxx | 12 +-
connectivity/source/cpool/ZConnectionPool.cxx | 8 -
connectivity/source/cpool/ZConnectionPool.hxx | 8 -
connectivity/source/cpool/ZConnectionWrapper.hxx | 4
connectivity/source/cpool/ZDriverWrapper.cxx | 12 +-
connectivity/source/cpool/ZDriverWrapper.hxx | 12 +-
connectivity/source/cpool/ZPoolCollection.hxx | 6 -
connectivity/source/cpool/ZPooledConnection.hxx | 4
connectivity/source/cpool/Zregistration.cxx | 4
connectivity/source/drivers/ado/ACallableStatement.cxx | 4
connectivity/source/drivers/ado/Aolevariant.cxx | 10 -
connectivity/source/drivers/dbase/DIndexIter.cxx | 4
connectivity/source/drivers/dbase/dindexnode.cxx | 16 +-
connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 4
connectivity/source/drivers/evoab2/NPreparedStatement.hxx | 4
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 4
connectivity/source/drivers/evoab2/NStatement.cxx | 4
connectivity/source/drivers/evoab2/NStatement.hxx | 4
connectivity/source/drivers/file/FResultSet.cxx | 2
connectivity/source/drivers/file/FStatement.cxx | 4
connectivity/source/drivers/file/fcode.cxx | 2
connectivity/source/drivers/file/fcomp.cxx | 2
connectivity/source/drivers/file/quotedstring.cxx | 4
connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 4
connectivity/source/drivers/firebird/Services.cxx | 6 -
connectivity/source/drivers/firebird/SubComponent.hxx | 4
connectivity/source/drivers/hsqldb/HConnection.cxx | 8 -
connectivity/source/drivers/hsqldb/HDriver.cxx | 24 ++--
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 14 +-
connectivity/source/drivers/hsqldb/HTerminateListener.cxx | 8 -
connectivity/source/drivers/hsqldb/HTerminateListener.hxx | 8 -
connectivity/source/drivers/hsqldb/HTools.cxx | 10 -
connectivity/source/drivers/hsqldb/HView.cxx | 12 +-
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 2
connectivity/source/drivers/jdbc/Array.cxx | 4
connectivity/source/drivers/jdbc/Blob.cxx | 4
connectivity/source/drivers/jdbc/Boolean.cxx | 4
connectivity/source/drivers/jdbc/CallableStatement.cxx | 4
connectivity/source/drivers/jdbc/Class.cxx | 4
connectivity/source/drivers/jdbc/Clob.cxx | 4
connectivity/source/drivers/jdbc/ConnectionLog.cxx | 20 +--
connectivity/source/drivers/jdbc/ContextClassLoader.cxx | 12 +-
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 4
connectivity/source/drivers/jdbc/Date.cxx | 4
connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx | 4
connectivity/source/drivers/jdbc/Exception.cxx | 4
connectivity/source/drivers/jdbc/InputStream.cxx | 4
connectivity/source/drivers/jdbc/JBigDecimal.cxx | 4
connectivity/source/drivers/jdbc/JConnection.cxx | 4
connectivity/source/drivers/jdbc/JStatement.cxx | 4
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 4
connectivity/source/drivers/jdbc/Reader.cxx | 4
connectivity/source/drivers/jdbc/Ref.cxx | 4
connectivity/source/drivers/jdbc/ResultSet.cxx | 4
connectivity/source/drivers/jdbc/ResultSetMetaData.cxx | 4
connectivity/source/drivers/jdbc/SQLException.cxx | 4
connectivity/source/drivers/jdbc/SQLWarning.cxx | 4
connectivity/source/drivers/jdbc/String.cxx | 4
connectivity/source/drivers/jdbc/Throwable.cxx | 4
connectivity/source/drivers/jdbc/Timestamp.cxx | 12 +-
connectivity/source/drivers/kab/KConnection.hxx | 4
connectivity/source/drivers/kab/KDEInit.cxx | 6 -
connectivity/source/drivers/kab/KDatabaseMetaData.hxx | 4
connectivity/source/drivers/kab/KDriver.cxx | 10 -
connectivity/source/drivers/kab/KDriver.hxx | 8 -
connectivity/source/drivers/kab/KStatement.hxx | 8 -
connectivity/source/drivers/kab/kcondition.hxx | 26 ++--
connectivity/source/drivers/macab/MacabConnection.hxx | 4
connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx | 4
connectivity/source/drivers/macab/MacabDriver.cxx | 10 -
connectivity/source/drivers/macab/MacabDriver.hxx | 8 -
connectivity/source/drivers/macab/MacabStatement.hxx | 8 -
connectivity/source/drivers/macab/macabcondition.hxx | 26 ++--
connectivity/source/drivers/macab/macabutilities.hxx | 10 -
connectivity/source/drivers/mork/MConnection.cxx | 4
connectivity/source/drivers/mork/MConnection.hxx | 4
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 4
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx | 2
connectivity/source/drivers/mork/MDriver.cxx | 2
connectivity/source/drivers/mork/MPreparedStatement.hxx | 4
connectivity/source/drivers/mork/MResultSet.cxx | 14 +-
connectivity/source/drivers/mork/MResultSetMetaData.hxx | 4
connectivity/source/drivers/mork/MStatement.hxx | 8 -
connectivity/source/drivers/mork/MorkParser.hxx | 6 -
connectivity/source/drivers/mozab/MColumnAlias.cxx | 6 -
connectivity/source/drivers/mozab/MConfigAccess.cxx | 10 -
connectivity/source/drivers/mozab/MConnection.cxx | 8 -
connectivity/source/drivers/mozab/MConnection.hxx | 6 -
connectivity/source/drivers/mozab/MDatabaseMetaData.hxx | 4
connectivity/source/drivers/mozab/MDriver.cxx | 2
connectivity/source/drivers/mozab/MPreparedStatement.hxx | 4
connectivity/source/drivers/mozab/MResultSet.cxx | 14 +-
connectivity/source/drivers/mozab/MResultSetMetaData.hxx | 4
connectivity/source/drivers/mozab/MStatement.hxx | 8 -
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx | 12 +-
connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx | 6 -
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 4
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx | 2
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 20 +--
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx | 12 +-
connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx | 4
connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx | 22 +--
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx | 8 -
connectivity/source/drivers/mysql/YDriver.cxx | 12 +-
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 4
connectivity/source/drivers/postgresql/pq_allocator.hxx | 30 ++---
connectivity/source/drivers/postgresql/pq_connection.cxx | 2
connectivity/source/drivers/postgresql/pq_connection.hxx | 8 -
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 4
connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 4
connectivity/source/inc/ParameterSubstitution.hxx | 4
connectivity/source/inc/RowFunctionParser.hxx | 8 -
connectivity/source/inc/ado/ACallableStatement.hxx | 4
connectivity/source/inc/ado/AConnection.hxx | 6 -
connectivity/source/inc/ado/ADatabaseMetaData.hxx | 4
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 2
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 4
connectivity/source/inc/ado/APreparedStatement.hxx | 4
connectivity/source/inc/ado/AResultSetMetaData.hxx | 4
connectivity/source/inc/ado/AStatement.hxx | 4
connectivity/source/inc/ado/ATable.hxx | 2
connectivity/source/inc/ado/Aolevariant.hxx | 4
connectivity/source/inc/ado/Aolewrap.hxx | 14 --
connectivity/source/inc/ado/Awrapado.hxx | 26 ++--
connectivity/source/inc/calc/CDatabaseMetaData.hxx | 4
connectivity/source/inc/dbase/DDatabaseMetaData.hxx | 4
connectivity/source/inc/dbase/DIndex.hxx | 4
connectivity/source/inc/dbase/DIndexIter.hxx | 4
connectivity/source/inc/dbase/dindexnode.hxx | 20 +--
connectivity/source/inc/file/FConnection.hxx | 4
connectivity/source/inc/file/FDatabaseMetaData.hxx | 4
connectivity/source/inc/file/FPreparedStatement.hxx | 4
connectivity/source/inc/file/FResultSet.hxx | 2
connectivity/source/inc/file/FResultSetMetaData.hxx | 4
connectivity/source/inc/file/FStatement.hxx | 4
connectivity/source/inc/file/quotedstring.hxx | 4
connectivity/source/inc/flat/EDatabaseMetaData.hxx | 4
connectivity/source/inc/hsqldb/HConnection.hxx | 8 -
connectivity/source/inc/hsqldb/HDriver.hxx | 8 -
connectivity/source/inc/hsqldb/HStorageMap.hxx | 12 +-
connectivity/source/inc/hsqldb/HTools.hxx | 12 +-
connectivity/source/inc/hsqldb/HView.hxx | 12 +-
connectivity/source/inc/java/ContextClassLoader.hxx | 12 +-
connectivity/source/inc/java/GlobalRef.hxx | 12 +-
connectivity/source/inc/java/LocalRef.hxx | 12 +-
connectivity/source/inc/java/io/InputStream.hxx | 4
connectivity/source/inc/java/io/Reader.hxx | 4
connectivity/source/inc/java/lang/Boolean.hxx | 4
connectivity/source/inc/java/lang/Class.hxx | 4
connectivity/source/inc/java/lang/Exception.hxx | 4
connectivity/source/inc/java/lang/Object.hxx | 6 -
connectivity/source/inc/java/lang/Throwable.hxx | 4
connectivity/source/inc/java/math/BigDecimal.hxx | 4
connectivity/source/inc/java/sql/Array.hxx | 4
connectivity/source/inc/java/sql/Blob.hxx | 4
connectivity/source/inc/java/sql/CallableStatement.hxx | 4
connectivity/source/inc/java/sql/Clob.hxx | 4
connectivity/source/inc/java/sql/ConnectionLog.hxx | 20 +--
connectivity/source/inc/java/sql/DatabaseMetaData.hxx | 4
connectivity/source/inc/java/sql/DriverPropertyInfo.hxx | 4
connectivity/source/inc/java/sql/JStatement.hxx | 4
connectivity/source/inc/java/sql/PreparedStatement.hxx | 4
connectivity/source/inc/java/sql/Ref.hxx | 4
connectivity/source/inc/java/sql/ResultSetMetaData.hxx | 4
connectivity/source/inc/java/sql/SQLException.hxx | 4
connectivity/source/inc/java/sql/SQLWarning.hxx | 4
connectivity/source/inc/java/sql/Timestamp.hxx | 12 +-
connectivity/source/inc/java/util/Date.hxx | 4
connectivity/source/inc/mysql/YDriver.hxx | 8 -
connectivity/source/inc/odbc/OBoundParam.hxx | 44 +++----
connectivity/source/inc/odbc/OConnection.hxx | 6 -
connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 4
connectivity/source/inc/odbc/OFunctiondefs.hxx | 6 -
connectivity/source/inc/odbc/OPreparedStatement.hxx | 4
connectivity/source/inc/odbc/OResultSetMetaData.hxx | 4
connectivity/source/inc/odbc/OStatement.hxx | 8 -
connectivity/source/inc/odbc/OTools.hxx | 2
connectivity/source/inc/propertyids.hxx | 8 -
connectivity/source/inc/resource/ado_res.hrc | 4
connectivity/source/inc/resource/calc_res.hrc | 4
connectivity/source/inc/resource/common_res.hrc | 4
connectivity/source/inc/resource/conn_shared_res.hrc | 4
connectivity/source/inc/resource/dbase_res.hrc | 4
connectivity/source/inc/resource/evoab2_res.hrc | 4
connectivity/source/inc/resource/file_res.hrc | 4
connectivity/source/inc/resource/hsqldb_res.hrc | 4
connectivity/source/inc/resource/kab_res.hrc | 4
connectivity/source/inc/resource/macab_res.hrc | 4
connectivity/source/inc/resource/mork_res.hrc | 4
connectivity/source/inc/resource/mozab_res.hrc | 4
connectivity/source/inc/resource/sharedresources.hxx | 12 +-
connectivity/source/manager/mdrivermanager.cxx | 18 +--
connectivity/source/manager/mdrivermanager.hxx | 8 -
connectivity/source/manager/mregistration.cxx | 4
connectivity/source/parse/sqlbison.y | 58 +++++-----
connectivity/source/parse/sqliterator.cxx | 8 -
connectivity/source/parse/sqlnode.cxx | 10 -
connectivity/source/resource/conn_log_res.src | 4
connectivity/source/resource/conn_shared_res.src | 12 +-
connectivity/source/resource/sharedresources.cxx | 20 +--
connectivity/source/sdbcx/VDescriptor.cxx | 4
connectivity/source/simpledbt/charset_s.cxx | 12 +-
connectivity/source/simpledbt/charset_s.hxx | 12 +-
connectivity/source/simpledbt/dbtfactory.cxx | 14 +-
connectivity/source/simpledbt/dbtfactory.hxx | 12 +-
connectivity/source/simpledbt/parsenode_s.cxx | 12 +-
connectivity/source/simpledbt/parsenode_s.hxx | 12 +-
connectivity/source/simpledbt/parser_s.cxx | 12 +-
connectivity/source/simpledbt/parser_s.hxx | 12 +-
connectivity/source/simpledbt/refbase.cxx | 12 +-
connectivity/source/simpledbt/refbase.hxx | 12 +-
connectivity/source/simpledbt/staticdbtools_s.cxx | 12 +-
connectivity/source/simpledbt/staticdbtools_s.hxx | 56 ++++-----
connectivity/workben/little/main.cxx | 2
connectivity/workben/testmoz/main.cxx | 2
243 files changed, 961 insertions(+), 971 deletions(-)
New commits:
commit ac9212feedb828064c5cf5cbb0bde8f02cc93d65
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 17:59:09 2014 +0100
Remove visual noise from connectivity
Conflicts:
connectivity/source/inc/odbc/OConnection.hxx
Change-Id: I5ca98359e18cf1b27bf53037dde211774d798626
Reviewed-on: https://gerrit.libreoffice.org/8245
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 6fa5baf..c8c2816 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -108,7 +108,7 @@ public class TestCacheSize {
// if the extra table needs to be created and filled up
boolean multikeytable = false;
- //
+
String user;
String password;
XStatement sStatement;
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 28d05dd..4e048e0 100644
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -39,7 +39,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
m_orb = orb;
}
- // --------------------------------------------------------------------------------------------------------
+
public AbstractDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL ) throws Exception
{
m_orb = orb;
@@ -153,7 +153,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
return m_orb;
}
- // --------------------------------------------------------------------------------------------------------
+
final protected void createDBDocument(final String _docURL) throws Exception
{
m_databaseDocumentFile = _docURL;
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index ea807ae..57b9e85 100644
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
@@ -88,7 +88,7 @@ public class CRMDatabase
m_connection = m_database.defaultConnection();
}
- // --------------------------------------------------------------------------------------------------------
+
/** returns the database document underlying the CRM database
*/
public final HsqlDatabase getDatabase()
@@ -96,7 +96,7 @@ public class CRMDatabase
return m_database;
}
- // --------------------------------------------------------------------------------------------------------
+
/** returns the default connection to the database
*/
public final Connection getConnection()
@@ -104,7 +104,7 @@ public class CRMDatabase
return m_connection;
}
- // --------------------------------------------------------------------------------------------------------
+
public void saveAndClose() throws SQLException, IOException
{
XDatabaseDocumentUI ui = getDocumentUI();
@@ -114,14 +114,14 @@ public class CRMDatabase
m_database.closeAndDelete();
}
- // --------------------------------------------------------------------------------------------------------
+
public XDatabaseDocumentUI getDocumentUI()
{
XModel docModel = UnoRuntime.queryInterface( XModel.class, m_database.getDatabaseDocument() );
return UnoRuntime.queryInterface( XDatabaseDocumentUI.class, docModel.getCurrentController() );
}
- // --------------------------------------------------------------------------------------------------------
+
public XController loadSubComponent( final int _objectType, final String _name ) throws IllegalArgumentException, SQLException, NoSuchElementException
{
XDatabaseDocumentUI docUI = getDocumentUI();
@@ -136,7 +136,7 @@ public class CRMDatabase
return document.getCurrentController();
}
- // --------------------------------------------------------------------------------------------------------
+
private void createTables() throws SQLException
{
HsqlTableDescriptor table = new HsqlTableDescriptor( "categories",
@@ -206,7 +206,7 @@ public class CRMDatabase
m_connection.refreshTables();
}
- // --------------------------------------------------------------------------------------------------------
+
private void validateUnparseable()
{
/*
@@ -242,7 +242,7 @@ public class CRMDatabase
*/
}
- // --------------------------------------------------------------------------------------------------------
+
private void createQueries() throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
{
m_database.getDataSource().createQuery(
diff --git a/connectivity/qa/connectivity/tools/CsvDatabase.java b/connectivity/qa/connectivity/tools/CsvDatabase.java
index 36e66f8..b2c3a17 100644
--- a/connectivity/qa/connectivity/tools/CsvDatabase.java
+++ b/connectivity/qa/connectivity/tools/CsvDatabase.java
@@ -22,13 +22,13 @@ import com.sun.star.lang.XMultiServiceFactory;
public class CsvDatabase extends FlatFileDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
public CsvDatabase( final XMultiServiceFactory i_orb ) throws Exception
{
super( i_orb, "flat" );
}
- // --------------------------------------------------------------------------------------------------------
+
protected CsvDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
{
super( i_orb, i_existingDocumentURL, "flat" );
diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index 6e71df8..f3f8831 100644
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -22,13 +22,13 @@ import com.sun.star.lang.XMultiServiceFactory;
public class DbaseDatabase extends FlatFileDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
public DbaseDatabase( final XMultiServiceFactory i_orb ) throws Exception
{
super( i_orb, "dbase" );
}
- // --------------------------------------------------------------------------------------------------------
+
protected DbaseDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
{
super( i_orb, i_existingDocumentURL, "dbase" );
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
index 03112d5..f3fddff 100644
--- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -29,7 +29,7 @@ import java.io.File;
class FlatFileDatabase extends AbstractDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
protected FlatFileDatabase( final XMultiServiceFactory i_orb, final String i_urlSubScheme ) throws Exception
{
super(i_orb);
@@ -37,7 +37,7 @@ class FlatFileDatabase extends AbstractDatabase
createDBDocument();
}
- // --------------------------------------------------------------------------------------------------------
+
protected FlatFileDatabase(final XMultiServiceFactory i_orb, final String i_existingDocumentURL,
final String i_urlSubScheme ) throws Exception
{
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 0ea5e0d..dd6831d 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -38,14 +38,14 @@ import java.io.File;
public class HsqlDatabase extends AbstractDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
public HsqlDatabase(final XMultiServiceFactory orb) throws Exception
{
super(orb);
createDBDocument();
}
- // --------------------------------------------------------------------------------------------------------
+
public HsqlDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL) throws Exception
{
super(orb, _existingDocumentURL);
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 13f38d2..2802d2c 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -902,9 +902,9 @@ using ::com::sun::star::registry::InvalidRegistryException;
using ::com::sun::star::registry::InvalidValueException;
using ::com::sun::star::lang::XMultiServiceFactory;
-//==========================================================================
+
//= registration
-//==========================================================================
+
extern "C"
{
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 646a80c..4d71152 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -124,7 +124,7 @@ namespace tracing
AllocationType( ) : pName( NULL ), nAllocatedUnits( 0 ) { }
};
- // =============================================================================
+
class AllocationTracer
{
public:
@@ -140,7 +140,7 @@ namespace tracing
static AllocationState::iterator getLocation( const sal_Char* _pName );
};
- // =============================================================================
+
AllocationTracer::AllocationState::iterator AllocationTracer::getLocation( const sal_Char* _pName )
{
AllocationState::iterator aLookFor = s_aAllocated.begin();
@@ -160,11 +160,11 @@ namespace tracing
return aLookFor;
}
- // =============================================================================
+
AllocationTracer::AllocationState AllocationTracer::s_aAllocated;
::osl::Mutex AllocationTracer::s_aMutex;
- // =============================================================================
+
void AllocationTracer::registerUnit( const sal_Char* _pName )
{
::osl::MutexGuard aGuard( s_aMutex );
@@ -173,7 +173,7 @@ namespace tracing
++aPos->nAllocatedUnits;
}
- // =============================================================================
+
void AllocationTracer::revokeUnit( const sal_Char* _pName )
{
::osl::MutexGuard aGuard( s_aMutex );
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 76251af..3c90dc4 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -112,8 +112,8 @@ namespace connectivity
-// ==================================
+
} // connectivity
-// ==================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index 8e2e437..b9b4939 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -47,11 +47,11 @@ using namespace com::sun::star;
namespace
{
-//////////////////////
-//////////////////////
+
+
// EXPRESSION NODES
-//////////////////////
-//////////////////////
+
+
class ConstantValueExpression : public ExpressionNode
{
ORowSetValueDecoratorRef maValue;
@@ -140,11 +140,11 @@ public:
};
-////////////////////////
-////////////////////////
+
+
// FUNCTION PARSER
-////////////////////////
-////////////////////////
+
+
typedef const sal_Char* StringIteratorT;
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 5da0c91..d004fa0 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -22,26 +22,26 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <osl/diagnose.h>
-//.........................................................................
+
namespace dbtools
{
-//.........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
- //=====================================================================
+
static const OUString& getActiveConnectionPropertyName()
{
static const OUString s_sActiveConnectionPropertyName( "ActiveConnection" );
return s_sActiveConnectionPropertyName;
}
- //=====================================================================
+
//= OAutoConnectionDisposer
- //=====================================================================
+
OAutoConnectionDisposer::OAutoConnectionDisposer(const Reference< XRowSet >& _rxRowSet, const Reference< XConnection >& _rxConnection)
:m_xRowSet( _rxRowSet )
@@ -229,8 +229,8 @@ namespace dbtools
}
-//.........................................................................
+
} // namespace dbtools
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 9dd3828..eddaea1 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -22,14 +22,14 @@
#include <osl/diagnose.h>
#include <rtl/tencinfo.h>
-//.........................................................................
+
namespace dbtools
{
-//.........................................................................
- //=========================================================================
+
+
//= OCharsetMap
- //=========================================================================
+
OCharsetMap::OCharsetMap()
{
@@ -128,9 +128,9 @@ namespace dbtools
return CharsetIterator( this, m_aEncodings.end() );
}
- //=========================================================================
+
//= CharsetIteratorDerefHelper
- //=========================================================================
+
CharsetIteratorDerefHelper::CharsetIteratorDerefHelper( const CharsetIteratorDerefHelper& _rSource )
:m_eEncoding( _rSource.m_eEncoding )
@@ -145,9 +145,9 @@ namespace dbtools
{
}
- //=========================================================================
+
//= OCharsetMap::CharsetIterator
- //=========================================================================
+
OCharsetMap::CharsetIterator::CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos )
:m_pContainer( _pContainer )
@@ -210,8 +210,8 @@ namespace dbtools
return ( lhs.m_pContainer == rhs.m_pContainer ) && ( lhs.m_aPos == rhs.m_aPos );
}
-//.........................................................................
+
} // namespace dbtools
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 579c0e2..a536f688 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -46,10 +46,10 @@ namespace
const double fNanoSecondsPerDay = nanoSecInSec * secInMin * minInHour * 24.0;
}
-//.........................................................................
+
namespace dbtools
{
-//.........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@@ -447,9 +447,9 @@ namespace dbtools
return aTime;
}
-//.........................................................................
+
} // namespace dbtools
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 931c2cc..176239c 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -28,10 +28,10 @@
#include "resource/common_res.hrc"
#include "resource/sharedresources.hxx"
-//.........................................................................
+
namespace dbtools
{
-//.........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
@@ -39,9 +39,9 @@ namespace dbtools
using namespace ::comphelper;
using namespace ::connectivity;
-//==============================================================================
+
//= SQLExceptionInfo - encapsulating the type info of an SQLException-derived class
-//==============================================================================
+
SQLExceptionInfo::SQLExceptionInfo()
:m_eType(UNDEFINED)
@@ -262,9 +262,9 @@ void SQLExceptionInfo::doThrow()
throw RuntimeException();
}
-//==============================================================================
+
//= SQLExceptionIteratorHelper
-//==============================================================================
+
SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const SQLExceptionInfo& _rChainStart )
@@ -496,9 +496,9 @@ OUString getStandardSQLState( StandardSQLState _eState )
}
-//.........................................................................
+
} // namespace dbtools
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index dad2ceb..75fcc66 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -43,10 +43,10 @@
#include <boost/optional.hpp>
-//........................................................................
+
namespace dbtools
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::sdbc::XConnection;
@@ -72,9 +72,9 @@ namespace dbtools
namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
- //====================================================================
+
//= DatabaseMetaData_Impl
- //====================================================================
+
struct DatabaseMetaData_Impl
{
Reference< XConnection > xConnection;
@@ -97,7 +97,7 @@ namespace dbtools
namespace
{
- //................................................................
+
static void lcl_construct( DatabaseMetaData_Impl& _metaDataImpl, const Reference< XConnection >& _connection )
{
_metaDataImpl.xConnection = _connection;
@@ -109,7 +109,7 @@ namespace dbtools
throw IllegalArgumentException();
}
- //................................................................
+
static void lcl_checkConnected( const DatabaseMetaData_Impl& _metaDataImpl )
{
if ( !_metaDataImpl.xConnection.is() || !_metaDataImpl.xConnectionMetaData.is() )
@@ -120,7 +120,7 @@ namespace dbtools
}
}
- //................................................................
+
static bool lcl_getDriverSetting( const sal_Char* _asciiName, const DatabaseMetaData_Impl& _metaData, Any& _out_setting )
{
lcl_checkConnected( _metaData );
@@ -131,7 +131,7 @@ namespace dbtools
return true;
}
- //................................................................
+
static bool lcl_getConnectionSetting( const sal_Char* _asciiName, const DatabaseMetaData_Impl& _metaData, Any& _out_setting )
{
try
@@ -162,7 +162,7 @@ namespace dbtools
return false;
}
- //................................................................
+
static const OUString& lcl_getConnectionStringSetting(
const DatabaseMetaData_Impl& _metaData, ::boost::optional< OUString >& _cachedSetting,
OUString (SAL_CALL XDatabaseMetaData::*_getter)() )
@@ -180,9 +180,9 @@ namespace dbtools
}
}
- //====================================================================
+
//= DatabaseMetaData
- //====================================================================
+
DatabaseMetaData::DatabaseMetaData()
:m_pImpl( new DatabaseMetaData_Impl )
@@ -431,8 +431,8 @@ namespace dbtools
return bSupported;
}
-//........................................................................
+
} // namespace dbtools
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 65f1039..f6077d25 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -46,10 +46,10 @@
#include <tools/diagnose_ex.h>
#include <unotools/sharedunocomponent.hxx>
-//.........................................................................
+
namespace dbtools
{
-//.........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
@@ -1014,8 +1014,8 @@ OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >&
return OUString();
}
-//.........................................................................
+
} // namespace dbtools
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 3612ef8..055dec7 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -26,10 +26,10 @@
#include <tools/diagnose_ex.h>
#include <rtl/ustrbuf.hxx>
-//........................................................................
+
namespace dbtools
{
-//........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
@@ -38,9 +38,9 @@ namespace dbtools
using namespace ::com::sun::star::beans;
using namespace connectivity;
- //====================================================================
+
//= FilterManager
- //====================================================================
+
FilterManager::FilterManager( )
:m_aFilterComponents( FC_COMPONENT_COUNT )
@@ -168,8 +168,8 @@ namespace dbtools
return aComposedFilter.makeStringAndClear();
}
-//........................................................................
+
} // namespace dbtools
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 3934140..99ea133 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -35,10 +35,10 @@
#include <comphelper/numbers.hxx>
#include <unotools/sharedunocomponent.hxx>
-//........................................................................
+
namespace dbtools
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
@@ -66,9 +66,9 @@ namespace dbtools
namespace DataType = ::com::sun::star::sdbc::DataType;
namespace NumberFormat = ::com::sun::star::util::NumberFormat;
- //====================================================================
+
//= FormattedColumnValue_Data
- //====================================================================
+
struct FormattedColumnValue_Data
{
Reference< XNumberFormatter > m_xFormatter;
@@ -97,7 +97,7 @@ namespace dbtools
namespace
{
- //................................................................
+
void lcl_clear_nothrow( FormattedColumnValue_Data& _rData )
{
_rData.m_xFormatter.clear();
@@ -110,7 +110,7 @@ namespace dbtools
_rData.m_xColumnUpdate.clear();
}
- //................................................................
+
void lcl_initColumnDataValue_nothrow( FormattedColumnValue_Data& _rData,
const Reference< XNumberFormatter >& i_rNumberFormatter, const Reference< XPropertySet >& _rxColumn )
{
@@ -183,7 +183,7 @@ namespace dbtools
}
}
- //................................................................
+
void lcl_initColumnDataValue_nothrow( const Reference<XComponentContext>& i_rContext, FormattedColumnValue_Data& i_rData,
const Reference< XRowSet >& i_rRowSet, const Reference< XPropertySet >& i_rColumn )
{
@@ -211,9 +211,9 @@ namespace dbtools
}
}
- //====================================================================
+
//= FormattedColumnValue
- //====================================================================
+
FormattedColumnValue::FormattedColumnValue( const Reference< XComponentContext >& _rxContext,
const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& i_rColumn )
@@ -321,8 +321,8 @@ namespace dbtools
return sStringValue;
}
-//........................................................................
+
} // namespace dbtools
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 65cbacf..77599d8 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -41,10 +41,10 @@
#include "connectivity/ParameterCont.hxx"
#include <rtl/ustrbuf.hxx>
-//........................................................................
+
namespace dbtools
{
-//........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
@@ -59,9 +59,9 @@ namespace dbtools
using namespace ::comphelper;
using namespace ::connectivity;
- //====================================================================
+
//= ParameterManager
- //====================================================================
+
ParameterManager::ParameterManager( ::osl::Mutex& _rMutex, const Reference< XComponentContext >& _rxContext )
:m_rMutex ( _rMutex )
@@ -1092,17 +1092,17 @@ namespace dbtools
m_xInnerParamUpdate->clearParameters( );
}
- //====================================================================
+
//= OParameterContinuation
- //====================================================================
+
void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException, std::exception )
{
m_aValues = _rValues;
}
-//........................................................................
+
} // namespace frm
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 8c57680..84e4720 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -29,12 +29,12 @@
#define PROPERTY_ID_VALUE 1000
-//........................................................................
+
namespace dbtools
{
namespace param
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::sdbc::XParameters;
@@ -62,9 +62,9 @@ namespace param
namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
namespace DataType = ::com::sun::star::sdbc::DataType;
- //====================================================================
+
//= ParameterWrapper
- //====================================================================
+
ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn )
:PropertyBase( m_aBHelper )
@@ -246,9 +246,9 @@ namespace param
m_aBHelper.bDisposed = sal_True;
}
- //====================================================================
+
//= ParameterWrapperContainer
- //====================================================================
+
ParameterWrapperContainer::ParameterWrapperContainer()
:ParameterWrapperContainer_Base( m_aMutex )
@@ -344,8 +344,8 @@ namespace param
m_aParameters.swap( aEmpty );
}
-//........................................................................
+
} } // namespace dbtools::param
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 74e00ae..7575113 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -34,10 +34,10 @@
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-//.........................................................................
+
namespace dbtools
{
-//.........................................................................
+
using ::com::sun::star::sdbc::XConnection;
using ::com::sun::star::util::XNumberFormatsSupplier;
@@ -60,7 +60,7 @@ namespace dbtools
using ::connectivity::OSQLParseNode;
- //=====================================================================
+
static sal_Unicode lcl_getSeparatorChar( const OUString& _rSeparator, sal_Unicode _nFallback )
{
@@ -72,9 +72,9 @@ namespace dbtools
return nReturn;
}
- //=====================================================================
+
//= OPredicateInputController
- //=====================================================================
+
sal_Bool OPredicateInputController::getSeparatorChars( const Locale& _rLocale, sal_Unicode& _rDecSep, sal_Unicode& _rThdSep ) const
{
@@ -432,9 +432,9 @@ namespace dbtools
}
return sReturn;
}
-//.........................................................................
+
} // namespace dbtools
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 863e962..fb9f2d3 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -85,9 +85,9 @@ namespace dbtools
const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION() { return "ActiveConnection"; }
const sal_Char* getPROPERTY_ID_LABEL() { return "Label"; }
- //============================================================
+
//= error messages
- //============================================================
+
const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; }
const sal_Char* getSTR_DELIMITER() { return "/"; }
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index c9db24f..14686fd 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -28,10 +28,10 @@
#include <string.h>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
@@ -51,9 +51,9 @@ namespace connectivity
typedef SQLError::ParamValue ParamValue;
}
- //====================================================================
+
//= SQLError_Impl - declaration
- //====================================================================
+
class SQLError_Impl
{
public:
@@ -94,9 +94,9 @@ namespace connectivity
bool m_bAttemptedInit;
};
- //====================================================================
+
//= SQLError_Impl - implementation
- //====================================================================
+
SQLError_Impl::SQLError_Impl( const Reference<XComponentContext> & _rxContext )
:m_aContext( _rxContext )
@@ -120,7 +120,7 @@ namespace connectivity
namespace
{
- //................................................................
+
/** substitutes a given placeholder in the given message with the given value
*/
void lcl_substitutePlaceholder( OUString& _rMessage, const sal_Char* _pPlaceholder, ParamValue _rParamValue )
@@ -136,7 +136,7 @@ namespace connectivity
_rMessage = _rMessage.replaceAt( nIndex, nPlaceholderLen, *_rParamValue );
}
- //................................................................
+
sal_Int32 lcl_getResourceID( const ErrorCondition _eCondition, bool _bSQLState )
{
return 256
@@ -281,9 +281,9 @@ namespace connectivity
return m_pResources.get() != NULL;
}
- //====================================================================
+
//= SQLError
- //====================================================================
+
SQLError::SQLError( const Reference<XComponentContext> & _rxContext )
:m_pImpl( new SQLError_Impl( _rxContext ) )
@@ -339,8 +339,8 @@ namespace connectivity
return m_pImpl->getSQLException( _eCondition, _rxContext, _rParamValue1, _rParamValue2, _rParamValue3 );
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index a003562..4de06b3 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -31,10 +31,10 @@
#include <tools/diagnose_ex.h>
#include <comphelper/property.hxx>
-//........................................................................
+
namespace dbtools
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::sdbc::XConnection;
@@ -52,9 +52,9 @@ namespace dbtools
namespace CommandType = ::com::sun::star::sdb::CommandType;
- //====================================================================
+
//= StatementComposer_Data
- //====================================================================
+
struct StatementComposer_Data
{
const Reference< XConnection > xConnection;
@@ -233,9 +233,9 @@ namespace dbtools
}
}
- //====================================================================
+
//= StatementComposer
- //====================================================================
+
StatementComposer::StatementComposer( const Reference< XConnection >& _rxConnection,
const OUString& _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing )
@@ -291,8 +291,8 @@ namespace dbtools
return OUString();
}
-//........................................................................
+
} // namespace dbtools
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index 0681bcb..1091eae 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -23,18 +23,18 @@
#include <osl/diagnose.h>
-//........................................................................
+
namespace dbtools
{
-//........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
- //====================================================================
+
//= WarningsContainer
- //====================================================================
+
static void lcl_concatWarnings( Any& _rChainLeft, const Any& _rChainRight )
{
@@ -108,8 +108,8 @@ namespace dbtools
appendWarning( SQLWarning( _rWarning, _rxContext, OUString::createFromAscii( _pAsciiSQLState ), 0, Any() ) );
}
-//........................................................................
+
} // namespace dbtools
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 0a316c2..fc289fb 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -41,9 +41,9 @@ using namespace connectivity;
#include <algorithm>
-//==========================================================================
+
//= OPoolTimer
-//==========================================================================
+
void SAL_CALL OPoolTimer::onShot()
{
m_pPool->invalidatePooledConnections();
@@ -58,9 +58,9 @@ namespace
}
}
-//==========================================================================
+
//= OConnectionPool
-//==========================================================================
+
OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
const Reference< XInterface >& _xDriverNode,
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index becc07e..6d2f155 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -40,9 +40,9 @@
namespace connectivity
{
class OConnectionPool;
- //==========================================================================
+
/// OPoolTimer - Invalidates the connection pool
- //==========================================================================
+
class OPoolTimer : public ::salhelper::Timer
{
OConnectionPool* m_pPool;
@@ -55,10 +55,10 @@ namespace connectivity
virtual void SAL_CALL onShot();
};
- //==========================================================================
+
//= OConnectionPool - the one-instance service for PooledConnections
//= manages the active connections and the connections in the pool
- //==========================================================================
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base;
// typedef for the interanl structure
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 886b671..ed10d63 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -29,10 +29,10 @@
namespace connectivity
{
- //==========================================================================
+
//= OConnectionWeakWrapper - wraps all methods to the real connection from the driver
//= but when disposed it doesn't dispose the real connection
- //==========================================================================
+
typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection
> OConnectionWeakWrapper_BASE;
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 6d8a497..8883821 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -21,18 +21,18 @@
#include "ZConnectionPool.hxx"
#include <osl/diagnose.h>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::beans;
- //====================================================================
+
//= ODriverWrapper
- //====================================================================
+
ODriverWrapper::ODriverWrapper( Reference< XAggregation >& _rxAggregateDriver, OConnectionPool* _pPool )
:m_pConnectionPool(_pPool)
@@ -118,9 +118,9 @@ namespace connectivity
return m_xDriver.is() ? m_xDriver->getMinorVersion() : 0;
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 21eef74..4874596 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -25,15 +25,15 @@
#include <osl/mutex.hxx>
#include <com/sun/star/uno/XAggregation.hpp>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
class OConnectionPool;
- //====================================================================
+
//= ODriverWrapper
- //====================================================================
+
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdbc::XDriver
> ODriverWrapper_BASE;
@@ -72,9 +72,9 @@ namespace connectivity
virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // _CONNECTIVITY_CPOOL_ZDRIVERWRAPPER_HXX_
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 04ede10..767241e 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -43,10 +43,10 @@
namespace connectivity
{
class OConnectionPool;
- //==========================================================================
+
//= OPoolCollection - the one-instance service for PooledConnections
//= manages the active connections and the connections in the pool
- //==========================================================================
+
typedef ::cppu::WeakImplHelper4< ::com::sun::star::sdbc::XConnectionPool,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::frame::XTerminateListener,
@@ -57,7 +57,7 @@ namespace connectivity
class OPoolCollection : public OPoolCollection_Base
{
- //==========================================================================
+
typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare;
typedef std::map<OUString, OConnectionPool*> OConnectionPools;
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index b587f5b..72f9d5f 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -28,10 +28,10 @@
namespace connectivity
{
- //==========================================================================
+
//= OPooledConnection -
//= allows to pool a real connection
- //==========================================================================
+
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XPooledConnection
,::com::sun::star::lang::XEventListener> OPooledConnection_Base;
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 880190e..c10ce44 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -27,9 +27,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
using namespace connectivity;
-//==========================================================================
+
//= registration
-//==========================================================================
+
extern "C"
{
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 1823251..0d8846f 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -34,9 +34,9 @@ IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement
m_pParameters->get_Item(OLEVariant(sal_Int32(columnIndex-1)),&pParam); \
if(pParam) \
pParam->get_Value(&m_aValue);
-//**************************************************************
+
//************ Class: java.sql.CallableStatement
-//**************************************************************
+
OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql )
: OPreparedStatement( _pConnection, _TypeInfo, sql )
{
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index cebb4a3..af91f6fe 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -188,7 +188,7 @@ OLEVariant::OLEVariant(const ::com::sun::star::uno::Sequence< sal_Int8 >& x)
OSL_UNUSED(rs);
}
}
-//
+
OLEVariant& OLEVariant::operator=(const OLEVariant& varSrc)
{
HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(static_cast<const VARIANT*>(&varSrc)));
@@ -197,7 +197,7 @@ OLEVariant& OLEVariant::operator=(const OLEVariant& varSrc)
return *this;
}
// Assign a const VARIANT& (::VariantCopy handles everything)
-//
+
OLEVariant& OLEVariant::operator=(const tagVARIANT& varSrc)
{
HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(&varSrc));
@@ -208,7 +208,7 @@ OLEVariant& OLEVariant::operator=(const tagVARIANT& varSrc)
}
// Assign a const VARIANT* (::VariantCopy handles everything)
-//
+
OLEVariant& OLEVariant::operator=(const VARIANT* pSrc)
{
HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(pSrc));
@@ -415,9 +415,9 @@ OLEVariant::operator OUString() const
void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc)
{
- //
+
// If pDest is NULL, convert type in place
- //
+
if (pSrc == NULL)
pSrc = this;
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 00ca2e7..f649958 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -24,9 +24,9 @@ using namespace ::com::sun::star::sdb;
using namespace connectivity;
using namespace connectivity::dbase;
using namespace connectivity::file;
-//==================================================================
+
// OIndexIterator
-//==================================================================
+
OIndexIterator::~OIndexIterator()
{
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 04d5fed..a817325 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -65,9 +65,9 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
}
-//==================================================================
+
// index page
-//==================================================================
+
ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
:nPagePos(nPos)
,bModified(sal_False)
@@ -647,9 +647,9 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage)
}
}
}
-//==================================================================
+
// ONDXNode
-//==================================================================
+
void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
@@ -727,9 +727,9 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
return aChild;
}
-//==================================================================
+
// ONDXKey
-//==================================================================
+
sal_Bool ONDXKey::IsText(sal_Int32 eType)
{
@@ -797,9 +797,9 @@ SvStream& connectivity::dbase::WriteONDXPagePtr(SvStream &rStream, const ONDXPag
return rStream;
}
-//==================================================================
+
// ONDXPagePtr
-//==================================================================
+
ONDXPagePtr::ONDXPagePtr(const ONDXPagePtr& rRef)
:ONDXPageRef(rRef)
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 0173931..90ff744 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -29,9 +29,9 @@ namespace connectivity
{
namespace evoab
{
- //**************************************************************
+
//************ Class: OEvoabDatabaseMetaData
- //**************************************************************
+
typedef struct{
gboolean bIsSplittedValue;
GParamSpec *pField;
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index df8aece..beadbc8 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
@@ -58,9 +58,9 @@ namespace connectivity
};
::std::vector< Parameter> m_aParameters;
- //====================================================================
+
// Data attributes
- //====================================================================
+
// our SQL statement
OUString m_sSqlStatement;
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 9e1e752..d50b6bf 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -29,9 +29,9 @@ namespace connectivity
{
namespace evoab
{
- //**************************************************************
+
//************ Class: ResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OEvoabResultSetMetaData : public OResultSetMetaData_BASE
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index c2001a1..7c3458b3 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -598,9 +598,9 @@ Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( )
return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
}
-// =============================================================================
+
// = OStatement
-// =============================================================================
+
IMPLEMENT_SERVICE_INFO( OStatement, "com.sun.star.comp.sdbcx.evoab.OStatement", "com.sun.star.sdbc.Statement" );
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 0ad2539..5339e4d 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -130,10 +130,10 @@ namespace connectivity
}
};
- //**************************************************************
+
//************ Class: OCommonStatement
// is a base class for the normal statement and for the prepared statement
- //**************************************************************
+
class OCommonStatement;
typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 18cc3df..59d4c47 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1026,7 +1026,7 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OResultSet::Move" );
//IgnoreDeletedRows:
-//
+
sal_Int32 nTempPos = m_nRowPos;
if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 9ba315f..7845d26 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -748,9 +748,9 @@ void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLPar
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OStatement_Base::parseParamterElem" );
// do nothing here
}
-// =============================================================================
+
} // namespace file
-// =============================================================================
+
}// namespace connectivity
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 9ce2d50..f20afff 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -189,7 +189,7 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS
m_aValue.setBound(true);
}
-/////////////////////////////////////////////////////////////////////////////////////////
+
// Implementation of the operators
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index d48adc8..7931e6a 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -546,7 +546,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
return pOperand;
}
-////////////////////////////////////////////////////////////////////////////////////////
+
sal_Bool OPredicateInterpreter::evaluate(OCodeList& rCodeList)
{
static sal_Bool bResult;
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 84b4f9f..6a955b3 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -22,9 +22,9 @@
namespace connectivity
{
- //==================================================================
+
//= QuotedTokenizedString
- //==================================================================
+
sal_Int32 QuotedTokenizedString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) const
{
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index 2c0cc4b..1d80ea0 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -29,9 +29,9 @@ namespace connectivity
{
namespace firebird
{
- //**************************************************************
+
//************ Class: ODatabaseMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 65bacd7..883ff7b 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -40,11 +40,11 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pTemp
);
-//***************************************************************************************
-//
+
+
// The required C-Api must be provided!
// It contains of 3 special functions that have to be exported.
-//
+
void REGISTER_PROVIDER(
diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx
index 4c78272..795449af 100644
--- a/connectivity/source/drivers/firebird/SubComponent.hxx
+++ b/connectivity/source/drivers/firebird/SubComponent.hxx
@@ -107,7 +107,7 @@ namespace connectivity
template<class TYPE>
::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex;
- //------------------------------------------------------------------
+
template <class TYPE>
OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper()
{
@@ -115,7 +115,7 @@ namespace connectivity
++s_nRefCount;
}
- //------------------------------------------------------------------
+
template <class TYPE>
::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYPE>::getArrayHelper()
{
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index e8fe000..6d95714 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -83,9 +83,9 @@ namespace GraphicColorMode = ::com::sun::star::graphic::GraphicColorMode;
namespace connectivity { namespace hsqldb
{
- // =============================================================================
+
// = FlushListeners
- // =============================================================================
+
typedef ::comphelper::OListenerContainerBase< XFlushListener, EventObject > FlushListeners_Base;
class FlushListeners : public FlushListeners_Base
{
@@ -106,9 +106,9 @@ namespace connectivity { namespace hsqldb
return true; // continue notifying the other listeners, if any
}
- // =============================================================================
+
// = OHsqlConnection
- // =============================================================================
+
void SAL_CALL OHsqlConnection::disposing(void)
{
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 24327c5..6c79e74 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -59,10 +59,10 @@
#include <boost/scoped_ptr.hpp>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using namespace hsqldb;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
@@ -86,9 +86,9 @@ namespace connectivity
- //====================================================================
+
//= ODriverDelegator
- //====================================================================
+
ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext)
: ODriverDelegator_BASE(m_aMutex)
@@ -689,7 +689,7 @@ namespace connectivity
namespace
{
- //..............................................................
+
const sal_Char* lcl_getCollationForLocale( const OUString& _rLocaleString, bool _bAcceptCountryMismatch = false )
{
static const sal_Char* pTranslations[] =
@@ -824,17 +824,17 @@ namespace connectivity
return "Latin1_General";
}
- //..............................................................
+
OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext )
{
OUString sLocaleString = "en-US";
try
{
- //.........................................................
+
Reference< XMultiServiceFactory > xConfigProvider(
com::sun::star::configuration::theDefaultProvider::get( _rxContext ) );
- //.........................................................
+
// arguments for creating the config access
Sequence< Any > aArguments(2);
// the path to the node to open
@@ -848,7 +848,7 @@ namespace connectivity
makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE
);
- //.........................................................
+
// create the access
Reference< XPropertySet > xNode(
xConfigProvider->createInstanceWithArguments(
@@ -857,7 +857,7 @@ namespace connectivity
UNO_QUERY );
OSL_ENSURE( xNode.is(), "lcl_getSystemLocale: invalid access returned (should throw an exception instead)!" );
- //.........................................................
+
// ask for the system locale setting
if ( xNode.is() )
xNode->getPropertyValue("ooSetupSystemLocale") >>= sLocaleString;
@@ -900,8 +900,8 @@ namespace connectivity
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index d992a35..c42d8b4 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -28,13 +28,13 @@
#include <o3tl/compat_functional.hxx>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
namespace hsqldb
{
- //........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::embed;
@@ -339,12 +339,12 @@ namespace connectivity
OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr());
}
- //........................................................................
+
} // namespace hsqldb
- //........................................................................
-//........................................................................
+
+
}
// namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 6b0c367..a821d70 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -21,10 +21,10 @@
#include "HTerminateListener.hxx"
#include "hsqldb/HDriver.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using namespace hsqldb;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -50,8 +50,8 @@ throw( RuntimeException, std::exception )
m_pDriver->shutdownConnections();
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index 3c4da5ef..dba0c42 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -22,10 +22,10 @@
#include <cppuhelper/compbase1.hxx>
#include <com/sun/star/frame/XTerminateListener.hpp>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
namespace hsqldb
{
@@ -50,9 +50,9 @@ namespace connectivity
throw( ::com::sun::star::uno::RuntimeException, std::exception );
};
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 2ea7be0..af568aa 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -19,12 +19,12 @@
#include "hsqldb/HTools.hxx"
-//........................................................................
+
namespace connectivity { namespace hsqldb
{
- //====================================================================
+
//= HTools
- //====================================================================
+
void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog,
const OUString _rSchema, const OUString _rName, bool _bShortForm )
@@ -49,8 +49,8 @@ namespace connectivity { namespace hsqldb
_inout_rBuffer.appendAscii( "'" );
}
-//........................................................................
+
} } // namespace connectivity::hsqldb
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 2bd26fc..15cec42 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -34,10 +34,10 @@
#include <tools/diagnose_ex.h>
#include <unotools/sharedunocomponent.hxx>
-//........................................................................
+
namespace connectivity { namespace hsqldb
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
@@ -55,9 +55,9 @@ namespace connectivity { namespace hsqldb
using ::com::sun::star::lang::DisposedException;
using ::com::sun::star::sdbc::XRow;
- //====================================================================
+
//= HView
- //====================================================================
+
HView::HView( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive,
const OUString& _rSchemaName, const OUString& _rName )
@@ -194,8 +194,8 @@ namespace connectivity { namespace hsqldb
return sCommand;
}
-//........................................................................
+
} } // namespace connectivity::hsqldb
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 1f127c9..5ca1c21 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -272,7 +272,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must <= len.
- //
+
if (nBytesRead <= 0) {
#ifdef HSQLDB_DBG
aOpLog.logReturn( (jint)-1 );
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 2c54c4e..8fccdef 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -22,9 +22,9 @@
#include "java/sql/ResultSet.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.sql.Array
-//**************************************************************
+
jclass java_sql_Array::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index 2a5a96a..5795053 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -25,9 +25,9 @@
#include <string.h>
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.sql.Blob
-//**************************************************************
+
jclass java_sql_Blob::theClass = 0;
java_sql_Blob::java_sql_Blob( JNIEnv * pEnv, jobject myObj )
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 25c4036..ef82e34 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -19,9 +19,9 @@
#include "java/lang/Boolean.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.lang.Boolean
-//**************************************************************
+
jclass java_lang_Boolean::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 762f292..a39bab0 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -40,9 +40,9 @@ using namespace ::com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(java_sql_CallableStatement,"com.sun.star.sdbcx.ACallableStatement","com.sun.star.sdbc.CallableStatement");
-//**************************************************************
+
//************ Class: java.sql.CallableStatement
-//**************************************************************
+
java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const OUString& sql )
: java_sql_PreparedStatement( pEnv, _rCon, sql )
{
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index 5d03bd3..0a2753b 100644
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
@@ -22,9 +22,9 @@
#include <rtl/ustring.hxx>
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.lang.Class
-//**************************************************************
+
jclass java_lang_Class::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index 7bdcc27..279dac3 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -23,9 +23,9 @@
#include <connectivity/dbexception.hxx>
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.sql.Clob
-//**************************************************************
+
jclass java_sql_Clob::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index c8574f2..e8eddc4 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -26,9 +26,9 @@
#include <stdio.h>
-//........................................................................
+
namespace connectivity { namespace java { namespace sql {
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XComponentContext;
@@ -43,9 +43,9 @@ namespace connectivity { namespace java { namespace sql {
}
}
- //====================================================================
+
//= ConnectionLog
- //====================================================================
+
ConnectionLog::ConnectionLog( const ::comphelper::ResourceBasedEventLogger& _rDriverLog )
:ConnectionLog_Base( _rDriverLog )
@@ -67,14 +67,14 @@ namespace connectivity { namespace java { namespace sql {
{
}
-//........................................................................
+
} } } // namespace connectivity::java::sql
-//........................................................................
-//........................................................................
+
+
namespace comphelper { namespace log { namespace convert
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XComponentContext;
@@ -113,8 +113,8 @@ namespace comphelper { namespace log { namespace convert
return OUString::createFromAscii( buffer );
}
-//........................................................................
+
} } } // comphelper::log::convert
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index f92c541..3562f66 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -20,19 +20,19 @@
#include "java/ContextClassLoader.hxx"
#include "java/lang/Object.hxx"
-//........................................................................
+
namespace connectivity { namespace jdbc
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
using ::connectivity::java_lang_Object;
- //====================================================================
+
//= ContextClassLoaderScope
- //====================================================================
+
ContextClassLoaderScope::ContextClassLoaderScope( JNIEnv& environment, const GlobalRef< jobject >& newClassLoader,
const ::comphelper::ResourceBasedEventLogger& _rLoggerForErrors, const Reference< XInterface >& _rxErrorContext )
@@ -111,8 +111,8 @@ namespace connectivity { namespace jdbc
}
}
}
-//........................................................................
+
} } // namespace connectivity::jdbc
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 6c094ab..48dde51 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -39,9 +39,9 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-//**************************************************************
+
//************ Class: java.sql.DatabaseMetaData
-//**************************************************************
+
jclass java_sql_DatabaseMetaData::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index ec3f45f..748597a 100644
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
@@ -21,9 +21,9 @@
#include "java/tools.hxx"
#include "connectivity/dbconversion.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.util.Date
-//**************************************************************
+
jclass java_util_Date::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 956cad3..aee35fd 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -30,9 +30,9 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-//**************************************************************
+
//************ Class: java.sql.Driver
-//**************************************************************
+
jclass java_sql_DriverPropertyInfo::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 6f62756..15999a1 100644
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
@@ -19,9 +19,9 @@
#include "java/lang/Exception.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.lang.Exception
-//**************************************************************
+
jclass java_lang_Exception::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index e1991c5..c658865 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -30,9 +30,9 @@ using namespace connectivity;
#define THROW_WHERE ""
#endif
-//**************************************************************
+
//************ Class: java.io.InputStream
-//**************************************************************
+
jclass java_io_InputStream::theClass = 0;
java_io_InputStream::java_io_InputStream( JNIEnv * pEnv, jobject myObj )
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index 67ab177..4b7bc76 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -21,9 +21,9 @@
#include "java/tools.hxx"
#include "resource/jdbc_log.hrc"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.lang.Boolean
-//**************************************************************
+
jclass java_math_BigDecimal::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index e4ff8594..2b7c3dd 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -252,9 +252,9 @@ bool loadClass(
IMPLEMENT_SERVICE_INFO(java_sql_Connection,"com.sun.star.sdbcx.JConnection","com.sun.star.sdbc.Connection");
-//**************************************************************
+
//************ Class: java.sql.Connection
-//**************************************************************
+
jclass java_sql_Connection::theClass = 0;
java_sql_Connection::java_sql_Connection( const java_sql_Driver& _rDriver )
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 958cd36..3f94d4b 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -51,9 +51,9 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-//**************************************************************
+
//************ Class: java.sql.Statement
-//**************************************************************
+
jclass java_sql_Statement_Base::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index b821ff5..d9e97d5 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -43,9 +43,9 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-//**************************************************************
+
//************ Class: java.sql.PreparedStatement
-//**************************************************************
+
IMPLEMENT_SERVICE_INFO(java_sql_PreparedStatement,"com.sun.star.sdbcx.JPreparedStatement","com.sun.star.sdbc.PreparedStatement");
java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const OUString& sql )
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 3ae15ff..3d07a72 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -21,9 +21,9 @@
#include <string.h>
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.io.Reader
-//**************************************************************
+
jclass java_io_Reader::theClass = 0;
java_io_Reader::java_io_Reader( JNIEnv * pEnv, jobject myObj )
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 0c75d93..b6cad44 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
@@ -20,9 +20,9 @@
#include "java/sql/Ref.hxx"
#include "java/tools.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.sql.Ref
-//**************************************************************
+
jclass java_sql_Ref::theClass = 0;
java_sql_Ref::java_sql_Ref( JNIEnv * pEnv, jobject myObj )
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index b4acd4c..a23d11b 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -58,9 +58,9 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(java_sql_ResultSet,"com.sun.star.sdbcx.JResultSet","com.sun.star.sdbc.ResultSet");
-//**************************************************************
+
//************ Class: java.sql.ResultSet
-//**************************************************************
+
jclass java_sql_ResultSet::theClass = 0;
java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt)
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 48a8f0d..24155d7 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -28,9 +28,9 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-//**************************************************************
+
//************ Class: java.sql.ResultSetMetaData
-//**************************************************************
+
jclass java_sql_ResultSetMetaData::theClass = 0;
java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon )
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index c8857ab..765afb2 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -26,9 +26,9 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-//**************************************************************
+
//************ Class: java.sql.SQLException
-//**************************************************************
+
java_sql_SQLException::java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const Reference< XInterface> & _rContext)
: starsdbc::SQLException( _rException.getMessage(),
_rContext,
diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index c48b4eb..68cb63a 100644
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
@@ -19,9 +19,9 @@
#include "java/sql/SQLWarning.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.sql.SQLWarning
-//**************************************************************
+
jclass java_sql_SQLWarning_BASE::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index 477ab07..f8c1368 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -20,9 +20,9 @@
#include "java/lang/String.hxx"
#include "java/tools.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.lang.String
-//**************************************************************
+
jclass java_lang_String::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index 6143ff7..fa3395a 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -20,9 +20,9 @@
#include "java/lang/Throwable.hxx"
#include "java/tools.hxx"
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.lang.Throwable
-//**************************************************************
+
jclass java_lang_Throwable::theClass = 0;
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 20d2577..4fedd1e 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -24,9 +24,9 @@
using namespace ::comphelper;
using namespace connectivity;
-//**************************************************************
+
//************ Class: java.sql.Date
-//**************************************************************
+
jclass java_sql_Date::theClass = 0;
java_sql_Date::java_sql_Date( const ::com::sun::star::util::Date& _rOut ) : java_util_Date( NULL, (jobject)NULL )
@@ -75,9 +75,9 @@ java_sql_Date::operator ::com::sun::star::util::Date()
return ::dbtools::DBTypeConversion::toDate(toString());
}
-//**************************************************************
+
//************ Class: java.sql.Time
-//**************************************************************
+
jclass java_sql_Time::theClass = 0;
@@ -126,9 +126,9 @@ java_sql_Time::operator ::com::sun::star::util::Time()
{
return ::dbtools::DBTypeConversion::toTime(toString());
}
-//**************************************************************
+
//************ Class: java.sql.Timestamp
-//**************************************************************
+
jclass java_sql_Timestamp::theClass = 0;
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index f379a40..7631008 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -60,9 +60,9 @@ namespace connectivity
friend class OSubComponent<KabConnection, KabConnection_BASE>;
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 411bae2..337b0a1 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -27,9 +27,9 @@ namespace connectivity
{
namespace kab
{
- // ===============================================================
+
// = KDEInit
- // ===============================================================
+
class KDEInit
{
private:
@@ -94,7 +94,7 @@ namespace connectivity
}
}
-// =======================================================================
+
namespace
{
double normalizeVersion( unsigned int major, unsigned int minor )
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 10fbd93..470ed07 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -28,9 +28,9 @@ namespace connectivity
{
namespace kab
{
- //**************************************************************
+
//************ Class: KabDatabaseMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> KabDatabaseMetaData_BASE;
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 5b48222..a4ef7ca 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -42,9 +42,9 @@ using namespace com::sun::star::sdb;
using namespace com::sun::star::frame;
using namespace connectivity::kab;
-// =======================================================================
+
// = KabImplModule
-// =======================================================================
+
KabImplModule::KabImplModule( const Reference< XComponentContext >& _rxContext )
:m_xContext(_rxContext)
@@ -91,7 +91,7 @@ namespace
_rFunction = NULL;
if ( _rModule )
{
- //
+
const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName );
_rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) );
@@ -299,9 +299,9 @@ void KabImplModule::shutdown()
impl_unloadModule();
}
-// =======================================================================
+
// = KabDriver
-// =======================================================================
+
KabDriver::KabDriver(
const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
: KDriver_BASE(m_aMutex),
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index 095aa11..a633d92 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -41,9 +41,9 @@ namespace connectivity
typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
- // ===============================================================
+
// = KabImplModule
- // ===============================================================
+
class KabImplModule
{
private:
@@ -139,9 +139,9 @@ namespace connectivity
bool impl_doAllowNewKDEVersion();
};
- // ===============================================================
+
// = KabDriver
- // ===============================================================
+
typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::frame::XTerminateListener > KDriver_BASE;
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index a0e872d..7d453d3 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -39,10 +39,10 @@ namespace connectivity
::com::sun::star::util::XCancellable,
::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE;
- //**************************************************************
+
// Class KabCommonStatement
// is a base class for the normal statement and for the prepared statement
- //**************************************************************
+
class KabCommonStatement : public comphelper::OBaseMutex,
public KabCommonStatement_BASE,
public ::cppu::OPropertySetHelper,
@@ -139,9 +139,9 @@ namespace connectivity
) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception);
};
- //**************************************************************
+
// Class KabStatement
- //**************************************************************
+
typedef ::cppu::ImplInheritanceHelper1<
KabCommonStatement, ::com::sun::star::lang::XServiceInfo > KabStatement_BASE;
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index b9a60fb..bc7e2aa 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -28,7 +28,7 @@ namespace connectivity
{
namespace kab
{
-// -----------------------------------------------------------------------------
+
class KabCondition
{
public:
@@ -37,7 +37,7 @@ class KabCondition
virtual sal_Bool isAlwaysFalse() const = 0;
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const = 0;
};
-// -----------------------------------------------------------------------------
+
class KabConditionConstant : public KabCondition
{
protected:
@@ -49,7 +49,7 @@ class KabConditionConstant : public KabCondition
virtual sal_Bool isAlwaysFalse() const;
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionColumn : public KabCondition
{
protected:
@@ -63,7 +63,7 @@ class KabConditionColumn : public KabCondition
virtual sal_Bool isAlwaysTrue() const;
virtual sal_Bool isAlwaysFalse() const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionNull : public KabConditionColumn
{
public:
@@ -71,7 +71,7 @@ class KabConditionNull : public KabConditionColumn
const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionNotNull : public KabConditionColumn
{
public:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list