summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 17:59:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-27 06:54:35 -0600
commitac9212feedb828064c5cf5cbb0bde8f02cc93d65 (patch)
treee429c2bbcdfe7a98c2d55433e752bfecac3d5d00
parent2a33953f6eb5da62042ea3731ef9d61666d5556f (diff)
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@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java2
-rw-r--r--connectivity/qa/connectivity/tools/AbstractDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/CRMDatabase.java16
-rw-r--r--connectivity/qa/connectivity/tools/CsvDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/DbaseDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/FlatFileDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/HsqlDatabase.java4
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx4
-rw-r--r--connectivity/source/commontools/FValue.cxx10
-rw-r--r--connectivity/source/commontools/ParamterSubstitution.cxx4
-rw-r--r--connectivity/source/commontools/RowFunctionParser.cxx16
-rw-r--r--connectivity/source/commontools/conncleanup.cxx14
-rw-r--r--connectivity/source/commontools/dbcharset.cxx20
-rw-r--r--connectivity/source/commontools/dbconversion.cxx8
-rw-r--r--connectivity/source/commontools/dbexception.cxx16
-rw-r--r--connectivity/source/commontools/dbmetadata.cxx26
-rw-r--r--connectivity/source/commontools/dbtools2.cxx8
-rw-r--r--connectivity/source/commontools/filtermanager.cxx12
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx22
-rw-r--r--connectivity/source/commontools/parameters.cxx16
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx16
-rw-r--r--connectivity/source/commontools/predicateinput.cxx14
-rw-r--r--connectivity/source/commontools/propertyids.cxx4
-rw-r--r--connectivity/source/commontools/sqlerror.cxx24
-rw-r--r--connectivity/source/commontools/statementcomposer.cxx16
-rw-r--r--connectivity/source/commontools/warningscontainer.cxx12
-rw-r--r--connectivity/source/cpool/ZConnectionPool.cxx8
-rw-r--r--connectivity/source/cpool/ZConnectionPool.hxx8
-rw-r--r--connectivity/source/cpool/ZConnectionWrapper.hxx4
-rw-r--r--connectivity/source/cpool/ZDriverWrapper.cxx12
-rw-r--r--connectivity/source/cpool/ZDriverWrapper.hxx12
-rw-r--r--connectivity/source/cpool/ZPoolCollection.hxx6
-rw-r--r--connectivity/source/cpool/ZPooledConnection.hxx4
-rw-r--r--connectivity/source/cpool/Zregistration.cxx4
-rw-r--r--connectivity/source/drivers/ado/ACallableStatement.cxx4
-rw-r--r--connectivity/source/drivers/ado/Aolevariant.cxx10
-rw-r--r--connectivity/source/drivers/dbase/DIndexIter.cxx4
-rw-r--r--connectivity/source/drivers/dbase/dindexnode.cxx16
-rw-r--r--connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/drivers/evoab2/NPreparedStatement.hxx4
-rw-r--r--connectivity/source/drivers/evoab2/NResultSetMetaData.hxx4
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.cxx4
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.hxx4
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx2
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx4
-rw-r--r--connectivity/source/drivers/file/fcode.cxx2
-rw-r--r--connectivity/source/drivers/file/fcomp.cxx2
-rw-r--r--connectivity/source/drivers/file/quotedstring.cxx4
-rw-r--r--connectivity/source/drivers/firebird/DatabaseMetaData.hxx4
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx6
-rw-r--r--connectivity/source/drivers/firebird/SubComponent.hxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HConnection.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx24
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx14
-rw-r--r--connectivity/source/drivers/hsqldb/HTerminateListener.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/HTerminateListener.hxx8
-rw-r--r--connectivity/source/drivers/hsqldb/HTools.cxx10
-rw-r--r--connectivity/source/drivers/hsqldb/HView.cxx12
-rw-r--r--connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/Array.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Blob.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Boolean.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/CallableStatement.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Class.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Clob.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/ConnectionLog.cxx20
-rw-r--r--connectivity/source/drivers/jdbc/ContextClassLoader.cxx12
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Date.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Exception.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/InputStream.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/JBigDecimal.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/JConnection.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/JStatement.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/PreparedStatement.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Reader.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Ref.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/ResultSet.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/ResultSetMetaData.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/SQLException.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/SQLWarning.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/String.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Throwable.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Timestamp.cxx12
-rw-r--r--connectivity/source/drivers/kab/KConnection.hxx4
-rw-r--r--connectivity/source/drivers/kab/KDEInit.cxx6
-rw-r--r--connectivity/source/drivers/kab/KDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/drivers/kab/KDriver.cxx10
-rw-r--r--connectivity/source/drivers/kab/KDriver.hxx8
-rw-r--r--connectivity/source/drivers/kab/KStatement.hxx8
-rw-r--r--connectivity/source/drivers/kab/kcondition.hxx26
-rw-r--r--connectivity/source/drivers/macab/MacabConnection.hxx4
-rw-r--r--connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/drivers/macab/MacabDriver.cxx10
-rw-r--r--connectivity/source/drivers/macab/MacabDriver.hxx8
-rw-r--r--connectivity/source/drivers/macab/MacabStatement.hxx8
-rw-r--r--connectivity/source/drivers/macab/macabcondition.hxx26
-rw-r--r--connectivity/source/drivers/macab/macabutilities.hxx10
-rw-r--r--connectivity/source/drivers/mork/MConnection.cxx4
-rw-r--r--connectivity/source/drivers/mork/MConnection.hxx4
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx2
-rw-r--r--connectivity/source/drivers/mork/MDriver.cxx2
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.hxx4
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx14
-rw-r--r--connectivity/source/drivers/mork/MResultSetMetaData.hxx4
-rw-r--r--connectivity/source/drivers/mork/MStatement.hxx8
-rw-r--r--connectivity/source/drivers/mork/MorkParser.hxx6
-rw-r--r--connectivity/source/drivers/mozab/MColumnAlias.cxx6
-rw-r--r--connectivity/source/drivers/mozab/MConfigAccess.cxx10
-rw-r--r--connectivity/source/drivers/mozab/MConnection.cxx8
-rw-r--r--connectivity/source/drivers/mozab/MConnection.hxx6
-rw-r--r--connectivity/source/drivers/mozab/MDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/drivers/mozab/MDriver.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MPreparedStatement.hxx4
-rw-r--r--connectivity/source/drivers/mozab/MResultSet.cxx14
-rw-r--r--connectivity/source/drivers/mozab/MResultSetMetaData.hxx4
-rw-r--r--connectivity/source/drivers/mozab/MStatement.hxx8
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx12
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx6
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx4
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx2
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx20
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx12
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx4
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx22
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx8
-rw-r--r--connectivity/source/drivers/mysql/YDriver.cxx12
-rw-r--r--connectivity/source/drivers/odbc/OPreparedStatement.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_allocator.hxx30
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.hxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_databasemetadata.cxx4
-rw-r--r--connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx4
-rw-r--r--connectivity/source/inc/ParameterSubstitution.hxx4
-rw-r--r--connectivity/source/inc/RowFunctionParser.hxx8
-rw-r--r--connectivity/source/inc/ado/ACallableStatement.hxx4
-rw-r--r--connectivity/source/inc/ado/AConnection.hxx6
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx2
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx4
-rw-r--r--connectivity/source/inc/ado/APreparedStatement.hxx4
-rw-r--r--connectivity/source/inc/ado/AResultSetMetaData.hxx4
-rw-r--r--connectivity/source/inc/ado/AStatement.hxx4
-rw-r--r--connectivity/source/inc/ado/ATable.hxx2
-rw-r--r--connectivity/source/inc/ado/Aolevariant.hxx4
-rw-r--r--connectivity/source/inc/ado/Aolewrap.hxx14
-rw-r--r--connectivity/source/inc/ado/Awrapado.hxx26
-rw-r--r--connectivity/source/inc/calc/CDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/dbase/DDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/dbase/DIndex.hxx4
-rw-r--r--connectivity/source/inc/dbase/DIndexIter.hxx4
-rw-r--r--connectivity/source/inc/dbase/dindexnode.hxx20
-rw-r--r--connectivity/source/inc/file/FConnection.hxx4
-rw-r--r--connectivity/source/inc/file/FDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/file/FPreparedStatement.hxx4
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx2
-rw-r--r--connectivity/source/inc/file/FResultSetMetaData.hxx4
-rw-r--r--connectivity/source/inc/file/FStatement.hxx4
-rw-r--r--connectivity/source/inc/file/quotedstring.hxx4
-rw-r--r--connectivity/source/inc/flat/EDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/hsqldb/HConnection.hxx8
-rw-r--r--connectivity/source/inc/hsqldb/HDriver.hxx8
-rw-r--r--connectivity/source/inc/hsqldb/HStorageMap.hxx12
-rw-r--r--connectivity/source/inc/hsqldb/HTools.hxx12
-rw-r--r--connectivity/source/inc/hsqldb/HView.hxx12
-rw-r--r--connectivity/source/inc/java/ContextClassLoader.hxx12
-rw-r--r--connectivity/source/inc/java/GlobalRef.hxx12
-rw-r--r--connectivity/source/inc/java/LocalRef.hxx12
-rw-r--r--connectivity/source/inc/java/io/InputStream.hxx4
-rw-r--r--connectivity/source/inc/java/io/Reader.hxx4
-rw-r--r--connectivity/source/inc/java/lang/Boolean.hxx4
-rw-r--r--connectivity/source/inc/java/lang/Class.hxx4
-rw-r--r--connectivity/source/inc/java/lang/Exception.hxx4
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx6
-rw-r--r--connectivity/source/inc/java/lang/Throwable.hxx4
-rw-r--r--connectivity/source/inc/java/math/BigDecimal.hxx4
-rw-r--r--connectivity/source/inc/java/sql/Array.hxx4
-rw-r--r--connectivity/source/inc/java/sql/Blob.hxx4
-rw-r--r--connectivity/source/inc/java/sql/CallableStatement.hxx4
-rw-r--r--connectivity/source/inc/java/sql/Clob.hxx4
-rw-r--r--connectivity/source/inc/java/sql/ConnectionLog.hxx20
-rw-r--r--connectivity/source/inc/java/sql/DatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/java/sql/DriverPropertyInfo.hxx4
-rw-r--r--connectivity/source/inc/java/sql/JStatement.hxx4
-rw-r--r--connectivity/source/inc/java/sql/PreparedStatement.hxx4
-rw-r--r--connectivity/source/inc/java/sql/Ref.hxx4
-rw-r--r--connectivity/source/inc/java/sql/ResultSetMetaData.hxx4
-rw-r--r--connectivity/source/inc/java/sql/SQLException.hxx4
-rw-r--r--connectivity/source/inc/java/sql/SQLWarning.hxx4
-rw-r--r--connectivity/source/inc/java/sql/Timestamp.hxx12
-rw-r--r--connectivity/source/inc/java/util/Date.hxx4
-rw-r--r--connectivity/source/inc/mysql/YDriver.hxx8
-rw-r--r--connectivity/source/inc/odbc/OBoundParam.hxx44
-rw-r--r--connectivity/source/inc/odbc/OConnection.hxx6
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/odbc/OFunctiondefs.hxx6
-rw-r--r--connectivity/source/inc/odbc/OPreparedStatement.hxx4
-rw-r--r--connectivity/source/inc/odbc/OResultSetMetaData.hxx4
-rw-r--r--connectivity/source/inc/odbc/OStatement.hxx8
-rw-r--r--connectivity/source/inc/odbc/OTools.hxx2
-rw-r--r--connectivity/source/inc/propertyids.hxx8
-rw-r--r--connectivity/source/inc/resource/ado_res.hrc4
-rw-r--r--connectivity/source/inc/resource/calc_res.hrc4
-rw-r--r--connectivity/source/inc/resource/common_res.hrc4
-rw-r--r--connectivity/source/inc/resource/conn_shared_res.hrc4
-rw-r--r--connectivity/source/inc/resource/dbase_res.hrc4
-rw-r--r--connectivity/source/inc/resource/evoab2_res.hrc4
-rw-r--r--connectivity/source/inc/resource/file_res.hrc4
-rw-r--r--connectivity/source/inc/resource/hsqldb_res.hrc4
-rw-r--r--connectivity/source/inc/resource/kab_res.hrc4
-rw-r--r--connectivity/source/inc/resource/macab_res.hrc4
-rw-r--r--connectivity/source/inc/resource/mork_res.hrc4
-rw-r--r--connectivity/source/inc/resource/mozab_res.hrc4
-rw-r--r--connectivity/source/inc/resource/sharedresources.hxx12
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx18
-rw-r--r--connectivity/source/manager/mdrivermanager.hxx8
-rw-r--r--connectivity/source/manager/mregistration.cxx4
-rw-r--r--connectivity/source/parse/sqlbison.y58
-rw-r--r--connectivity/source/parse/sqliterator.cxx8
-rw-r--r--connectivity/source/parse/sqlnode.cxx10
-rw-r--r--connectivity/source/resource/conn_log_res.src4
-rw-r--r--connectivity/source/resource/conn_shared_res.src12
-rw-r--r--connectivity/source/resource/sharedresources.cxx20
-rw-r--r--connectivity/source/sdbcx/VDescriptor.cxx4
-rw-r--r--connectivity/source/simpledbt/charset_s.cxx12
-rw-r--r--connectivity/source/simpledbt/charset_s.hxx12
-rw-r--r--connectivity/source/simpledbt/dbtfactory.cxx14
-rw-r--r--connectivity/source/simpledbt/dbtfactory.hxx12
-rw-r--r--connectivity/source/simpledbt/parsenode_s.cxx12
-rw-r--r--connectivity/source/simpledbt/parsenode_s.hxx12
-rw-r--r--connectivity/source/simpledbt/parser_s.cxx12
-rw-r--r--connectivity/source/simpledbt/parser_s.hxx12
-rw-r--r--connectivity/source/simpledbt/refbase.cxx12
-rw-r--r--connectivity/source/simpledbt/refbase.hxx12
-rw-r--r--connectivity/source/simpledbt/staticdbtools_s.cxx12
-rw-r--r--connectivity/source/simpledbt/staticdbtools_s.hxx56
-rw-r--r--connectivity/workben/little/main.cxx2
-rw-r--r--connectivity/workben/testmoz/main.cxx2
243 files changed, 961 insertions, 971 deletions
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 6fa5bafa026f..c8c28162f3f7 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 28d05dd7c73d..4e048e08ca61 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 ea807ae7faec..57b9e857b2e4 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 36e66f8db6ff..b2c3a179325e 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 6e71df800a1b..f3f883144e89 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 03112d5c3c17..f3fddff77849 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 0ea5e0d23725..dd6831d7828e 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 13f38d27122d..2802d2cd2407 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 646a80c9a32c..4d71152f2420 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 76251af1cfee..3c90dc4753e0 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 8e2e4376136c..b9b49390578b 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 5da0c9184d0a..d004fa074790 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 9dd38289dc04..eddaea17ce2a 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 579c0e2a2087..a536f688013a 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 931c2cc45562..176239cc4e1c 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 dad2ceb77424..75fcc66b925f 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 65f103961826..f6077d25f83f 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 3612ef8a3940..055dec7eba02 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 393414095f80..99ea133d7c5a 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 65cbacf810c7..77599d86afa3 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 8c576807a26a..84e472097bc0 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 74e00aefb966..7575113be23e 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 863e962f7545..fb9f2d36526e 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 c9db24fa3199..14686fd71263 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 a00356280ef2..4de06b3d8847 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 0681bcb11040..1091eaeeb13e 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 0a316c2b6802..fc289fbccee8 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 becc07e5d960..6d2f155ef217 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 886b671ee3e7..ed10d63c666d 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 6d8a49777fe1..888382146f5b 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 21eef7405e43..48745961c861 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 04ede1041fde..767241e2b052 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 b587f5bbaea1..72f9d5f5f30c 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 880190ee9b96..c10ce441ccce 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 1823251f88e9..0d8846f802f2 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 cebb4a38cc5a..af91f6fe7af6 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 00ca2e78095d..f64995820935 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 04d5fedbc1c6..a81732561586 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 017393191057..90ff744e4f07 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 df8aece04a2a..beadbc880d82 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 9e1e75238faa..d50b6bfb177f 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 c2001a14a65b..7c3458b3d2c2 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 0ad25399091f..5339e4dcbf15 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 18cc3df0ba37..59d4c47374a7 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@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 9ba315fb72dd..7845d26d120b 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@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 9ce2d509a166..f20afff5427b 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 d48adc806dbb..7931e6a69223 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 84b4f9fbe8c3..6a955b3dcaab 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 2c0cc4b00e12..1d80ea048be6 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 65bacd7439b9..883ff7b3fcd6 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 4c78272312ca..795449afe1e0 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 e8fe000a7feb..6d95714654e4 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 24327c59fd76..6c79e7419228 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 d992a35f2bb8..c42d8b461f2b 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 6b0c367d19a2..a821d70501eb 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 3c4da5efb915..dba0c42ae8c8 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 2ea7be02e2ea..af568aafeca2 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 2bd26fcb232a..15cec42de916 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 1f127c95f38e..5ca1c21aad2b 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 2c54c4ee88ca..8fccdef8d4f9 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 2a5a96a7f416..5795053165f7 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 25c40367b460..ef82e3416616 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 762f2929d500..a39bab042593 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 5d03bd3448da..0a2753b36a7f 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 7bdcc27fb0c3..279dac3b1c33 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 c8574f2e87e7..e8eddc4e87dc 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 f92c541b67fe..3562f6649a5a 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 6c094ab9433c..48dde51a76c2 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 ec3f45fc6344..748597a7566f 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 956cad32fb82..aee35fdb0ef4 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 6f6275699d83..15999a1a45cd 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 e1991c56928c..c6588650aca9 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 67ab1772ae6f..4b7bc76c59f4 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 e4ff859485e0..2b7c3dd9f063 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 958cd36f560e..3f94d4bb7948 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 b821ff5e7a81..d9e97d52a003 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 3ae15ff50c39..3d07a72f25e3 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 0c75d931db69..b6cad44e1b18 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 b4acd4c54d5e..a23d11b99541 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 48a8f0d8f699..24155d7dccce 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 c8857ab2beef..765afb2dee4e 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 c48b4eb62852..68cb63a39924 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 477ab07036c2..f8c1368e9cc7 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 6143ff7ec343..fa3395ac9d3f 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 20d257714514..4fedd1e1bc1b 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 f379a4051fb7..7631008b88c1 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 411bae233d21..337b0a1ebaa5 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 10fbd9389088..470ed073be64 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 5b48222e1874..a4ef7cae3363 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 095aa11ca8c8..a633d920c0a2 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 a0e872d7988a..7d453d36ace5 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 b9a60fb0e1a3..bc7e2aa44b3c 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:
@@ -79,7 +79,7 @@ class KabConditionNotNull : public KabConditionColumn
const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionCompare : public KabConditionColumn
{
protected:
@@ -90,7 +90,7 @@ class KabConditionCompare : public KabConditionColumn
const OUString &sColumnName,
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
};
-// -----------------------------------------------------------------------------
+
class KabConditionEqual : public KabConditionCompare
{
public:
@@ -99,7 +99,7 @@ class KabConditionEqual : public KabConditionCompare
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionDifferent : public KabConditionCompare
{
public:
@@ -108,7 +108,7 @@ class KabConditionDifferent : public KabConditionCompare
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionSimilar : public KabConditionCompare
{
public:
@@ -117,7 +117,7 @@ class KabConditionSimilar : public KabConditionCompare
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionBoolean : public KabCondition
{
protected:
@@ -127,7 +127,7 @@ class KabConditionBoolean : public KabCondition
KabConditionBoolean(KabCondition *pLeft, KabCondition *pRight);
virtual ~KabConditionBoolean();
};
-// -----------------------------------------------------------------------------
+
class KabConditionOr : public KabConditionBoolean
{
public:
@@ -136,7 +136,7 @@ class KabConditionOr : public KabConditionBoolean
virtual sal_Bool isAlwaysFalse() const;
virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const;
};
-// -----------------------------------------------------------------------------
+
class KabConditionAnd : public KabConditionBoolean
{
public:
@@ -145,7 +145,7 @@ class KabConditionAnd : public KabConditionBoolean
virtual sal_Bool isAlwaysFalse() const;
virtual sal_Bool eval(const ::KABC::Addressee &addressee) const;
};
-// -----------------------------------------------------------------------------
+
}
}
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index 853628625845..9c0f8e5024f4 100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -56,9 +56,9 @@ namespace connectivity
friend class OSubComponent<MacabConnection, MacabConnection_BASE>;
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
MacabAddressBook* m_pAddressBook; // the address book
MacabDriver* m_pDriver; // pointer to the owning driver object
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier>
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 20b75f1da632..3af626f01ce8 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
@@ -28,9 +28,9 @@ namespace connectivity
{
namespace macab
{
- //**************************************************************
+
//************ Class: MacabDatabaseMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> MacabDatabaseMetaData_BASE;
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 7a23ae394129..08f4b51ff08e 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -38,9 +38,9 @@ using namespace com::sun::star::sdb;
using namespace com::sun::star::frame;
using namespace connectivity::macab;
-// =======================================================================
+
// = MacabImplModule
-// =======================================================================
+
MacabImplModule::MacabImplModule()
:m_bAttemptedLoadModule(false)
@@ -64,7 +64,7 @@ namespace
_rFunction = NULL;
if ( _rModule )
{
- //
+
const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName );
_rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) );
@@ -167,9 +167,9 @@ void MacabImplModule::shutdown()
impl_unloadModule();
}
-// =======================================================================
+
// = MacabDriver
-// =======================================================================
+
MacabDriver::MacabDriver(
const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
: MacabDriver_BASE(m_aMutex),
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index 124cf38852ec..bae72130c46a 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -43,9 +43,9 @@ namespace connectivity
typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
- // ===============================================================
+
// = MacabImplModule
- // ===============================================================
+
class MacabImplModule
{
private:
@@ -109,9 +109,9 @@ namespace connectivity
};
- // ===============================================================
+
// = MacabDriver
- // ===============================================================
+
typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::frame::XTerminateListener > MacabDriver_BASE;
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 415b4264b005..9e16eb447f14 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -40,10 +40,10 @@ namespace connectivity
::com::sun::star::util::XCancellable,
::com::sun::star::sdbc::XCloseable> MacabCommonStatement_BASE;
- //**************************************************************
+
// Class MacabCommonStatement
// is a base class for the normal statement and for the prepared statement
- //**************************************************************
+
class MacabCommonStatement : public comphelper::OBaseMutex,
public MacabCommonStatement_BASE,
public ::cppu::OPropertySetHelper,
@@ -145,9 +145,9 @@ namespace connectivity
inline MacabConnection* getOwnConnection() const { return m_pConnection; }
};
- //**************************************************************
+
// Class MacabStatement
- //**************************************************************
+
typedef ::cppu::ImplInheritanceHelper1<
MacabCommonStatement, ::com::sun::star::lang::XServiceInfo > MacabStatement_BASE;
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index 76acf95056d0..269b0f681968 100644
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -30,7 +30,7 @@ namespace connectivity
{
namespace macab
{
-// -----------------------------------------------------------------------------
+
class MacabCondition
{
public:
@@ -39,7 +39,7 @@ class MacabCondition
virtual sal_Bool isAlwaysFalse() const = 0;
virtual sal_Bool eval(const MacabRecord *aRecord) const = 0;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionConstant : public MacabCondition
{
protected:
@@ -51,7 +51,7 @@ class MacabConditionConstant : public MacabCondition
virtual sal_Bool isAlwaysFalse() const;
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionColumn : public MacabCondition
{
protected:
@@ -64,7 +64,7 @@ class MacabConditionColumn : public MacabCondition
virtual sal_Bool isAlwaysTrue() const;
virtual sal_Bool isAlwaysFalse() const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionNull : public MacabConditionColumn
{
public:
@@ -73,7 +73,7 @@ class MacabConditionNull : public MacabConditionColumn
const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionNotNull : public MacabConditionColumn
{
public:
@@ -82,7 +82,7 @@ class MacabConditionNotNull : public MacabConditionColumn
const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionCompare : public MacabConditionColumn
{
protected:
@@ -94,7 +94,7 @@ class MacabConditionCompare : public MacabConditionColumn
const OUString &sColumnName,
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
};
-// -----------------------------------------------------------------------------
+
class MacabConditionEqual : public MacabConditionCompare
{
public:
@@ -104,7 +104,7 @@ class MacabConditionEqual : public MacabConditionCompare
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionDifferent : public MacabConditionCompare
{
public:
@@ -114,7 +114,7 @@ class MacabConditionDifferent : public MacabConditionCompare
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionSimilar : public MacabConditionCompare
{
public:
@@ -124,7 +124,7 @@ class MacabConditionSimilar : public MacabConditionCompare
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionBoolean : public MacabCondition
{
protected:
@@ -134,7 +134,7 @@ class MacabConditionBoolean : public MacabCondition
MacabConditionBoolean(MacabCondition *pLeft, MacabCondition *pRight);
virtual ~MacabConditionBoolean();
};
-// -----------------------------------------------------------------------------
+
class MacabConditionOr : public MacabConditionBoolean
{
public:
@@ -143,7 +143,7 @@ class MacabConditionOr : public MacabConditionBoolean
virtual sal_Bool isAlwaysFalse() const;
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
class MacabConditionAnd : public MacabConditionBoolean
{
public:
@@ -152,7 +152,7 @@ class MacabConditionAnd : public MacabConditionBoolean
virtual sal_Bool isAlwaysFalse() const;
virtual sal_Bool eval(const MacabRecord *aRecord) const;
};
-// -----------------------------------------------------------------------------
+
}
}
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 5b151575351d..0e30606b430d 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -33,7 +33,7 @@ namespace connectivity
{
namespace macab
{
- // -------------------------------------------------------------------------
+
inline OUString CFStringToOUString(const CFStringRef sOrig)
{
/* Copied all-but directly from code by Florian Heckl in
@@ -60,7 +60,7 @@ namespace connectivity
return OUString(unichars);
}
- // -------------------------------------------------------------------------
+
inline CFStringRef OUStringToCFString(const OUString& aString)
{
/* Copied directly from code by Florian Heckl in
@@ -73,7 +73,7 @@ namespace connectivity
return ref;
}
- // -------------------------------------------------------------------------
+
inline com::sun::star::util::DateTime CFDateToDateTime(const CFDateRef _cfDate)
{
/* Carbon can give us the time since 2001 of any CFDateRef,
@@ -96,7 +96,7 @@ namespace connectivity
return nRet;
}
- // -------------------------------------------------------------------------
+
inline OUString fixLabel(const OUString _originalLabel)
{
/* Get the length, and make sure that there is actually a string
@@ -110,7 +110,7 @@ namespace connectivity
return _originalLabel;
}
- // -------------------------------------------------------------------------
+
inline sal_Int32 ABTypeToDataType(const ABPropertyType _abType)
{
sal_Int32 dataType;
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index a083d20910e8..e914f301e908 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -81,9 +81,9 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
SAL_INFO("connectivity.mork", "=> OConnection::construct()" );
// open file
setURL(url);
- //
+
// Skip 'sdbc:mozab: part of URL
- //
+
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index 32b4a457857e..5cdb28dc1ec8 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -41,9 +41,9 @@ namespace connectivity
friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
::com::sun::star::sdbc::SQLWarning m_aLastWarning;
MorkDriver* m_pDriver; // Pointer to the owning
// driver object
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 4916f0bd56a1..094a9a2165e7 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -851,7 +851,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE
OUString("TABLE"),
OUString("VIEW")
// Currently we only support a 'TABLE' and 'VIEW' nothing more complex
- //
+
// OUString("SYSTEM TABLE"),
// OUString("GLOBAL TEMPORARY"),
// OUString("LOCAL TEMPORARY"),
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index 77ccd9bde825..90ff82ef11c4 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -28,9 +28,9 @@ namespace connectivity
namespace mork
{
class MDatabaseMetaDataHelper;
- //**************************************************************
+
//************ Class: ODatabaseMetaData
- //**************************************************************
+
class ODatabaseMetaData : public ODatabaseMetaDataBase
{
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
index 2faa92402c4e..eed91ab2ad03 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
@@ -30,7 +30,7 @@ namespace connectivity
MDatabaseMetaDataHelper();
~MDatabaseMetaDataHelper();
- //
+
sal_Bool getTableStrings( OConnection* _pCon,
::std::vector< OUString >& _rStrings);
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 859f6e598677..a9ee71078d16 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -90,7 +90,7 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url)
{
SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" );
// Skip 'sdbc:mozab: part of URL
- //
+
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
OUString aAddrbookURI(url.copy(nLen+1));
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 5f3bb904da06..5945fded2f07 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -56,9 +56,9 @@ namespace connectivity
};
::std::vector< Parameter> m_aParameters;
- //====================================================================
+
// Data attributes
- //====================================================================
+
sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
OUString m_sSqlStatement;
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index d361852deb5b..65e49300e978 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -348,9 +348,9 @@ sal_Bool OResultSet::pushCard(sal_uInt32 /*cardNumber*/) throw(SQLException, Run
{
if ( (m_aRow->get())[i].isBound() )
{
- //
+
// Everything in the addressbook is a string!
- //
+
if ( !m_aQuery.setRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR ))
{
m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this );
@@ -392,9 +392,9 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(
{
if ( (m_aRow->get())[i].isBound() )
{
- //
+
// Everything in the addressbook is a string!
- //
+
if ( !m_aQueryHelper.getRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR ))
{
m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this );
@@ -1398,7 +1398,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
// the getXXX methods are 1-based ...
sal_Int32 nTableColumnPos = i + 1;
// get first table column is the bookmark column
- // ...
+
#if OSL_DEBUG_LEVEL > 0
OSL_TRACE("Set Col Mapping: %d -> %d", nSelectColumnPos, nTableColumnPos );
#endif
@@ -1431,9 +1431,9 @@ sal_Bool OResultSet::isCount() const
}
-//
+
// Check for valid row in m_aQuery
-//
+
sal_Bool OResultSet::validRow( sal_uInt32 nRow)
{
sal_Int32 nNumberOfRecords = m_aQueryHelper.getResultCount();
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
index 612e09f6acfa..35d464ca7c21 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
@@ -30,9 +30,9 @@ namespace connectivity
{
namespace mork
{
- //**************************************************************
+
//************ Class: ResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OResultSetMetaData : public OResultSetMetaData_BASE
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index c19567130e05..814c80c173c4 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -50,10 +50,10 @@ namespace connectivity
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE;
- //**************************************************************
+
//************ Class: OCommonStatement
// is a base class for the normal statement and for the prepared statement
- //**************************************************************
+
class OCommonStatement;
typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE;
@@ -115,9 +115,9 @@ namespace connectivity
virtual ~OCommonStatement();
protected:
- //
+
// Driver Internal Methods
- //
+
enum StatementType { eSelect, eCreateTable };
/** called to do the parsing of a to-be-executed SQL statement, and set all members as needed
*/
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx
index 789e569eb191..b44c3e8a7323 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -83,32 +83,26 @@ public:
MorkParser( int defaultScope = 0x80 );
- ///
/// Open and parse mork file
bool open( const std::string &path );
- ///
/// Return error status
MorkErrors error();
- ///
/// Returns all tables of specified scope
MorkTableMap *getTables( int tableScope );
- ///
/// Rerturns all rows under specified scope
MorkRowMap *getRows( int rowScope, RowScopeMap *table );
- ///
/// Return value of specified value oid
std::string &getValue( int oid );
- ///
/// Return value of specified column oid
std::string &getColumn( int oid );
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 18aa6ca90020..2a28ef569a95 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -98,7 +98,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
{
try
{
- //.............................................................
+
Reference< XNameAccess > xAliasesNode;
xDriverNode->getPropertyValue("ColumnAliases") >>= xAliasesNode;
OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" );
@@ -108,7 +108,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
if ( xAliasesNode.is() )
aProgrammaticNames = xAliasesNode->getElementNames();
- //.............................................................
+
// travel through all the set elements
const OUString* pProgrammaticNames = aProgrammaticNames.getConstArray();
const OUString* pProgrammaticNamesEnd = pProgrammaticNames + aProgrammaticNames.getLength();
@@ -124,7 +124,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
sAssignedAlias = *pProgrammaticNames;
OString sAsciiProgrammaticName( OUStringToOString( *pProgrammaticNames, RTL_TEXTENCODING_ASCII_US ) );
- //.............................................................
+
#if OSL_DEBUG_LEVEL > 0
bool bFound = false;
#endif
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 53083fb4893b..1f765df09566 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
-//.........................................................................
+
namespace connectivity
{
namespace mozab
@@ -40,7 +40,7 @@ namespace connectivity
Reference< XPropertySet > xNode;
try
{
- //=============================================================
+
// create the config provider
Reference< XMultiServiceFactory > xConfigProvider(
com::sun::star::configuration::theDefaultProvider::get(
@@ -49,7 +49,7 @@ namespace connectivity
OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" );
sCompleteNodePath += OConnection::getDriverImplementationName();
- //=========================================================
+
// arguments for creating the config access
Sequence< Any > aArguments(2);
// the path to the node to open
@@ -67,7 +67,7 @@ namespace connectivity
PropertyState_DIRECT_VALUE
);
- //=========================================================
+
// create the access
Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments(
OUString("com.sun.star.configuration.ConfigurationAccess" ),
@@ -172,7 +172,7 @@ namespace connectivity
}
}
-//.........................................................................
+
extern "C" const sal_Unicode* SAL_CALL getUserProfile( void )
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 708438f67612..75e2353aff1e 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -64,9 +64,9 @@ using namespace com::sun::star::sdbcx;
namespace connectivity { namespace mozab {
-// =====================================================================
+
// = ConnectionImplData
-// =====================================================================
+
struct ConnectionImplData
{
::boost::shared_ptr< ::comphelper::OfficeResourceBundle > pResourceBundle;
@@ -144,9 +144,9 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
OSL_TRACE("IN OConnection::construct()" );
// open file
setURL(url);
- //
+
// Skip 'sdbc:mozab: part of URL
- //
+
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index b9fe754779ff..f50468db18b9 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -95,9 +95,9 @@ namespace connectivity
friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
// an operation
MozabDriver* m_pDriver; // Pointer to the owning
@@ -163,7 +163,7 @@ namespace connectivity
// XWarningsSupplier
virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- //
+
MozabDriver* getDriver() const { return m_pDriver;}
// Added to enable me to use SQLInterpreter which requires an
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
index 5d56c82b2242..fbefd5dadc9b 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
@@ -26,9 +26,9 @@ namespace connectivity
{
namespace mozab
{
- //**************************************************************
+
//************ Class: ODatabaseMetaData
- //**************************************************************
+
class ODatabaseMetaData : public ODatabaseMetaDataBase
{
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index a30fae3b3d88..38c5d3eee4eb 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -208,7 +208,7 @@ sal_Int32 SAL_CALL MozabDriver::getMinorVersion( ) throw(RuntimeException)
EDriverType MozabDriver::impl_classifyURL( const OUString& url )
{
// Skip 'sdbc:mozab: part of URL
- //
+
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
OUString aAddrbookURI(url.copy(nLen+1));
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 4c6de31cef42..27322d37a276 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -56,9 +56,9 @@ namespace connectivity
};
::std::vector< Parameter> m_aParameters;
- //====================================================================
+
// Data attributes
- //====================================================================
+
sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
OUString m_sSqlStatement;
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 49c9ff05f76e..ebe599a83f43 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -341,9 +341,9 @@ sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, Runtime
{
if ( (m_aRow->get())[i].isBound() )
{
- //
+
// Everything in the addressbook is a string!
- //
+
if ( !m_aQuery.setRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR ))
{
m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this );
@@ -383,9 +383,9 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(
{
if ( (m_aRow->get())[i].isBound() )
{
- //
+
// Everything in the addressbook is a string!
- //
+
if ( !m_aQuery.getRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR ))
{
m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this );
@@ -1399,7 +1399,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
// the getXXX methods are 1-based ...
sal_Int32 nTableColumnPos = i + 1;
// get first table column is the bookmark column
- // ...
+
#if OSL_DEBUG_LEVEL > 0
OSL_TRACE("Set Col Mapping: %d -> %d", nSelectColumnPos, nTableColumnPos );
#endif
@@ -1432,9 +1432,9 @@ sal_Bool OResultSet::isCount() const
}
-//
+
// Check for valid row in m_aQuery
-//
+
sal_Bool OResultSet::validRow( sal_uInt32 nRow )
{
sal_Int32 nNumberOfRecords = m_aQuery.getRealRowCount();
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index 9b227f5f6319..18a50c547c11 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
@@ -30,9 +30,9 @@ namespace connectivity
{
namespace mozab
{
- //**************************************************************
+
//************ Class: ResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OResultSetMetaData : public OResultSetMetaData_BASE
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index 0e91ac29bec0..a89a0588e6e2 100644
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
@@ -50,10 +50,10 @@ namespace connectivity
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE;
- //**************************************************************
+
//************ Class: OCommonStatement
// is a base class for the normal statement and for the prepared statement
- //**************************************************************
+
class OCommonStatement;
typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE;
@@ -115,9 +115,9 @@ namespace connectivity
virtual ~OCommonStatement();
protected:
- //
+
// Driver Internal Methods
- //
+
enum StatementType { eSelect, eCreateTable };
/** called to do the parsing of a to-be-executed SQL statement, and set all members as needed
*/
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 3bfca5a367d0..ee64f6c7e388 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -144,7 +144,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
// Create the Event Queue for the UI thread...
- //
+
// If an event queue already exists for the thread, then
// CreateThreadEventQueue(...) will fail...
// CreateThread0ueue(...) will fail...
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index 6248f7c8da92..f2fd8ed9e552 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
@@ -264,7 +264,7 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile)
}
-//
+
// // Do the profile switch
gDirServiceProvider->SetProfileDir(profileDir);
mCurrentProfileName.Assign(aCurrentProfile);
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
index b3e52c622087..1b251e0f9aa7 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
@@ -42,9 +42,9 @@ nsIAtom* nsProfileDirServiceProvider::sApp_PreferencesFile50;
nsIAtom* nsProfileDirServiceProvider::sApp_UserProfileDirectory50;
-//*****************************************************************************
+
// nsProfileDirServiceProvider::nsProfileDirServiceProvider
-//*****************************************************************************
+
nsProfileDirServiceProvider::nsProfileDirServiceProvider()
{
@@ -143,9 +143,9 @@ nsProfileDirServiceProvider::GetFile(const char *prop, PRBool *persistent, nsIFi
return rv;
}
-//*****************************************************************************
+
// Protected methods
-//*****************************************************************************
+
nsresult
nsProfileDirServiceProvider::Initialize()
@@ -208,9 +208,9 @@ nsProfileDirServiceProvider::UndefineFileLocations()
return NS_OK;
}
-//*****************************************************************************
+
// Global creation function
-//*****************************************************************************
+
nsresult NS_NewProfileDirServiceProvider(nsProfileDirServiceProvider** aProvider)
{
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
index 79bf6e68b842..3a31c290d060 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
@@ -23,10 +23,10 @@
// Forward Declarations
class nsIAtom;
-// --------------------------------------------------------------------------------------
+
// nsProfileDirServiceProvider - The nsIDirectoryServiceProvider implementation used for
// profile-relative file locations.
-// --------------------------------------------------------------------------------------
+
class nsProfileDirServiceProvider: public nsIDirectoryServiceProvider
{
@@ -61,7 +61,7 @@ protected:
};
-// --------------------------------------------------------------------------------------
+
/**
* Global method to create an instance of nsProfileDirServiceProvider
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index e71d28ba965a..04b25a247ad6 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -183,9 +183,9 @@ static nsresult insertPABDescription()
}
return rv;
}
-//
+
// nsAbDirectoryDataSource
-//
+
#define NS_RDF_CONTRACTID "@mozilla.org/rdf"
#define NS_RDF_DATASOURCE_CONTRACTID NS_RDF_CONTRACTID "/datasource;1"
#define NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_RDF_DATASOURCE_CONTRACTID "?name="
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 4aa86de5bf92..fc690313fbb9 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
@@ -47,7 +47,7 @@ namespace connectivity
MDatabaseMetaDataHelper();
~MDatabaseMetaDataHelper();
- //
+
sal_Bool getTableStrings( OConnection* _pCon,
::std::vector< OUString >& _rStrings,
::std::vector< OUString >& _rTypes);
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 1324d7822a97..9c346b00ddc4 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -31,13 +31,13 @@
#include <boost/unordered_map.hpp>
-//........................................................................
+
namespace connectivity { namespace mozab {
-//........................................................................
- //====================================================================
+
+
//= helper
- //====================================================================
+
namespace
{
typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertyGetter, nsIAbCard, GetFirstName, (PRUnichar**));
@@ -131,16 +131,16 @@ namespace connectivity { namespace mozab {
}
}
- //====================================================================
+
//= AttributeMap_Data
- //====================================================================
+
struct AttributeMap_Data
{
};
- //====================================================================
+
//= MLdapAttributeMap
- //====================================================================
+
MLdapAttributeMap::MLdapAttributeMap()
:m_pData( new AttributeMap_Data )
@@ -436,8 +436,8 @@ namespace connectivity { namespace mozab {
}
}
-//........................................................................
+
} } // namespace connectivity::mozab
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index 8a34d6c9efaf..1ed096ea06e1 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
@@ -24,16 +24,16 @@
#include <memory>
-//........................................................................
+
namespace connectivity { namespace mozab {
-//........................................................................
+
struct AttributeMap_Data;
class MQueryHelperResultEntry;
- //====================================================================
+
//= class MLdapAttributeMap
- //====================================================================
+
/** implements the nsIAbLDAPAttributeMap interface
Somewhere between Mozilla 1.7.5 and SeaMonkey 1.1.12, the LDAP address book
@@ -61,9 +61,9 @@ namespace connectivity { namespace mozab {
::std::auto_ptr< AttributeMap_Data > m_pData;
};
-//........................................................................
+
} } // namespace connectivity::mozab
-//........................................................................
+
#endif // CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index 9073f4546c38..b5ab0f756b89 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
@@ -19,9 +19,9 @@
#ifndef _CONNECTIVITY_MAB_NS_INCLUDE_HXX_
#define _CONNECTIVITY_MAB_NS_INCLUDE_HXX_
-//
+
// Only include Mozilla include files once and using this file...
-//
+
// moved this here and in first position due to "long l;" unxsoli4 warning
#include <rtl/ustrbuf.hxx>
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 2395bd0009b0..9a03fcea28af 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -53,7 +53,7 @@ using namespace connectivity;
// Used to store an nsIAbDirectoryQuery member without the need to use Mozilla
// types in the MQuery.hxx file.
-//
+
namespace connectivity {
namespace mozab {
struct MQueryDirectory {
@@ -86,7 +86,7 @@ MQuery::~MQuery()
// MQueryHelper is reference counted, so we need to decrement the
// count here.
- //
+
if ( m_aQueryDirectory->contextId != -1 && m_aQueryDirectory->directoryQuery !=
NULL )
m_aQueryDirectory->directoryQuery->StopQuery(m_aQueryDirectory->contextId);
@@ -109,7 +109,7 @@ void MQuery::construct()
m_aQueryDirectory = new MQueryDirectory();
// MQueryHelper is reference counted, so we need to add to the
// count here to prevent accidental deletion else where...
- //
+
m_aQueryHelper = new MQueryHelper();
NS_IF_ADDREF( m_aQueryHelper);
}
@@ -564,11 +564,11 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon)
}
-//
-//
+
+
// If the query executed is being done asynchronously then this may return
// -1 as the count, ie. it's undetermined.
-//
+
sal_Int32
MQuery::getRowCount()
{
@@ -576,21 +576,21 @@ MQuery::getRowCount()
}
-//
-//
+
+
// As opposed to getRowCount() this returns the actual number of rows fetched
// so far (if is an async query)
-//
+
sal_uInt32
MQuery::getRealRowCount()
{
return( m_aQueryHelper->getRealCount() );
}
-//
+
// If the query executed is being done asynchronously then this may be
// false
-//
+
sal_Bool
MQuery::queryComplete( void )
{
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 0e9264a39fad..a2ea1ea7c28f 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -34,9 +34,9 @@ using namespace connectivity::mozab;
NS_IMPL_THREADSAFE_ISUPPORTS1(connectivity::mozab::MQueryHelper,nsIAbDirectoryQueryResultListener)
-//
+
// class MQueryHelperResultEntry
-//
+
MQueryHelperResultEntry::MQueryHelperResultEntry()
@@ -83,9 +83,9 @@ void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rVa
{
m_Fields[ key ] = rValue;
}
-//
+
// class MQueryHelper
-//
+
MQueryHelper::MQueryHelper()
:m_nIndex( 0 )
,m_bHasMore( sal_True )
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 0caa68e49981..e60208700d54 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -31,10 +31,10 @@
#include "resource/common_res.hrc"
#include "resource/sharedresources.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using namespace mysql;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
@@ -60,9 +60,9 @@ namespace connectivity
}
}
- //====================================================================
+
//= ODriverDelegator
- //====================================================================
+
ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext)
: ODriverDelegator_BASE(m_aMutex)
@@ -491,8 +491,8 @@ namespace connectivity
return getSupportedServiceNames_Static();
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 5cdc80760433..7a604db27e2a 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -678,9 +678,9 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLExc
}
-//====================================================================
+
// methods
-//====================================================================
+
// initBoundParam
diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index 8b28624ce207..e48d164734b6 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -43,7 +43,7 @@
out.
*/
-//######################################################
+
// This is no general purpose STL allocator but one
// necessary to use STL for some implementation but
// avoid linking sal against the STLPort library!!!
@@ -67,49 +67,49 @@ public:
typedef ::std::size_t size_type;
typedef ::std::ptrdiff_t difference_type;
- //-----------------------------------------
+
template<class U>
struct rebind
{
typedef Allocator<U> other;
};
- //-----------------------------------------
+
pointer address (reference value) const
{
return &value;
}
- //-----------------------------------------
+
const_pointer address (const_reference value) const
{
return &value;
}
- //-----------------------------------------
+
Allocator() SAL_THROW(())
{}
- //-----------------------------------------
+
template<class U>
Allocator (const Allocator<U>&) SAL_THROW(())
{}
- //-----------------------------------------
+
Allocator(const Allocator&) SAL_THROW(())
{}
- //-----------------------------------------
+
~Allocator() SAL_THROW(())
{}
- //-----------------------------------------
+
size_type max_size() const SAL_THROW(())
{
return size_type(-1)/sizeof(T);
}
- //-----------------------------------------
+
/* Normally the code for allocate should
throw a std::bad_alloc exception if the
requested memory could not be allocated:
@@ -136,13 +136,13 @@ public:
rtl_allocateMemory(sal_uInt32(n * sizeof(T))));
}
- //-----------------------------------------
+
void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type)
{
rtl_freeMemory(p);
}
- //-----------------------------------------
+
void construct (pointer p, const T& value)
{
new ((void*)p)T(value);
@@ -151,13 +151,13 @@ public:
// LEM: GNU libstdc++ vectors expect this one to exist,
// at least if one intends to create vectors by giving
// only a size and no initialising value.
- //-----------------------------------------
+
void construct (pointer p)
{
new ((void*)p)T;
}
- //-----------------------------------------
+
void destroy (pointer p)
{
p->~T();
@@ -167,7 +167,7 @@ public:
}
};
-//######################################################
+
// Custom STL allocators must be stateless (see
// references above) that's why the operators below
// return always true or false
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 6b6911bd35f4..46a6865eccae 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -102,7 +102,7 @@ namespace pq_sdbc_driver
{
-// ______________________________________________________________________________
+
// Helper class for statement lifetime management
class ClosableReference : public cppu::WeakImplHelper1< com::sun::star::uno::XReference >
{
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 305f51828146..7fb8bdd07c14 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -79,9 +79,9 @@ struct ConnectionSettings;
-//--------------------------------------------------
+
// Logging API
-//--------------------------------------------------
+
namespace LogLevel
{
// when you add a loglevel, extend the log function !
@@ -94,7 +94,7 @@ static const sal_Int32 DATA = 4;
bool isLog( ConnectionSettings *settings, int loglevel );
void log( ConnectionSettings *settings, sal_Int32 level, const OUString &logString );
void log( ConnectionSettings *settings, sal_Int32 level, const char *str );
-//--------------------------------------------------
+
class Tables;
class Views;
@@ -128,7 +128,7 @@ struct ConnectionSettings
sal_Int32 loglevel;
};
-//--------------------------------------------------
+
typedef cppu::WeakComponentImplHelper6<
com::sun::star::sdbc::XConnection,
com::sun::star::sdbc::XWarningsSupplier,
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 0f3dde69e484..e17dde6e36b2 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1786,7 +1786,7 @@ static void columnMetaData2DatabaseTypeDescription(
{
Sequence< Any > row( 6 );
row[0] <<= m_pSettings->catalog;
- row[1] <<= xRow->getString(1); //
+ row[1] <<= xRow->getString(1);
row[2] <<= xRow->getString(2);
OUString array = xRow->getString(3);
row[4] <<= xRow->getString(5); // the relid
@@ -2299,7 +2299,7 @@ static void pgTypeInfo2ResultSet(
row[NULLABLE] <<= OUString::number(nullable);
row[CASE_SENSITIVE] <<= OUString::number(1);
row[SEARCHABLE] <<= OUString::number( calcSearchable( dataType ) );
- row[UNSIGNED_ATTRIBUTE] <<= OUString("0"); //
+ row[UNSIGNED_ATTRIBUTE] <<= OUString("0");
if( com::sun::star::sdbc::DataType::INTEGER == dataType ||
com::sun::star::sdbc::DataType::BIGINT == dataType )
row[AUTO_INCREMENT] <<= OUString("1"); // TODO
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index 4636e62cda22..acb1ef00833f 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -30,9 +30,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: ODatabaseMetaDataResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE;
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index 47abe3f1ab34..fc75fbc04d2d 100644
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
@@ -61,9 +61,9 @@ namespace connectivity
virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception);
};
-// ==================================
+
} // connectivity
-// ==================================
+
#endif
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index be13d467b496..63a99f32c422 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -26,10 +26,10 @@
#include <vector>
#include "connectivity/dbtoolsdllapi.hxx"
-// -------------------------------------------------------------------------
+
namespace connectivity
{
-// -------------------------------------------------------------------------
+
struct OOO_DLLPUBLIC_DBTOOLS RowEquation
{
sal_Int32 nOperation;
@@ -136,9 +136,9 @@ private:
FunctionParser& operator=( const FunctionParser& );
};
-// -------------------------------------------------------------------------
+
} // namespace connectivity
-// -------------------------------------------------------------------------
+
#endif /* CONNECTIVITY_ROWFUNCTIONPARSER_HXX_INCLUDED */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index edd8b97822b4..e74b93cc2e55 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -29,9 +29,9 @@ namespace connectivity
{
namespace ado
{
- //**************************************************************
+
//************ Class: java.sql.CallableStatement
- //**************************************************************
+
class OCallableStatement : public OPreparedStatement,
public ::com::sun::star::sdbc::XRow,
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 71d6c92621ca..fe5a703f8ac1 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -54,9 +54,9 @@ namespace connectivity
friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
OTypeInfoMap m_aTypeInfo; // vector containing an entry
// for each row returned by
// DatabaseMetaData.getTypeInfo.
@@ -114,7 +114,7 @@ namespace connectivity
// XWarningsSupplier
virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- //
+
WpADOConnection* getConnection() { return m_pAdoConnection; }
void setCatalog(const ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier>& _xCat) { m_xCatalog = _xCat; }
void setCatalog(OCatalog* _pCatalog) { m_pCatalog = _pCatalog; }
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 759cdf4bd7ff..f06e0975b40f 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -29,9 +29,9 @@ namespace connectivity
{
class WpADOConnection;
class OConnection;
- //**************************************************************
+
//************ Class: ODatabaseMetaData
- //**************************************************************
+
class ODatabaseMetaData : public ODatabaseMetaDataBase
{
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index d40e73fd3ed3..c4f51768a7a4 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -195,7 +195,7 @@ namespace connectivity
void setCrossReferenceMap();
void setTypeInfoMap(sal_Bool _bJetEngine);
};
- // -------------------------------------------------------------------------
+
inline sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column)
{
sal_Int32 map = column;
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 5519bea4fc4a..1a3a78ae21ca 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -31,9 +31,9 @@ namespace connectivity
{
namespace ado
{
- //**************************************************************
+
//************ Class: ResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE;
class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index fe07c59a5edc..ccdd22f7a308 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -48,9 +48,9 @@ namespace connectivity
const OUString& _sDefaultName,
sal_Int32& _nParameterCount);
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
const OTypeInfoMap& m_aTypeInfo;
ADOParameters* m_pParameters;
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 4f12c24ef115..1de17fab8cda 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -32,9 +32,9 @@ namespace connectivity
namespace ado
{
- //**************************************************************
+
//************ Class: ResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OResultSetMetaData : public OResultSetMetaData_BASE
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 1e92886227d0..30112d562c7d 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -46,9 +46,9 @@ namespace connectivity
::com::sun::star::sdbc::XCloseable,
::com::sun::star::sdbc::XMultipleResults> OStatement_BASE;
- //**************************************************************
+
//************ Class: java.sql.Statement
- //**************************************************************
+
class OStatement_Base : public comphelper::OBaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index f1d252664b38..ee303cf1a7b8 100644
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
@@ -68,7 +68,7 @@ namespace connectivity
// XAlterTable
virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- //
+
sal_Bool create() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
WpADOTable getImpl() const { return m_aTable;}
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index 8efe993fca13..459d07fecc40 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -94,10 +94,10 @@ namespace connectivity
OLEVariant(const ::com::sun::star::uno::Sequence< sal_Int8 >& x);
OLEVariant& operator=(const OLEVariant& varSrc);
// Assign a const VARIANT& (::VariantCopy handles everything)
- //
+
OLEVariant& operator=(const tagVARIANT& varSrc);
// Assign a const VARIANT* (::VariantCopy handles everything)
- //
+
OLEVariant& operator=(const VARIANT* pSrc);
void setByte(sal_uInt8 n) ;
void setInt16(sal_Int16 n) ;
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index c51dfc6ae2db..12fcbe775d6f 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -55,8 +55,7 @@ namespace connectivity
operator IDispatch*();
};
- //////////////////////////////////////////////////////////////////////////
- //
+
// Template class WpOLEBase<class T>
// ==================================
//
@@ -68,7 +67,7 @@ namespace connectivity
//
// In order to do efficient pass-by-value, this class (as all derived classes)
// is a thin wrapper class, avoiding virtual methods and inlining.
- //------------------------------------------------------------------------
+
template<class T> class WpOLEBase : public WpBase
{
protected:
@@ -112,8 +111,6 @@ namespace connectivity
};
- //////////////////////////////////////////////////////////////////////////
- //
// Template class WpOLECollection<class Ts, class T, class WrapT>
// ===============================================================
//
@@ -127,8 +124,7 @@ namespace connectivity
// This wrapper class does not expose an interface T, however,
// it exposes an object of the class WrapT. This must allow a construction
// by T, preferably it is derived from WpOLEBase<T>.
- //
- //------------------------------------------------------------------------
+
template<class Ts, class T, class WrapT> class WpOLECollection : public WpOLEBase<Ts>
{
public:
@@ -141,7 +137,7 @@ namespace connectivity
inline WpOLECollection& operator=(const WpOLECollection& rhs)
{WpOLEBase<Ts>::operator=(rhs); return *this;};
- //////////////////////////////////////////////////////////////////////
+
inline void Refresh(){pInterface->Refresh();}
@@ -215,7 +211,7 @@ namespace connectivity
WpOLEAppendCollection(const WpOLEAppendCollection& rhs) : WpOLECollection<Ts, T, WrapT>(rhs) {}
inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs)
{WpOLEBase<Ts>::operator=(rhs); return *this;};
- //////////////////////////////////////////////////////////////////////
+
inline sal_Bool Append(const WrapT& aWrapT)
{
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 3dad87dd2282..c313a044b3da 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -46,7 +46,7 @@ namespace connectivity
typedef WpOLEAppendCollection< ADOFields, ADOField, WpADOField> WpADOFields;
typedef WpOLECollection< ADOProperties, ADOProperty, WpADOProperty> WpADOProperties;
- //------------------------------------------------------------------------
+
class WpADOConnection : public WpOLEBase<ADOConnection>
{
friend class WpADOCommand;
@@ -59,7 +59,7 @@ namespace connectivity
WpADOConnection& operator=(const WpADOConnection& rhs)
{WpOLEBase<ADOConnection>::operator=(rhs); return *this;}
- //////////////////////////////////////////////////////////////////////
+
WpADOProperties get_Properties() const;
@@ -138,7 +138,7 @@ namespace connectivity
ADORecordset* getTypeInfo(DataTypeEnum _eType = adEmpty );
};
- //------------------------------------------------------------------------
+
class WpADOCommand : public WpOLEBase<ADOCommand>
{
public:
@@ -153,7 +153,7 @@ namespace connectivity
{
WpOLEBase<ADOCommand>::operator=(rhs); return *this;}
- //////////////////////////////////////////////////////////////////////
+
sal_Bool putref_ActiveConnection( WpADOConnection *pCon);
@@ -177,7 +177,7 @@ namespace connectivity
sal_Bool put_Name(const OUString& _Name);
sal_Bool Cancel();
};
- //------------------------------------------------------------------------
+
class WpADOError : public WpOLEBase<ADOError>
{
public:
@@ -191,7 +191,7 @@ namespace connectivity
WpADOError& operator=(const WpADOError& rhs)
{WpOLEBase<ADOError>::operator=(rhs); return *this;}
- //////////////////////////////////////////////////////////////////////
+
OUString GetDescription() const;
OUString GetSource() const ;
@@ -202,7 +202,7 @@ namespace connectivity
- //------------------------------------------------------------------------
+
class WpADOField : public WpOLEBase<ADOField>
{
// friend class WpADOFields;
@@ -215,7 +215,7 @@ namespace connectivity
WpADOField& operator=(const WpADOField& rhs)
{WpOLEBase<ADOField>::operator=(rhs); return *this;}
- //////////////////////////////////////////////////////////////////////
+
WpADOProperties get_Properties();
sal_Int32 GetActualSize() const ;
@@ -252,7 +252,7 @@ namespace connectivity
- //------------------------------------------------------------------------
+
class WpADOProperty: public WpOLEBase<ADOProperty>
{
public:
@@ -262,7 +262,7 @@ namespace connectivity
WpADOProperty(const WpADOProperty& rhs) : WpOLEBase<ADOProperty>(rhs) {}
WpADOProperty& operator=(const WpADOProperty& rhs)
{WpOLEBase<ADOProperty>::operator=(rhs); return *this;}
- //////////////////////////////////////////////////////////////////////
+
OLEVariant GetValue() const;
void GetValue(OLEVariant &aValVar) const;
@@ -292,7 +292,7 @@ namespace connectivity
// if(pInterface && get_State() == adStateOpen)
// Close();
}
- //////////////////////////////////////////////////////////////////////
+
void Create();
sal_Bool Open(
/* [optional][in] */ VARIANT Source,
@@ -339,7 +339,7 @@ namespace connectivity
sal_Bool UpdateBatch(AffectEnum AffectRecords);
};
- //------------------------------------------------------------------------
+
class WpADOParameter:public WpOLEBase<ADOParameter>
{
public:
@@ -349,7 +349,7 @@ namespace connectivity
WpADOParameter(const WpADOParameter& rhs):WpOLEBase<ADOParameter>(rhs){}
WpADOParameter& operator=(const WpADOParameter& rhs)
{WpOLEBase<ADOParameter>::operator=(rhs); return *this;}
- //////////////////////////////////////////////////////////////////////
+
OUString GetName() const ;
DataTypeEnum GetADOType() const ;
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index 3d1b33b493a4..475ea65ef4d2 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -26,9 +26,9 @@ namespace connectivity
{
namespace calc
{
- //**************************************************************
+
//************ Class: java.sql.DatabaseMetaDataDate
- //**************************************************************
+
class OCalcDatabaseMetaData : public file::ODatabaseMetaData
{
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index bc3a47c5095e..72d4b13c774f 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
@@ -26,9 +26,9 @@ namespace connectivity
{
namespace dbase
{
- //**************************************************************
+
//************ Class: java.sql.DatabaseMetaDataDate
- //**************************************************************
+
class ODbaseDatabaseMetaData : public file::ODatabaseMetaData
{
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index aa2d3f0b510a..bdad1d0cd2db 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -49,9 +49,9 @@ namespace connectivity
friend class OIndexIterator;
public:
- //==================================================================
+
// Header struct - stays in memory
- //==================================================================
+
struct NDXHeader
{
sal_uInt32 db_rootpage; /* Rootpage position */
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 31f5809f618d..ac9e1e5eb6fd 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -28,9 +28,9 @@ namespace connectivity
{
namespace dbase
{
- //==================================================================
+
// IndexIterator
- //==================================================================
+
class OIndexIterator
{
protected:
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index a6b0086c01b5..e824239af966 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -37,9 +37,9 @@ namespace connectivity
class ONDXNode;
class ODbaseIndex;
- //==================================================================
+
// Index Key
- //==================================================================
+
typedef file::OOperand ONDXKey_BASE;
class ONDXKey : public ONDXKey_BASE
{
@@ -83,9 +83,9 @@ namespace connectivity
- //==================================================================
+
// Index Page Pointer
- //==================================================================
+
SV_DECL_REF(ONDXPage) // Base class - because we need to store additional information
@@ -108,9 +108,9 @@ namespace connectivity
sal_Bool HasPage() const {return nPagePos != 0;}
// sal_Bool Is() const { return isValid(); }
};
- //==================================================================
+
// Index Page
- //==================================================================
+
class ONDXPage : public SvRefBase
{
friend class ODbaseIndex;
@@ -217,9 +217,9 @@ namespace connectivity
typedef ::std::vector<ONDXPage*> ONDXPageList;
- //==================================================================
+
// Index Node
- //==================================================================
+
class ONDXNode
{
friend class ONDXPage;
@@ -247,9 +247,9 @@ namespace connectivity
void Write(SvStream &rStream, const ONDXPage& rPage) const;
void Read(SvStream &rStream, ODbaseIndex&);
};
- //==================================================================
+
// inline implementation
- //==================================================================
+
// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
// : ONDXKey_BASE(eType)
// , nRecord(nRec),xValue(rVal)
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 7d302f781519..5602a6011bea 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -48,9 +48,9 @@ namespace connectivity
friend class connectivity::OSubComponent<OConnection, connectivity::OMetaConnection>;
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog;
::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index e3491da8cfa6..d6aff605ac9c 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -28,9 +28,9 @@ namespace connectivity
{
namespace file
{
- //**************************************************************
+
//************ Class: ODatabaseMetaData
- //**************************************************************
+
class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE ODatabaseMetaData :
public ODatabaseMetaDataBase
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 0db2d15bae7e..b85def2483be 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -42,9 +42,9 @@ namespace connectivity
{
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
OUString m_aSql;
OValueRefRow m_aParameterRow;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData;
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 5d730a82ee13..4bff314d1071 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -306,7 +306,7 @@ namespace connectivity
virtual sal_Bool deletedVisible() const;
virtual sal_Bool isRowDeleted() const;
};
- // -------------------------------------------------------------------------
+
inline sal_Int32 OResultSet::mapColumn(sal_Int32 column)
{
sal_Int32 map = column;
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index c9db785e0482..5fad804ceed5 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -31,9 +31,9 @@ namespace connectivity
namespace file
{
class OFileTable;
- //**************************************************************
+
//************ Class: ResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OOO_DLLPUBLIC_FILE OResultSetMetaData :
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 669d6256cefd..655593c47409 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -51,9 +51,9 @@ namespace connectivity
::com::sun::star::util::XCancellable,
::com::sun::star::sdbc::XCloseable> OStatement_BASE;
- //**************************************************************
+
//************ Class: java.sql.Statement
- //**************************************************************
+
class OOO_DLLPUBLIC_FILE OStatement_Base :
public comphelper::OBaseMutex,
public OStatement_BASE,
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index 154131e99387..77c7b7a7c474 100644
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
@@ -25,10 +25,10 @@
namespace connectivity
{
- //==================================================================
+
// Derived from String, overriding GetToken/GetTokenCount methods
// Especially true for the flat file format: Strings can be quoted
- //==================================================================
+
class OOO_DLLPUBLIC_FILE QuotedTokenizedString
{
OUString m_sString;
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index 6d06d11b54be..95a91097b83d 100644
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
@@ -26,9 +26,9 @@ namespace connectivity
{
namespace flat
{
- //**************************************************************
+
//************ Class: java.sql.DatabaseMetaDataDate
- //**************************************************************
+
class OFlatDatabaseMetaData : public file::ODatabaseMetaData
{
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 5d3611924ac0..b592a8ae9873 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -43,10 +43,10 @@ namespace connectivity
~IMethodGuardAccess() {}
};
- //==========================================================================
+
//= OHsqlConnection - wraps all methods to the real connection from the driver
//= but when disposed it doesn't dispose the real connection
- //==========================================================================
+
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::util::XFlushable
, ::com::sun::star::sdb::application::XTableUIProvider
> OHsqlConnection_BASE;
@@ -127,9 +127,9 @@ namespace connectivity
impl_getTextTableIcon_nothrow();
};
- //==========================================================================
+
//= OHsqlConnection
- //==========================================================================
+
class MethodGuard : public ::osl::MutexGuard
{
private:
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 05dd7264872d..92e570f3497a 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -30,10 +30,10 @@
#include <comphelper/broadcasthelper.hxx>
#include "connectivity/CommonTools.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
namespace hsqldb
{
@@ -128,9 +128,9 @@ namespace connectivity
};
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_HSQLDB_DRIVER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index 112cba701d83..197ef9f6ee02 100644
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
@@ -31,10 +31,10 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <boost/shared_ptr.hpp>
#include <jni.h>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
namespace hsqldb
{
class StreamHelper
@@ -76,13 +76,13 @@ namespace connectivity
static OUString removeOldURLPrefix(const OUString& _sURL);
static void throwJavaException(const ::com::sun::star::uno::Exception& _aException,JNIEnv * env);
};
- //........................................................................
+
} // namespace hsqldb
- //........................................................................
-//........................................................................
+
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index f243b60247cc..77a6a4af8052 100644
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
@@ -22,14 +22,14 @@
#include <rtl/ustrbuf.hxx>
-//........................................................................
+
namespace connectivity { namespace hsqldb
{
-//........................................................................
- //====================================================================
+
+
//= HTools
- //====================================================================
+
class HTools
{
public:
@@ -47,9 +47,9 @@ namespace connectivity { namespace hsqldb
);
};
-//........................................................................
+
} } // namespace connectivity::hsqldb
-//........................................................................
+
#endif // CONNECTIVITY_HTOOLS_HXX
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 8cfe209916f6..3752a128f99f 100644
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
@@ -27,14 +27,14 @@
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
-//........................................................................
+
namespace connectivity { namespace hsqldb
{
-//........................................................................
- //====================================================================
+
+
//= HView
- //====================================================================
+
typedef ::connectivity::sdbcx::OView HView_Base;
typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XAlterView > HView_IBASE;
class HView :public HView_Base
@@ -80,9 +80,9 @@ namespace connectivity { namespace hsqldb
using HView_Base::getFastPropertyValue;
};
-//........................................................................
+
} } // namespace connectivity::hsqldb
-//........................................................................
+
#endif // CONNECTIVITY_HVIEW_HXX
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 4aa61e9a5d0a..4f6bb57745e0 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -27,14 +27,14 @@ namespace comphelper
class ResourceBasedEventLogger;
}
-//........................................................................
+
namespace connectivity { namespace jdbc
{
-//........................................................................
- //====================================================================
+
+
//= ContextClassLoaderScope
- //====================================================================
+
/**
*/
class ContextClassLoaderScope
@@ -85,9 +85,9 @@ namespace connectivity { namespace jdbc
};
-//........................................................................
+
} } // namespace connectivity::jdbc
-//........................................................................
+
#endif // CONNECTIVITY_CONTEXTCLASSLOADER_HXX
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index 49bd698185dc..4d9ccd47ad7a 100644
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
@@ -25,14 +25,14 @@
#include <jvmaccess/virtualmachine.hxx>
-//........................................................................
+
namespace connectivity { namespace jdbc
{
-//........................................................................
- //====================================================================
+
+
//= GlobalRef
- //====================================================================
+
/** helper class to hold a local ref to a JNI object
*/
template< typename T >
@@ -104,9 +104,9 @@ namespace connectivity { namespace jdbc
};
-//........................................................................
+
} } // namespace connectivity::jdbc
-//........................................................................
+
#endif // CONNECTIVITY_GLOBALREF_HXX
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index 668b70944ef6..a060193ea5ae 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -22,14 +22,14 @@
#include <jvmaccess/virtualmachine.hxx>
-//........................................................................
+
namespace connectivity { namespace jdbc
{
-//........................................................................
- //====================================================================
+
+
//= LocalRef
- //====================================================================
+
/** helper class to hold a local ref to a JNI object
Note that this class never actually calls NewLocalRef. It is assumed that all objects
@@ -88,9 +88,9 @@ namespace connectivity { namespace jdbc
T m_object;
};
-//........................................................................
+
} } // namespace connectivity::jdbc
-//........................................................................
+
#endif // CONNECTIVITY_LOCALREF_HXX
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index f8d92805b651..e79f9c584254 100644
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.io.InputStream
- //**************************************************************
+
class java_io_InputStream : public java_lang_Object,
public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream>
{
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index 5182a8c406b6..a3836d1fb8a1 100644
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.io.InputStream
- //**************************************************************
+
class java_io_Reader : public java_lang_Object,
public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream>
{
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 028a4f21d246..1353ab36c501 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -20,9 +20,9 @@
#define _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_
#include "java/lang/Object.hxx"
-//**************************************************************
+
//************ Class: java.lang.Boolean
-//**************************************************************
+
namespace connectivity
{
class java_lang_Boolean : public java_lang_Object
diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx
index 136fc2a29543..96622f8ae7b0 100644
--- a/connectivity/source/inc/java/lang/Class.hxx
+++ b/connectivity/source/inc/java/lang/Class.hxx
@@ -18,9 +18,9 @@
*/
#ifndef _CONNECTIVITY_JAVA_LANG_CLASS_HXX_
#define _CONNECTIVITY_JAVA_LANG_CLASS_HXX_
-//**************************************************************
+
//************ Class: java.lang.Class
-//**************************************************************
+
#include "java/lang/Object.hxx"
namespace connectivity
diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx
index 227c984d4d4b..8bc5191234fb 100644
--- a/connectivity/source/inc/java/lang/Exception.hxx
+++ b/connectivity/source/inc/java/lang/Exception.hxx
@@ -24,9 +24,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.lang.Exception
- //**************************************************************
+
class java_lang_Exception : public java_lang_Throwable{
protected:
// statis Data for the class
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index c7298c8b51d6..5fba9d11b24d 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -29,7 +29,7 @@
#include <functional>
#include <boost/shared_ptr.hpp>
-//=====================================================================
+
#ifdef HAVE_64BIT_POINTERS
#error "no 64 bit pointer"
@@ -64,8 +64,8 @@ namespace connectivity
return *pEnv;
}
};
- //=====================================================================
- //=====================================================================
+
+
class java_lang_Object
{
// operator= and the copy ctor are forbidden
diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx
index 483af2beba10..7c1da9fa865f 100644
--- a/connectivity/source/inc/java/lang/Throwable.hxx
+++ b/connectivity/source/inc/java/lang/Throwable.hxx
@@ -23,9 +23,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.lang.Throwable
- //**************************************************************
+
class java_lang_Throwable : public java_lang_Object
{
protected:
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index 3a8484e71cb9..045fab6a7c8b 100644
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
@@ -20,9 +20,9 @@
#define _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_
#include "java/lang/Object.hxx"
-//**************************************************************
+
//************ Class: java.lang.Boolean
-//**************************************************************
+
namespace connectivity
{
class java_math_BigDecimal : public java_lang_Object
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index b55c94f60bc4..e469fbb4d2da 100644
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.SQLWarning
- //**************************************************************
+
class java_sql_Array : public java_lang_Object,
public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XArray>
{
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index 47441dafbf7b..2bba436f5377 100644
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
@@ -27,9 +27,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.SQLWarning
- //**************************************************************
+
class java_sql_Blob : public java_lang_Object,
public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob>
{
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index afc23eb207f8..e4fbd6982e46 100644
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.CallableStatement
- //**************************************************************
+
class java_sql_CallableStatement : public java_sql_PreparedStatement,
public ::com::sun::star::sdbc::XRow,
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index 9779ffcd298b..89a748c3a867 100644
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
@@ -27,9 +27,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.SQLWarning
- //**************************************************************
+
class java_sql_Clob : public java_lang_Object,
public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob>
{
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 49c835bde32a..34dcdac461b0 100644
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
@@ -34,19 +34,19 @@ namespace com { namespace sun { namespace star { namespace util
struct DateTime;
} } } }
-//........................................................................
+
namespace comphelper { namespace log { namespace convert
{
-//........................................................................
+
// helpers for logging more data types than are defined in comphelper/logging.hxx
OUString convertLogArgToString( const ::com::sun::star::util::Date& _rDate );
OUString convertLogArgToString( const ::com::sun::star::util::Time& _rTime );
OUString convertLogArgToString( const ::com::sun::star::util::DateTime& _rDateTime );
-//........................................................................
+
} } }
-//........................................................................
+
#include <comphelper/logging.hxx>
@@ -55,13 +55,13 @@ namespace connectivity
namespace LogLevel = ::com::sun::star::logging::LogLevel;
}
-//........................................................................
+
namespace connectivity { namespace java { namespace sql {
-//........................................................................
- //====================================================================
+
+
//= ConnectionLog
- //====================================================================
+
typedef ::comphelper::ResourceBasedEventLogger ConnectionLog_Base;
class ConnectionLog : public ConnectionLog_Base
{
@@ -125,9 +125,9 @@ namespace connectivity { namespace java { namespace sql {
}
};
-//........................................................................
+
} } } // namespace connectivity::java::sql
-//........................................................................
+
#endif // CONNECTIVITY_CONNECTIONLOG_HXX
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index e137a20837f3..12c272b57148 100644
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
@@ -27,9 +27,9 @@
namespace connectivity
{
class java_sql_Connection;
- //**************************************************************
+
//************ Class: java.sql.DatabaseMetaDataDate
- //**************************************************************
+
class java_sql_DatabaseMetaData : public ODatabaseMetaDataBase,
public java_lang_Object
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 0080bf273e66..25d191f02c7a 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
-//**************************************************************
+
//************ Class: java.sql.DriverPropertyInfo
-//**************************************************************
+
class java_sql_DriverPropertyInfo : public java_lang_Object
{
protected:
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index 2f82bcc85da6..a578460c6419 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -49,9 +49,9 @@ namespace connectivity
class java_sql_Connection;
- //**************************************************************
+
//************ Class: java.sql.Statement
- //**************************************************************
+
class java_sql_Statement_Base : public comphelper::OBaseMutex,
public java_sql_Statement_BASE,
public java_lang_Object,
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 1e13f288e1c7..a742c87d71c6 100644
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
@@ -28,9 +28,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.PreparedStatement
- //**************************************************************
+
class java_sql_PreparedStatement : public OStatement_BASE2,
public ::com::sun::star::sdbc::XPreparedStatement,
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index 10572feb4850..931ca6bc350f 100644
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.Ref
- //**************************************************************
+
class java_sql_Ref : public java_lang_Object,
public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef>
{
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index 439e4d6831a5..19fe1363b91d 100644
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.ResultSetMetaData
- //**************************************************************
+
class java_sql_Connection;
class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>,
public java_lang_Object
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index 217556cda071..7d0d52cea984 100644
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
@@ -25,9 +25,9 @@
namespace connectivity
{
namespace starsdbc = ::com::sun::star::sdbc;
- //**************************************************************
+
//************ Class: java.sql.SQLException
- //**************************************************************
+
class java_sql_SQLException_BASE;
class java_sql_SQLException : public starsdbc::SQLException
{
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index 3c158e7007d8..bd7d13de9f85 100644
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
@@ -26,9 +26,9 @@ namespace connectivity
{
// namespace starsdbc = ::com::sun::star::sdbc;
// namespace ::com::sun::star::uno = ::com::sun::star::uno;
- //**************************************************************
+
//************ Class: java.sql.SQLWarning
- //**************************************************************
+
class java_sql_SQLWarning_BASE : public java_sql_SQLException_BASE
{
protected:
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index 6c84c4f3104e..563b06b52cf1 100644
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.sql.Date
- //**************************************************************
+
class java_sql_Date : public java_util_Date
{
@@ -47,9 +47,9 @@ namespace connectivity
};
- //**************************************************************
+
//************ Class: java.sql.Time
- //**************************************************************
+
class java_sql_Time : public java_util_Date
{
@@ -66,9 +66,9 @@ namespace connectivity
static jclass st_getMyClass();
};
- //**************************************************************
+
//************ Class: java.sql.Timestamp
- //**************************************************************
+
class java_sql_Timestamp : public java_util_Date
{
protected:
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index 687876c7fda3..3411042ee3f6 100644
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/Date.hxx
@@ -26,9 +26,9 @@
namespace connectivity
{
- //**************************************************************
+
//************ Class: java.util.Date
- //**************************************************************
+
class java_util_Date : public java_lang_Object
{
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index fa2bab4060cf..2e453bda12b5 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -32,10 +32,10 @@
#include <comphelper/broadcasthelper.hxx>
#include "connectivity/CommonTools.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
class OMetaConnection;
@@ -107,9 +107,9 @@ namespace connectivity
};
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_MYSQL_DRIVER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index d39ba1497f1f..1c59b3f1210b 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -43,11 +43,11 @@ namespace connectivity
{
free(binaryData);
}
- //--------------------------------------------------------------------
+
// allocBindDataBuffer
// Allocates and returns a new bind data buffer of the specified
// length
- //--------------------------------------------------------------------
+
void* allocBindDataBuffer (sal_Int32 bufLen)
{
// Reset the input stream and sequence, we are doing a new bind
@@ -60,28 +60,28 @@ namespace connectivity
return binaryData;
}
- //--------------------------------------------------------------------
+
// getBindDataBuffer
// Returns the data buffer to be used when binding to a parameter
- //--------------------------------------------------------------------
+
void* getBindDataBuffer ()
{
return binaryData;
}
- //--------------------------------------------------------------------
+
// getBindLengthBuffer
// Returns the length buffer to be used when binding to a parameter
- //--------------------------------------------------------------------
+
SQLLEN* getBindLengthBuffer ()
{
return &paramLength;
}
- //--------------------------------------------------------------------
+
// setInputStream
// Sets the input stream for the bound parameter
- //--------------------------------------------------------------------
+
void setInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& inputStream,
sal_Int32 len)
{
@@ -94,58 +94,58 @@ namespace connectivity
aSequence = _aSequence;
}
- //--------------------------------------------------------------------
+
// getInputStream
// Gets the input stream for the bound parameter
- //--------------------------------------------------------------------
+
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream ()
{
return paramInputStream;
}
- //--------------------------------------------------------------------
+
// getInputStreamLen
// Gets the input stream length for the bound parameter
- //--------------------------------------------------------------------
+
sal_Int32 getInputStreamLen ()
{
return paramInputStreamLen;
}
- //--------------------------------------------------------------------
+
// setSqlType
// Sets the Java sql type used to register an OUT parameter
- //--------------------------------------------------------------------
+
void setSqlType(sal_Int32 type)
{
sqlType = type;
}
- //--------------------------------------------------------------------
+
// getSqlType
// Gets the Java sql type used to register an OUT parameter
- //--------------------------------------------------------------------
+
sal_Int32 getSqlType ()
{
return sqlType;
}
- //--------------------------------------------------------------------
+
// setOutputParameter
// Sets the flag indicating if this is an OUTPUT parameter
- //--------------------------------------------------------------------
+
void setOutputParameter (sal_Bool output)
{
outputParameter = output;
}
- //--------------------------------------------------------------------
+
// isOutputParameter
// Gets the OUTPUT parameter flag
- //--------------------------------------------------------------------
+
sal_Bool isOutputParameter ()
{
@@ -153,9 +153,9 @@ namespace connectivity
}
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
void *binaryData; // Storage area to be used
// when binding the parameter
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 448544511494..78339021a9be 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -51,9 +51,9 @@ namespace connectivity
friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
protected:
- //====================================================================
+
// Data attributes
- //====================================================================
+
::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connectionas which are need for serveral statements
TTypeInfoVector m_aTypeInfo; // vector containing an entry
// for each row returned by
@@ -123,7 +123,7 @@ namespace connectivity
// XWarningsSupplier
virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception);
- //
+
SQLHANDLE getConnection() { return m_aConnectionHandle; }
// should we use the catalog on filebased databases
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index d3d267cab173..a7b3bcc3eb43 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
@@ -28,9 +28,9 @@ namespace connectivity
{
namespace odbc
{
- //**************************************************************
+
//************ Class: ODatabaseMetaData
- //**************************************************************
+
class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaData :
public ODatabaseMetaDataBase
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 0af1d26470b3..8d18930c915d 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//--------------------------------------------------------------------------
+
#ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_
#define _CONNECTIVITY_OFUNCTIONDEFS_HXX_
@@ -50,7 +50,7 @@
#endif
-//--------------------------------------------------------------------------
+
#ifdef UNX
@@ -77,7 +77,7 @@
#endif // UNX
-//--------------------------------------------------------------------------
+
#ifndef SQL_WCHAR
#define SQL_WCHAR (-8)
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index fefa811216e2..d18a572c46c0 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -60,9 +60,9 @@ namespace connectivity
};
::std::vector< Parameter> m_aParameters;
- //====================================================================
+
// Data attributes
- //====================================================================
+
SQLSMALLINT numParams; // Number of parameter markers for the prepared statement
OBoundParam* boundParams;
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 17da0aecd6e1..1f660406b58f 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -31,9 +31,9 @@ namespace connectivity
{
namespace odbc
{
- //**************************************************************
+
//************ Class: ResultSetMetaData
- //**************************************************************
+
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData :
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 4df493184317..5b844cdb32b1 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -52,9 +52,9 @@ namespace connectivity
::com::sun::star::sdbc::XMultipleResults> OStatement_BASE;
class OResultSet;
- //**************************************************************
+
//************ Class: java.sql.Statement
- //**************************************************************
+
class OOO_DLLPUBLIC_ODBCBASE OStatement_Base :
public comphelper::OBaseMutex,
public OStatement_BASE,
@@ -109,11 +109,11 @@ namespace connectivity
sal_Bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException);
sal_Int32 getColumnCount () throw( ::com::sun::star::sdbc::SQLException);
- //--------------------------------------------------------------------
+
// getResultSet
// getResultSet returns the current result as a ResultSet. It
// returns NULL if the current result is not a ResultSet.
- //--------------------------------------------------------------------
+
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > getResultSet (sal_Bool checkCount) throw( ::com::sun::star::sdbc::SQLException);
/**
creates the driver specific resultset (factory)
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 015e5f2a13ec..780a6eafdb2a 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -228,7 +228,7 @@ namespace connectivity
{
OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue);
}
- //-----------------------------------------------------------------------------
+
}
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 150cb3f01341..8ca6f4ab59ec 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -62,16 +62,16 @@ namespace connectivity
}
-//------------------------------------------------------------------------------
+
#define DECL_PROP1IMPL(varname, type) \
pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)),
-//------------------------------------------------------------------------------
+
#define DECL_PROP0(varname, type) \
DECL_PROP1IMPL(varname, type) 0)
-//------------------------------------------------------------------------------
+
#define DECL_BOOL_PROP1IMPL(varname) \
pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getBooleanCppuType(),
-//------------------------------------------------------------------------------
+
#define DECL_BOOL_PROP0(varname) \
DECL_BOOL_PROP1IMPL(varname) 0)
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
index cae52c31980a..0e8c69ee5441 100644
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ b/connectivity/source/inc/resource/ado_res.hrc
@@ -23,9 +23,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the ado driver's resource strings
-// ============================================================================
+
#define STR_INVALID_COLUMN_DESCRIPTOR_ERROR ( STR_ADO_BASE + 1 )
#define STR_INVALID_GROUP_DESCRIPTOR_ERROR ( STR_ADO_BASE + 2 )
#define STR_INVALID_INDEX_DESCRIPTOR_ERROR ( STR_ADO_BASE + 3 )
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
index 7ec01df03c60..0984584bb689 100644
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ b/connectivity/source/inc/resource/calc_res.hrc
@@ -23,9 +23,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the calc driver's resource strings
-// ============================================================================
+
#define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE + 0 )
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index 5d9ce54e5816..891a47abc0bb 100644
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.hrc
@@ -22,9 +22,9 @@
#include "resource/conn_shared_res.hrc"
-// ============================================================================
+
// = common strings
-// ============================================================================
+
#define STR_STRING_LENGTH_EXCEEDED ( STR_COMMON_BASE + 1 )
#define STR_CANNOT_CONVERT_STRING ( STR_COMMON_BASE + 2 )
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 3b8fe21e9cae..f136389b35e9 100644
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.hrc
@@ -20,7 +20,7 @@
#ifndef CONNECTIVITY_SHARED_RES_HRC
#define CONNECTIVITY_SHARED_RES_HRC
-// ============================================================================
+
// = normal resource ids, per driver
// Mozilla driver resource ids
@@ -54,7 +54,7 @@
// hsqldb driver resource ids
#define STR_HSQLDB_BASE 1750
-// ============================================================================
+
// = resource ids for log messages
#define STR_LOG_MESSAGE_BASE 10000
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
index 54e4b7370655..b9d80342a63c 100644
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ b/connectivity/source/inc/resource/dbase_res.hrc
@@ -23,9 +23,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the calc driver's resource strings
-// ============================================================================
+
#define STR_COULD_NOT_DELETE_INDEX ( STR_DBASE_BASE + 0 )
#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE ( STR_DBASE_BASE + 1 )
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
index 10b2638fe2f3..b4dcdf373f1b 100644
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ b/connectivity/source/inc/resource/evoab2_res.hrc
@@ -23,9 +23,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the calc driver's resource strings
-// ============================================================================
+
#define STR_CANNOT_OPEN_BOOK ( STR_EVOAB2_BASE + 0 )
#define STR_SORT_BY_COL_ONLY ( STR_EVOAB2_BASE + 1 )
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
index 38f27fb13780..054e3157606f 100644
--- a/connectivity/source/inc/resource/file_res.hrc
+++ b/connectivity/source/inc/resource/file_res.hrc
@@ -22,9 +22,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the file driver's resource strings
-// ============================================================================
+
#define STR_QUERY_COMPLEX_COUNT ( STR_FILE_BASE + 0 )
#define STR_QUERY_INVALID_BETWEEN ( STR_FILE_BASE + 1 )
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index 0ae55112278f..cd9da8f5ccfa 100644
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
@@ -23,9 +23,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the hsqldb driver's resource strings
-// ============================================================================
+
#define STR_NO_STORAGE ( STR_HSQLDB_BASE + 0 )
#define STR_INVALID_FILE_URL ( STR_HSQLDB_BASE + 1 )
diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
index d6551884a960..f33081c71d07 100644
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ b/connectivity/source/inc/resource/kab_res.hrc
@@ -22,9 +22,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the kab driver's resource strings
-// ============================================================================
+
#define STR_NO_KDE_INST ( STR_KAB_BASE + 0 )
#define STR_KDE_VERSION_TOO_OLD ( STR_KAB_BASE + 1 )
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
index 6959a08bd69c..f407039a59be 100644
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ b/connectivity/source/inc/resource/macab_res.hrc
@@ -22,9 +22,9 @@
#include "resource/conn_shared_res.hrc"
#include "resource/common_res.hrc"
-// ============================================================================
+
// = the macab driver's resource strings
-// ============================================================================
+
#define STR_NO_TABLE ( STR_MACAB_BASE + 0 )
#define STR_NO_MAC_OS_FOUND ( STR_MACAB_BASE + 1 )
diff --git a/connectivity/source/inc/resource/mork_res.hrc b/connectivity/source/inc/resource/mork_res.hrc
index 84f68b58a991..5278c77322d9 100644
--- a/connectivity/source/inc/resource/mork_res.hrc
+++ b/connectivity/source/inc/resource/mork_res.hrc
@@ -22,9 +22,9 @@
#include "resource/conn_shared_res.hrc"
-// ============================================================================
+
// = the mozab driver's resource strings
-// ============================================================================
+
#define STR_MOZILLA_ADDRESSBOOKS ( STR_MORK_BASE + 0 )
#define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MORK_BASE + 1 )
diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc
index 334f18508982..fb36c6356b7c 100644
--- a/connectivity/source/inc/resource/mozab_res.hrc
+++ b/connectivity/source/inc/resource/mozab_res.hrc
@@ -22,9 +22,9 @@
#include "resource/conn_shared_res.hrc"
-// ============================================================================
+
// = the mozab driver's resource strings
-// ============================================================================
+
#define STR_MOZILLA_ADDRESSBOOKS ( STR_MOZAB_BASE + 0 )
#define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MOZAB_BASE + 1 )
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index 089788c524ea..0d41ebcfdc4e 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -24,15 +24,15 @@
#include <list>
#include "connectivity/dbtoolsdllapi.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
typedef sal_uInt16 ResourceId;
- //====================================================================
+
//= SharedResources
- //====================================================================
+
/** helper class for accessing resources shared by different libraries
in the connectivity module
*/
@@ -145,9 +145,9 @@ namespace connectivity
const ::std::list< ::std::pair<const sal_Char* , OUString > > _aStringToSubstitutes) const;
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_SHAREDRESOURCES_HXX
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 01cbaad47206..261057467fa2 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -58,9 +58,9 @@ void throwNoSuchElementException() throw(NoSuchElementException)
throw NoSuchElementException();
}
-//==========================================================================
+
//= ODriverEnumeration
-//==========================================================================
+
class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
{
friend class OSDBCDriverManager;
@@ -107,9 +107,9 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W
return makeAny( *m_aPos++ );
}
- //=====================================================================
+
//= helper
- //=====================================================================
+
/// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded
struct EnsureDriver : public ::std::unary_function< DriverAccess, DriverAccess >
@@ -167,7 +167,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W
// ctor
AcceptsURL( const OUString& _rURL ) : m_rURL( _rURL ) { }
- //.................................................................
+
bool operator()( const Reference<XDriver>& _rDriver ) const
{
// ask the driver
@@ -224,7 +224,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W
/// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names
struct CompareDriverAccessByName : public ::std::binary_function< DriverAccess, DriverAccess, bool >
{
- //.................................................................
+
bool operator()( const DriverAccess& lhs, const DriverAccess& rhs )
{
return lhs.sImplementationName < rhs.sImplementationName ? true : false;
@@ -236,16 +236,16 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W
{
OUString m_sImplName;
EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){}
- //.................................................................
+
bool operator()( const DriverAccess& lhs)
{
return lhs.sImplementationName.equals(m_sImplName);
}
};
-//==========================================================================
+
//= OSDBCDriverManager
-//==========================================================================
+
OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext )
:m_xContext( _rxContext )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 7e7c1129a74e..27373ba9c672 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -41,9 +41,9 @@
namespace drivermanager
{
- //======================================================================
+
//= various
- //======================================================================
+
typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > DriverCollection;
struct DriverAccess
@@ -53,9 +53,9 @@ namespace drivermanager
css::uno::Reference< css::lang::XSingleComponentFactory > xComponentFactory; /// the factory to create the driver component (if not already done so)
};
- //==========================================================================
+
//= OSDBCDriverManager - the one-instance service for managing SDBC drivers
- //==========================================================================
+
typedef ::cppu::WeakImplHelper3 < ::com::sun::star::sdbc::XDriverManager2
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::uno::XNamingService
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 745ce6efb551..45eff1864774 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -27,9 +27,9 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-//==========================================================================
+
//= registration
-//==========================================================================
+
extern "C"
{
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 39e3010369a4..92b572bca4e4 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4280,20 +4280,20 @@ connectivity::OSQLInternalNode* newNode(const OUString& _NewValue,
return new connectivity::OSQLInternalNode(_NewValue, eNodeType, nNodeID);
}
-//==========================================================================
+
//= OParseContext
-//==========================================================================
-//-----------------------------------------------------------------------------
+
+
OParseContext::OParseContext()
{
}
-//-----------------------------------------------------------------------------
+
OParseContext::~OParseContext()
{
}
-//-----------------------------------------------------------------------------
+
OUString OParseContext::getErrorMessage(ErrorCode _eCode) const
{
OUString aMsg;
@@ -4318,7 +4318,7 @@ OUString OParseContext::getErrorMessage(ErrorCode _eCode) const
return aMsg;
}
-//-----------------------------------------------------------------------------
+
OString OParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const
{
OString aKeyword;
@@ -4356,7 +4356,7 @@ OString OParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const
return aKeyword;
}
-//-----------------------------------------------------------------------------
+
IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const OString& rToken) const
{
static IParseContext::InternationalKeyCode Intl_TokenID[] =
@@ -4380,35 +4380,35 @@ IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const OString&
return KEY_NONE;
}
-//------------------------------------------------------------------------------
+
static Locale& impl_getLocaleInstance( )
{
static Locale s_aLocale( "en", "US", "" );
return s_aLocale;
}
-//------------------------------------------------------------------------------
+
Locale OParseContext::getPreferredLocale( ) const
{
return getDefaultLocale();
}
-//------------------------------------------------------------------------------
+
const Locale& OParseContext::getDefaultLocale()
{
return impl_getLocaleInstance();
}
-//==========================================================================
+
//= misc
-//==========================================================================
+
// Der (leider globale) yylval fuer die Uebergabe von
// Werten vom Scanner an den Parser. Die globale Variable
// wird nur kurzzeitig verwendet, der Parser liest die Variable
// sofort nach dem Scanner-Aufruf in eine gleichnamige eigene
// Member-Variable.
-//------------------------------------------------------------------
+
OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode* pEscapeNode, sal_Bool bInternational)
{
OUStringBuffer aMatchStr(0);
@@ -4467,9 +4467,9 @@ OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode*
return aMatchStr.makeStringAndClear();
}
-//==========================================================================
+
//= OSQLParser
-//==========================================================================
+
sal_uInt32 OSQLParser::s_nRuleIDs[OSQLParseNode::rule_count + 1];
OSQLParser::RuleIDMap OSQLParser::s_aReverseRuleIDLookup;
@@ -4480,18 +4480,18 @@ sal_Int32 OSQLParser::s_nRefCount = 0;
OSQLScanner* OSQLParser::s_pScanner = 0;
OSQLParseNodesGarbageCollector* OSQLParser::s_pGarbageCollector = 0;
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData4> OSQLParser::s_xLocaleData = NULL;
-//-----------------------------------------------------------------------------
+
void setParser(OSQLParser* _pParser)
{
xxx_pGLOBAL_SQLPARSER = _pParser;
}
-// -------------------------------------------------------------------------
+
void OSQLParser::setParseTree(OSQLParseNode * pNewParseTree)
{
::osl::MutexGuard aGuard(getMutex());
m_pParseTree = pNewParseTree;
}
-//-----------------------------------------------------------------------------
+
/** Delete all comments in a query.
@@ -4552,7 +4552,7 @@ static OUString delComment( const OUString& rQuery )
}
return aBuf.makeStringAndClear();
}
-//-----------------------------------------------------------------------------
+
OSQLParseNode* OSQLParser::parseTree(OUString& rErrorMessage,
const OUString& rStatement,
sal_Bool bInternational)
@@ -4604,7 +4604,7 @@ OSQLParseNode* OSQLParser::parseTree(OUString& rErrorMessage,
return m_pParseTree;
}
}
-//-----------------------------------------------------------------------------
+
OString OSQLParser::TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext)
{
OString aStr;
@@ -4649,7 +4649,7 @@ OUString OSQLParser::RuleIDToStr(sal_uInt32 nRuleID)
}
#endif
-//-----------------------------------------------------------------------------
+
sal_uInt32 OSQLParser::StrToRuleID(const OString & rValue)
{
// Search for the given name in yytname and return the index
@@ -4665,7 +4665,7 @@ sal_uInt32 OSQLParser::StrToRuleID(const OString & rValue)
return OSQLParseNode::UNKNOWN_RULE;
}
-//-----------------------------------------------------------------------------
+
OSQLParseNode::Rule OSQLParser::RuleIDToRule( sal_uInt32 _nRule )
{
OSQLParser::RuleIDMap::const_iterator i (s_aReverseRuleIDLookup.find(_nRule));
@@ -4682,12 +4682,12 @@ OSQLParseNode::Rule OSQLParser::RuleIDToRule( sal_uInt32 _nRule )
return i->second;
}
-//-----------------------------------------------------------------------------
+
sal_uInt32 OSQLParser::RuleID(OSQLParseNode::Rule eRule)
{
return s_nRuleIDs[(sal_uInt16)eRule];
}
-// -------------------------------------------------------------------------
+
sal_Int16 OSQLParser::buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,OSQLParseNode* pLiteral,OSQLParseNode* pLiteral2)
{
OSQLParseNode* pColumnRef = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref));
@@ -4709,7 +4709,7 @@ sal_Int16 OSQLParser::buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,
pAppend->append(pComp);
return 1;
}
-//-----------------------------------------------------------------------------
+
sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral)
{
if(!pLiteral)
@@ -4742,7 +4742,7 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral)
}
return 1;
}
-//-----------------------------------------------------------------------------
+
sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral)
{
OSQLParseNode* pComp = new OSQLInternalNode("=", SQL_NODE_EQUAL);
@@ -4750,7 +4750,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
}
-//-----------------------------------------------------------------------------
+
void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank)
{
OSL_ENSURE(pLiteral->isRule(), "This is no ::com::sun::star::chaos::Rule");
@@ -4768,7 +4768,7 @@ void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank)
delete pTemp;
}
-// -------------------------------------------------------------------------
+
void OSQLParser::error(const sal_Char *fmt)
{
if(m_sErrorMessage.isEmpty())
@@ -4803,7 +4803,7 @@ void OSQLParser::error(const sal_Char *fmt)
}
}
}
-// -------------------------------------------------------------------------
+
int OSQLParser::SQLlex()
{
return s_pScanner->SQLlex();
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 506f51eac32b..d024784b0f80 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -254,7 +254,7 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree)
namespace
{
- //.........................................................................
+
static void impl_getRowString( const Reference< XRow >& _rxRow, const sal_Int32 _nColumnIndex, OUString& _out_rString )
{
_out_rString = _rxRow->getString( _nColumnIndex );
@@ -262,7 +262,7 @@ namespace
_out_rString = "";
}
- //.........................................................................
+
static OUString lcl_findTableInMetaData(
const Reference< XDatabaseMetaData >& _rxDBMeta, const OUString& _rCatalog,
const OUString& _rSchema, const OUString& _rTableName )
@@ -1263,9 +1263,9 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele
OSQLParseNode * pComparisonPredicate = pWhereClause->getChild(1);
OSL_ENSURE(pComparisonPredicate != NULL,"OSQLParseTreeIterator: error in parse tree!");
- //
+
// Process the comparison criteria now
- //
+
traverseSearchCondition(pComparisonPredicate);
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 1456a8588b31..cc69e95f87a4 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -192,9 +192,9 @@ namespace
namespace connectivity
{
-//=============================================================================
+
//= SQLParseNodeParameter
-//=============================================================================
+
SQLParseNodeParameter::SQLParseNodeParameter( const Reference< XConnection >& _rxConnection,
const Reference< XNumberFormatter >& _xFormatter, const Reference< XPropertySet >& _xField,
@@ -222,9 +222,9 @@ SQLParseNodeParameter::~SQLParseNodeParameter()
{
}
-//=============================================================================
+
//= OSQLParseNode
-//=============================================================================
+
OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const
{
@@ -1325,7 +1325,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
}
}
-//=============================================================================
+
OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext)
:m_pContext(_pContext)
diff --git a/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src
index 4fa7d219399d..be2bae608a6f 100644
--- a/connectivity/source/resource/conn_log_res.src
+++ b/connectivity/source/resource/conn_log_res.src
@@ -19,9 +19,9 @@
#include "resource/jdbc_log.hrc"
-// ============================================================================
+
// = log messages for the JDBC driver
-// ============================================================================
+
String STR_LOG_DRIVER_CONNECTING_URL
{
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 693025e82ed5..1ed4ed3dc010 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -27,9 +27,9 @@
#include "resource/kab_res.hrc"
#include "resource/hsqldb_res.hrc"
-// ============================================================================
+
// = the mozab driver's resource strings
-// ============================================================================
+
String STR_MOZILLA_ADDRESSBOOKS
{
@@ -195,9 +195,9 @@ String STR_COULD_NOT_CONNECT_LDAP
Text [ en-US ] = "The connection to the LDAP server could not be established.";
};
-// ============================================================================
+
// = common strings
-// ============================================================================
+
String STR_NO_CONNECTION_GIVEN
{
Text [ en-US ] = "It doesn't exist a connection to the database.";
@@ -321,9 +321,9 @@ String STR_LOAD_FILE_ERROR_MESSAGE
Text [ en-US ] = "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$";
};
-// ============================================================================
+
// = the ado driver's resource strings
-// ============================================================================
+
String STR_TYPE_NOT_CONVERT
{
Text [ en-US ] = "The type could not be converted.";
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 7cd77737f165..ea28d4801668 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -27,18 +27,18 @@
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::uno::Exception;
- //====================================================================
+
//= SharedResources_Impl
- //====================================================================
+
class SharedResources_Impl
{
private:
@@ -127,9 +127,9 @@ namespace connectivity
return *s_pInstance;
}
- //====================================================================
+
//= helpers
- //====================================================================
+
namespace
{
size_t lcl_substitute( OUString& _inout_rString,
@@ -149,9 +149,9 @@ namespace connectivity
}
}
- //====================================================================
+
//= SharedResources
- //====================================================================
+
SharedResources::SharedResources()
{
@@ -215,8 +215,8 @@ namespace connectivity
return sString;
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index cd4c30239102..751b6965244d 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -32,9 +32,9 @@ namespace connectivity
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
- // =========================================================================
+
// = ODescriptor
- // =========================================================================
+
ODescriptor::ODescriptor(::cppu::OBroadcastHelper& _rBHelper,sal_Bool _bCase, sal_Bool _bNew)
:ODescriptor_PBASE(_rBHelper)
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 58365a98db8a..ea00094a79e8 100644
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
@@ -19,16 +19,16 @@
#include "charset_s.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using namespace ::dbtools;
- //====================================================================
+
//= ODataAccessCharSet
- //====================================================================
+
oslInterlockedCount SAL_CALL ODataAccessCharSet::acquire()
{
@@ -57,8 +57,8 @@ namespace connectivity
return _rEncs.size();
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx
index ee1c342a1f2d..246b0b6a8dd3 100644
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/source/simpledbt/charset_s.hxx
@@ -24,14 +24,14 @@
#include "refbase.hxx"
#include <connectivity/dbcharset.hxx>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //====================================================================
+
+
//= ODataAccessCharSet
- //====================================================================
+
class ODataAccessCharSet
:public simple::IDataAccessCharSet
,public ORefBase
@@ -52,9 +52,9 @@ namespace connectivity
virtual oslInterlockedCount SAL_CALL release();
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_DBTOOLS_CHARSET_S_HXX
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index 12dcb8bfdfdf..2f8d2fc26917 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -28,7 +28,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-//================================================================
+
// the entry point for load-on-call usage of the DBTOOLS lib
extern "C" void* SAL_CALL createDataAccessToolsFactory()
{
@@ -37,14 +37,14 @@ extern "C" void* SAL_CALL createDataAccessToolsFactory()
return pFactory;
}
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= ODataAccessToolsFactory
- //================================================================
+
ODataAccessToolsFactory::ODataAccessToolsFactory()
{
@@ -100,9 +100,9 @@ namespace connectivity
return new OSimpleSQLParser(rxContext, _pContext);
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index 6dee4c83f385..5e5896268d33 100644
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
@@ -23,14 +23,14 @@
#include <connectivity/virtualdbtools.hxx>
#include "refbase.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= ODataAccessToolsFactory
- //================================================================
+
class ODataAccessToolsFactory
:public simple::IDataAccessToolsFactory
,public ORefBase
@@ -65,9 +65,9 @@ namespace connectivity
virtual oslInterlockedCount SAL_CALL release();
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_DBTOOLS_DBTFACTORY_HXX
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index 8539f0524f59..b32d8a73c55a 100644
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
@@ -27,14 +27,14 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= OSimpleParseNode
- //================================================================
+
OSimpleParseNode::OSimpleParseNode(const OSQLParseNode* _pNode, sal_Bool _bTakeOwnership)
:m_pFullNode(_pNode)
@@ -78,9 +78,9 @@ namespace connectivity
_rIntl, _cDecSeparator, _pContext );
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index 0166933d731d..b6c82ad749a6 100644
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
@@ -23,15 +23,15 @@
#include <connectivity/virtualdbtools.hxx>
#include "refbase.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
class OSQLParseNode;
- //================================================================
+
//= OSimpleParseNode
- //================================================================
+
class OSimpleParseNode
:public simple::ISQLParseNode
,public ORefBase
@@ -65,9 +65,9 @@ namespace connectivity
virtual oslInterlockedCount SAL_CALL release();
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_PARSENODE_SIMPLE_HXX
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index fcd25251fbb3..629bf65d78b7 100644
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
@@ -26,14 +26,14 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= OSimpleSQLParser
- //================================================================
+
OSimpleSQLParser::OSimpleSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext)
:m_aFullParser(rxContext, _pContext)
@@ -69,9 +69,9 @@ namespace connectivity
return pReturn;
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index c500a6e96ad9..682f92b0e7a2 100644
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
@@ -24,14 +24,14 @@
#include "refbase.hxx"
#include <connectivity/sqlparse.hxx>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= OSimpleSQLParser
- //================================================================
+
class OSimpleSQLParser
:public simple::ISQLParser
,public ORefBase
@@ -57,9 +57,9 @@ namespace connectivity
virtual oslInterlockedCount SAL_CALL release();
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_DBTOOLS_PARSER_SIMPLE_HXX
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index 5ece9c208508..6c86bc329f05 100644
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
@@ -19,14 +19,14 @@
#include "refbase.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= ORefBase
- //================================================================
+
ORefBase::~ORefBase()
{
@@ -48,8 +48,8 @@ namespace connectivity
return nNewRefCount;
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx
index 68dad938c9d2..f7e08739b153 100644
--- a/connectivity/source/simpledbt/refbase.hxx
+++ b/connectivity/source/simpledbt/refbase.hxx
@@ -22,14 +22,14 @@
#include <rtl/ref.hxx>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= ORefBase
- //================================================================
+
/// base class for all objects implementing the ::rtl::IReference interface
class ORefBase : public ::rtl::IReference
{
@@ -44,9 +44,9 @@ namespace connectivity
virtual oslInterlockedCount SAL_CALL release();
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_DBTOOLS_REFBASE_HXX
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 2a06624f6033..8c57778cdba0 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -23,10 +23,10 @@
#include <connectivity/dbtools.hxx>
#include <com/sun/star/sdb/SQLContext.hpp>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::uno;
@@ -36,9 +36,9 @@ namespace connectivity
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
- //================================================================
+
//= ODataAccessStaticTools
- //================================================================
+
ODataAccessStaticTools::ODataAccessStaticTools()
{
@@ -196,8 +196,8 @@ namespace connectivity
return ::dbtools::isEmbeddedInDatabase( _rxComponent, _rxActualConnection );
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index 80d0493c2fb4..771293df3115 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -23,14 +23,14 @@
#include <connectivity/virtualdbtools.hxx>
#include "refbase.hxx"
-//........................................................................
+
namespace connectivity
{
-//........................................................................
- //================================================================
+
+
//= ODataAccessStaticTools
- //================================================================
+
class ODataAccessStaticTools
:public simple::IDataAccessTypeConversion
,public simple::IDataAccessTools
@@ -40,15 +40,15 @@ namespace connectivity
ODataAccessStaticTools();
// IDataAccessTypeConversion
- // ------------------------------------------------
+
virtual ::com::sun::star::util::Date getStandardDate() const;
- // ------------------------------------------------
+
virtual double getValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
const ::com::sun::star::util::Date& rNullDate ) const;
- // ------------------------------------------------
+
virtual OUString getFormattedValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
@@ -56,7 +56,7 @@ namespace connectivity
sal_Int32 _nKey,
sal_Int16 _nKeyType) const;
- // ------------------------------------------------
+
virtual OUString getFormattedValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
@@ -65,7 +65,7 @@ namespace connectivity
) const;
// IDataAccessTools
- // ------------------------------------------------
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
const OUString& _rDataSourceName,
const OUString& _rUser,
@@ -73,7 +73,7 @@ namespace connectivity
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) );
- // ------------------------------------------------
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext,
@@ -82,38 +82,38 @@ namespace connectivity
, ::com::sun::star::lang::WrappedTargetException
, ::com::sun::star::uno::RuntimeException ) );
- // ------------------------------------------------
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet)
const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
- // ------------------------------------------------
+
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
sal_Bool _bAllowDefault
) const;
- // ------------------------------------------------
+
virtual sal_Int32 getDefaultNumberFormat(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _rxTypes,
const ::com::sun::star::lang::Locale& _rLocale
) const;
- // ------------------------------------------------
+
virtual void TransferFormComponentProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew,
const ::com::sun::star::lang::Locale& _rLocale
) const;
- // ------------------------------------------------
+
virtual OUString quoteName(
const OUString& _rQuote,
const OUString& _rName
) const;
- // ------------------------------------------------
+
virtual OUString composeTableNameForSelect(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
const OUString& _rCatalog,
@@ -121,13 +121,13 @@ namespace connectivity
const OUString& _rName
) const;
- // ------------------------------------------------
+
virtual OUString composeTableNameForSelect(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable
) const;
- // ------------------------------------------------
+
virtual ::com::sun::star::sdb::SQLContext prependContextInfo(
::com::sun::star::sdbc::SQLException& _rException,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
@@ -135,31 +135,31 @@ namespace connectivity
const OUString& _rContextDetails
) const;
- // ------------------------------------------------
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
const OUString& _rsRegisteredName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
) const;
- // ------------------------------------------------
+
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
@param _rxCursorSet the property set
*/
virtual sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
- // ------------------------------------------------
+
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
@param _rxCursorSet the property set
*/
virtual sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
- // ------------------------------------------------
+
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
@param _rxCursorSet the property set
*/
virtual sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
- // ------------------------------------------------
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
getFieldsByCommandDescriptor(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
@@ -169,7 +169,7 @@ namespace connectivity
::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
) SAL_THROW( ( ) );
- // ------------------------------------------------
+
virtual ::com::sun::star::uno::Sequence< OUString >
getFieldNamesByCommandDescriptor(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
@@ -178,21 +178,21 @@ namespace connectivity
::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
) SAL_THROW( ( ) );
- // ------------------------------------------------
+
virtual bool isEmbeddedInDatabase(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection
);
// disambiguate IReference
- // ------------------------------------------------
+
virtual oslInterlockedCount SAL_CALL acquire();
virtual oslInterlockedCount SAL_CALL release();
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // CONNECTIVITY_STATIC_DBTOOLS_SIMPLE_HXX
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index cf04c3a1f267..3c9f66a45005 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -60,7 +60,7 @@ void main( int argc, char * argv[] )
Sequence<PropertyValue> aValue;
// aValue.getArray()[0] = PropertyValue( OUString("user"),0,makeAny(OUString("TEST1")),PropertyState_DIRECT_VALUE);
// aValue.getArray()[1] = PropertyValue( OUString("password"),0,makeAny(OUString("TEST1")),PropertyState_DIRECT_VALUE);
- //
+
m_xConnection = m_xDriver->connect(OUString("sdbc:dbase:g:\\"),aValue);
if(m_xConnection.is())
{
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index 8f424cb81b3e..60430537650e 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -245,7 +245,7 @@ Reference< XMultiServiceFactory > InitializeFac( void )
printf("set global factory.\n");
- //////////////////////////////////////////////////////////////////////
+
// set global factory
setProcessServiceFactory( xSMgr );