[Libreoffice-commits] .: 3 commits - codemaker/inc codemaker/source codemaker/test configmgr/qa configmgr/source connectivity/com connectivity/inc connectivity/qa connectivity/source connectivity/workben

Michael Meeks michael at kemper.freedesktop.org
Tue Jun 12 14:25:14 PDT 2012


 codemaker/inc/codemaker/codemaker.hxx                                             |   43 +++-------
 codemaker/inc/codemaker/commoncpp.hxx                                             |   43 +++-------
 codemaker/inc/codemaker/commonjava.hxx                                            |   43 +++-------
 codemaker/inc/codemaker/dependencies.hxx                                          |   37 +++-----
 codemaker/inc/codemaker/exceptiontree.hxx                                         |   37 +++-----
 codemaker/inc/codemaker/generatedtypeset.hxx                                      |   37 +++-----
 codemaker/inc/codemaker/global.hxx                                                |   37 +++-----
 codemaker/inc/codemaker/options.hxx                                               |   37 +++-----
 codemaker/inc/codemaker/typemanager.hxx                                           |   37 +++-----
 codemaker/inc/codemaker/unotype.hxx                                               |   37 +++-----
 codemaker/source/codemaker/codemaker.cxx                                          |   37 +++-----
 codemaker/source/codemaker/dependencies.cxx                                       |   37 +++-----
 codemaker/source/codemaker/exceptiontree.cxx                                      |   37 +++-----
 codemaker/source/codemaker/global.cxx                                             |   37 +++-----
 codemaker/source/codemaker/options.cxx                                            |   43 +++-------
 codemaker/source/codemaker/typemanager.cxx                                        |   37 +++-----
 codemaker/source/codemaker/unotype.cxx                                            |   37 +++-----
 codemaker/source/commoncpp/commoncpp.cxx                                          |   37 +++-----
 codemaker/source/commonjava/commonjava.cxx                                        |   37 +++-----
 codemaker/source/cppumaker/cppumaker.cxx                                          |   37 +++-----
 codemaker/source/cppumaker/cppuoptions.cxx                                        |   37 +++-----
 codemaker/source/cppumaker/cppuoptions.hxx                                        |   43 +++-------
 codemaker/source/cppumaker/cpputype.cxx                                           |   37 +++-----
 codemaker/source/cppumaker/cpputype.hxx                                           |   37 +++-----
 codemaker/source/cppumaker/dumputils.cxx                                          |   37 +++-----
 codemaker/source/cppumaker/dumputils.hxx                                          |   43 +++-------
 codemaker/source/cppumaker/includes.cxx                                           |   37 +++-----
 codemaker/source/cppumaker/includes.hxx                                           |   37 +++-----
 codemaker/source/javamaker/classfile.cxx                                          |   37 +++-----
 codemaker/source/javamaker/classfile.hxx                                          |   37 +++-----
 codemaker/source/javamaker/javamaker.cxx                                          |   37 +++-----
 codemaker/source/javamaker/javaoptions.cxx                                        |   37 +++-----
 codemaker/source/javamaker/javaoptions.hxx                                        |   43 +++-------
 codemaker/source/javamaker/javatype.cxx                                           |   37 +++-----
 codemaker/source/javamaker/javatype.hxx                                           |   43 +++-------
 codemaker/test/javamaker/Test.java                                                |   37 +++-----
 codemaker/test/javamaker/java15/Test.java                                         |   37 +++-----
 codemaker/test/javamaker/java15/makefile.mk                                       |   33 ++-----
 codemaker/test/javamaker/java15/types.idl                                         |   43 +++-------
 codemaker/test/javamaker/makefile.mk                                              |   33 ++-----
 codemaker/test/javamaker/types.idl                                                |   37 +++-----
 configmgr/qa/unit/makefile.mk                                                     |   33 ++-----
 configmgr/qa/unit/test.cxx                                                        |   43 +++-------
 configmgr/qa/unit/urebootstrap.ini                                                |   33 ++-----
 configmgr/qa/unit/version.map                                                     |   33 ++-----
 configmgr/qa/unoapi/module.sce                                                    |   33 ++-----
 configmgr/source/access.cxx                                                       |   43 +++-------
 configmgr/source/access.hxx                                                       |   43 +++-------
 configmgr/source/additions.hxx                                                    |   43 +++-------
 configmgr/source/broadcaster.cxx                                                  |   43 +++-------
 configmgr/source/broadcaster.hxx                                                  |   43 +++-------
 configmgr/source/childaccess.cxx                                                  |   43 +++-------
 configmgr/source/childaccess.hxx                                                  |   43 +++-------
 configmgr/source/components.cxx                                                   |   43 +++-------
 configmgr/source/components.hxx                                                   |   43 +++-------
 configmgr/source/configmgr.component                                              |   43 +++-------
 configmgr/source/configurationprovider.cxx                                        |   43 +++-------
 configmgr/source/configurationprovider.hxx                                        |   43 +++-------
 configmgr/source/configurationregistry.cxx                                        |   41 +++------
 configmgr/source/configurationregistry.hxx                                        |   41 +++------
 configmgr/source/data.cxx                                                         |   43 +++-------
 configmgr/source/data.hxx                                                         |   43 +++-------
 configmgr/source/defaultprovider.cxx                                              |   43 +++-------
 configmgr/source/defaultprovider.hxx                                              |   43 +++-------
 configmgr/source/groupnode.cxx                                                    |   43 +++-------
 configmgr/source/groupnode.hxx                                                    |   43 +++-------
 configmgr/source/localizedpropertynode.cxx                                        |   43 +++-------
 configmgr/source/localizedpropertynode.hxx                                        |   43 +++-------
 configmgr/source/localizedvaluenode.cxx                                           |   43 +++-------
 configmgr/source/localizedvaluenode.hxx                                           |   43 +++-------
 configmgr/source/lock.cxx                                                         |   43 +++-------
 configmgr/source/lock.hxx                                                         |   43 +++-------
 configmgr/source/modifications.cxx                                                |   43 +++-------
 configmgr/source/modifications.hxx                                                |   43 +++-------
 configmgr/source/node.cxx                                                         |   43 +++-------
 configmgr/source/node.hxx                                                         |   43 +++-------
 configmgr/source/nodemap.cxx                                                      |   43 +++-------
 configmgr/source/nodemap.hxx                                                      |   43 +++-------
 configmgr/source/parsemanager.cxx                                                 |   43 +++-------
 configmgr/source/parsemanager.hxx                                                 |   43 +++-------
 configmgr/source/parser.hxx                                                       |   43 +++-------
 configmgr/source/partial.cxx                                                      |   43 +++-------
 configmgr/source/partial.hxx                                                      |   43 +++-------
 configmgr/source/path.hxx                                                         |   43 +++-------
 configmgr/source/propertynode.cxx                                                 |   43 +++-------
 configmgr/source/propertynode.hxx                                                 |   43 +++-------
 configmgr/source/rootaccess.cxx                                                   |   43 +++-------
 configmgr/source/rootaccess.hxx                                                   |   43 +++-------
 configmgr/source/services.cxx                                                     |   43 +++-------
 configmgr/source/setnode.cxx                                                      |   43 +++-------
 configmgr/source/setnode.hxx                                                      |   43 +++-------
 configmgr/source/type.cxx                                                         |   43 +++-------
 configmgr/source/type.hxx                                                         |   43 +++-------
 configmgr/source/update.cxx                                                       |   43 +++-------
 configmgr/source/update.hxx                                                       |   43 +++-------
 configmgr/source/valueparser.cxx                                                  |   43 +++-------
 configmgr/source/valueparser.hxx                                                  |   43 +++-------
 configmgr/source/writemodfile.cxx                                                 |   43 +++-------
 configmgr/source/writemodfile.hxx                                                 |   43 +++-------
 configmgr/source/xcdparser.cxx                                                    |   43 +++-------
 configmgr/source/xcdparser.hxx                                                    |   43 +++-------
 configmgr/source/xcsparser.cxx                                                    |   43 +++-------
 configmgr/source/xcsparser.hxx                                                    |   43 +++-------
 configmgr/source/xcuparser.cxx                                                    |   43 +++-------
 configmgr/source/xcuparser.hxx                                                    |   43 +++-------
 configmgr/source/xmldata.cxx                                                      |   43 +++-------
 configmgr/source/xmldata.hxx                                                      |   43 +++-------
 connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java       |   37 +++-----
 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java          |   37 +++-----
 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java                  |   37 +++-----
 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java         |   18 ++++
 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java              |   37 +++-----
 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java                    |   37 +++-----
 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java                |   37 +++-----
 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java         |   37 +++-----
 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java        |   18 ++++
 connectivity/inc/connectivity/BlobHelper.hxx                                      |   43 +++-------
 connectivity/inc/connectivity/CommonTools.hxx                                     |   37 +++-----
 connectivity/inc/connectivity/ConnectionWrapper.hxx                               |   37 +++-----
 connectivity/inc/connectivity/DateConversion.hxx                                  |   37 +++-----
 connectivity/inc/connectivity/DriversConfig.hxx                                   |   37 +++-----
 connectivity/inc/connectivity/FValue.hxx                                          |   37 +++-----
 connectivity/inc/connectivity/IParseContext.hxx                                   |   37 +++-----
 connectivity/inc/connectivity/PColumn.hxx                                         |   37 +++-----
 connectivity/inc/connectivity/ParameterCont.hxx                                   |   43 +++-------
 connectivity/inc/connectivity/SQLStatementHelper.hxx                              |   43 +++-------
 connectivity/inc/connectivity/StdTypeDefs.hxx                                     |   43 +++-------
 connectivity/inc/connectivity/TColumnsHelper.hxx                                  |   43 +++-------
 connectivity/inc/connectivity/TIndex.hxx                                          |   43 +++-------
 connectivity/inc/connectivity/TIndexColumns.hxx                                   |   43 +++-------
 connectivity/inc/connectivity/TIndexes.hxx                                        |   43 +++-------
 connectivity/inc/connectivity/TKey.hxx                                            |   43 +++-------
 connectivity/inc/connectivity/TKeyColumns.hxx                                     |   43 +++-------
 connectivity/inc/connectivity/TKeys.hxx                                           |   43 +++-------
 connectivity/inc/connectivity/TTableHelper.hxx                                    |   37 +++-----
 connectivity/inc/connectivity/conncleanup.hxx                                     |   37 +++-----
 connectivity/inc/connectivity/dbcharset.hxx                                       |   37 +++-----
 connectivity/inc/connectivity/dbconversion.hxx                                    |   37 +++-----
 connectivity/inc/connectivity/dbexception.hxx                                     |   37 +++-----
 connectivity/inc/connectivity/dbmetadata.hxx                                      |   37 +++-----
 connectivity/inc/connectivity/dbtools.hxx                                         |   37 +++-----
 connectivity/inc/connectivity/dbtoolsdllapi.hxx                                   |   36 +++-----
 connectivity/inc/connectivity/filtermanager.hxx                                   |   37 +++-----
 connectivity/inc/connectivity/formattedcolumnvalue.hxx                            |   37 +++-----
 connectivity/inc/connectivity/parameters.hxx                                      |   37 +++-----
 connectivity/inc/connectivity/paramwrapper.hxx                                    |   37 +++-----
 connectivity/inc/connectivity/predicateinput.hxx                                  |   37 +++-----
 connectivity/inc/connectivity/sdbcx/IRefreshable.hxx                              |   43 +++-------
 connectivity/inc/connectivity/sdbcx/VCatalog.hxx                                  |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VCollection.hxx                               |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VColumn.hxx                                   |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VDescriptor.hxx                               |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VGroup.hxx                                    |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VIndex.hxx                                    |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx                              |   43 +++-------
 connectivity/inc/connectivity/sdbcx/VKey.hxx                                      |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx                                |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VTable.hxx                                    |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VTypeDef.hxx                                  |   43 +++-------
 connectivity/inc/connectivity/sdbcx/VUser.hxx                                     |   37 +++-----
 connectivity/inc/connectivity/sdbcx/VView.hxx                                     |   37 +++-----
 connectivity/inc/connectivity/sqlerror.hxx                                        |   37 +++-----
 connectivity/inc/connectivity/sqliterator.hxx                                     |   37 +++-----
 connectivity/inc/connectivity/sqlnode.hxx                                         |   37 +++-----
 connectivity/inc/connectivity/sqlparse.hxx                                        |   37 +++-----
 connectivity/inc/connectivity/standardsqlstate.hxx                                |   36 +++-----
 connectivity/inc/connectivity/statementcomposer.hxx                               |   37 +++-----
 connectivity/inc/connectivity/virtualdbtools.hxx                                  |   37 +++-----
 connectivity/inc/connectivity/warningscontainer.hxx                               |   37 +++-----
 connectivity/qa/complex/connectivity/DBaseDriverTest.java                         |   37 +++-----
 connectivity/qa/complex/connectivity/FlatFileAccess.java                          |   18 ++++
 connectivity/qa/complex/connectivity/HsqlDriverTest.java                          |   37 +++-----
 connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java                     |   37 +++-----
 connectivity/qa/complex/connectivity/SubTestCase.java                             |   18 ++++
 connectivity/qa/complex/connectivity/TestCase.java                                |   43 +++-------
 connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java                |   37 +++-----
 connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java             |   37 +++-----
 connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java                     |   37 +++-----
 connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java              |   37 +++-----
 connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java                 |   18 ++++
 connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java                    |    5 -
 connectivity/qa/connectivity/tools/AbstractDatabase.java                          |   37 +++-----
 connectivity/qa/connectivity/tools/CRMDatabase.java                               |   37 +++-----
 connectivity/qa/connectivity/tools/CsvDatabase.java                               |   18 ++++
 connectivity/qa/connectivity/tools/DataSource.java                                |   37 +++-----
 connectivity/qa/connectivity/tools/DatabaseAccess.java                            |   43 +++-------
 connectivity/qa/connectivity/tools/DbaseDatabase.java                             |   18 ++++
 connectivity/qa/connectivity/tools/FlatFileDatabase.java                          |   37 +++-----
 connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java                      |   37 +++-----
 connectivity/qa/connectivity/tools/HsqlDatabase.java                              |   37 +++-----
 connectivity/qa/connectivity/tools/HsqlTableDescriptor.java                       |   37 +++-----
 connectivity/qa/connectivity/tools/QueryDefinition.java                           |   37 +++-----
 connectivity/qa/connectivity/tools/RowSet.java                                    |   37 +++-----
 connectivity/qa/connectivity/tools/sdb/Connection.java                            |   18 ++++
 connectivity/qa/scenarios.sce                                                     |   17 +++
 connectivity/source/commontools/AutoRetrievingBase.cxx                            |   43 +++-------
 connectivity/source/commontools/BlobHelper.cxx                                    |   43 +++-------
 connectivity/source/commontools/CommonTools.cxx                                   |   37 +++-----
 connectivity/source/commontools/ConnectionWrapper.cxx                             |   37 +++-----
 connectivity/source/commontools/DateConversion.cxx                                |   37 +++-----
 connectivity/source/commontools/DriversConfig.cxx                                 |   37 +++-----
 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx                    |   37 +++-----
 connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx            |   37 +++-----
 connectivity/source/commontools/FValue.cxx                                        |   37 +++-----
 connectivity/source/commontools/ParamterSubstitution.cxx                          |   37 +++-----
 connectivity/source/commontools/RowFunctionParser.cxx                             |   37 +++-----
 connectivity/source/commontools/TColumnsHelper.cxx                                |   37 +++-----
 connectivity/source/commontools/TConnection.cxx                                   |   37 +++-----
 connectivity/source/commontools/TDatabaseMetaDataBase.cxx                         |   37 +++-----
 connectivity/source/commontools/TIndex.cxx                                        |   37 +++-----
 connectivity/source/commontools/TIndexColumns.cxx                                 |   37 +++-----
 connectivity/source/commontools/TIndexes.cxx                                      |   37 +++-----
 connectivity/source/commontools/TKey.cxx                                          |   37 +++-----
 connectivity/source/commontools/TKeyColumns.cxx                                   |   37 +++-----
 connectivity/source/commontools/TKeys.cxx                                         |   37 +++-----
 connectivity/source/commontools/TPrivilegesResultSet.cxx                          |   37 +++-----
 connectivity/source/commontools/TSkipDeletedSet.cxx                               |   37 +++-----
 connectivity/source/commontools/TSortIndex.cxx                                    |   37 +++-----
 connectivity/source/commontools/TTableHelper.cxx                                  |   37 +++-----
 connectivity/source/commontools/conncleanup.cxx                                   |   37 +++-----
 connectivity/source/commontools/dbcharset.cxx                                     |   37 +++-----
 connectivity/source/commontools/dbconversion.cxx                                  |   37 +++-----
 connectivity/source/commontools/dbexception.cxx                                   |   37 +++-----
 connectivity/source/commontools/dbmetadata.cxx                                    |   37 +++-----
 connectivity/source/commontools/dbtools.cxx                                       |   37 +++-----
 connectivity/source/commontools/dbtools2.cxx                                      |   37 +++-----
 connectivity/source/commontools/filtermanager.cxx                                 |   37 +++-----
 connectivity/source/commontools/formattedcolumnvalue.cxx                          |   37 +++-----
 connectivity/source/commontools/parameters.cxx                                    |   37 +++-----
 connectivity/source/commontools/paramwrapper.cxx                                  |   37 +++-----
 connectivity/source/commontools/predicateinput.cxx                                |   37 +++-----
 connectivity/source/commontools/propertyids.cxx                                   |   37 +++-----
 connectivity/source/commontools/sqlerror.cxx                                      |   37 +++-----
 connectivity/source/commontools/statementcomposer.cxx                             |   37 +++-----
 connectivity/source/commontools/warningscontainer.cxx                             |   37 +++-----
 connectivity/source/cpool/ZConnectionPool.cxx                                     |   37 +++-----
 connectivity/source/cpool/ZConnectionPool.hxx                                     |   37 +++-----
 connectivity/source/cpool/ZConnectionWrapper.cxx                                  |   37 +++-----
 connectivity/source/cpool/ZConnectionWrapper.hxx                                  |   37 +++-----
 connectivity/source/cpool/ZDriverWrapper.cxx                                      |   37 +++-----
 connectivity/source/cpool/ZDriverWrapper.hxx                                      |   37 +++-----
 connectivity/source/cpool/ZPoolCollection.cxx                                     |   37 +++-----
 connectivity/source/cpool/ZPoolCollection.hxx                                     |   37 +++-----
 connectivity/source/cpool/ZPooledConnection.cxx                                   |   37 +++-----
 connectivity/source/cpool/ZPooledConnection.hxx                                   |   43 +++-------
 connectivity/source/cpool/Zregistration.cxx                                       |   37 +++-----
 connectivity/source/cpool/dbpool.xml                                              |   17 +++
 connectivity/source/cpool/dbpool2.component                                       |   43 +++-------
 connectivity/source/dbtools/dbt.xml                                               |   17 +++
 connectivity/source/dbtools/dbtools.component                                     |   43 +++-------
 connectivity/source/drivers/ado/ACallableStatement.cxx                            |   37 +++-----
 connectivity/source/drivers/ado/ACatalog.cxx                                      |   37 +++-----
 connectivity/source/drivers/ado/AColumn.cxx                                       |   37 +++-----
 connectivity/source/drivers/ado/AColumns.cxx                                      |   37 +++-----
 connectivity/source/drivers/ado/AConnection.cxx                                   |   37 +++-----
 connectivity/source/drivers/ado/ADatabaseMetaData.cxx                             |   37 +++-----
 connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx                         |   37 +++-----
 connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx                    |   37 +++-----
 connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx            |   37 +++-----
 connectivity/source/drivers/ado/ADriver.cxx                                       |   37 +++-----
 connectivity/source/drivers/ado/AGroup.cxx                                        |   37 +++-----
 connectivity/source/drivers/ado/AGroups.cxx                                       |   37 +++-----
 connectivity/source/drivers/ado/AIndex.cxx                                        |   37 +++-----
 connectivity/source/drivers/ado/AIndexes.cxx                                      |   37 +++-----
 connectivity/source/drivers/ado/AKey.cxx                                          |   37 +++-----
 connectivity/source/drivers/ado/AKeys.cxx                                         |   37 +++-----
 connectivity/source/drivers/ado/APreparedStatement.cxx                            |   37 +++-----
 connectivity/source/drivers/ado/AResultSet.cxx                                    |   37 +++-----
 connectivity/source/drivers/ado/AResultSetMetaData.cxx                            |   37 +++-----
 connectivity/source/drivers/ado/AStatement.cxx                                    |   37 +++-----
 connectivity/source/drivers/ado/ATable.cxx                                        |   37 +++-----
 connectivity/source/drivers/ado/ATables.cxx                                       |   37 +++-----
 connectivity/source/drivers/ado/AUser.cxx                                         |   37 +++-----
 connectivity/source/drivers/ado/AUsers.cxx                                        |   37 +++-----
 connectivity/source/drivers/ado/AView.cxx                                         |   37 +++-----
 connectivity/source/drivers/ado/AViews.cxx                                        |   37 +++-----
 connectivity/source/drivers/ado/Aolevariant.cxx                                   |   37 +++-----
 connectivity/source/drivers/ado/Aservices.cxx                                     |   37 +++-----
 connectivity/source/drivers/ado/Awrapado.cxx                                      |   37 +++-----
 connectivity/source/drivers/ado/ado.component                                     |   43 +++-------
 connectivity/source/drivers/ado/ado.xml                                           |   17 +++
 connectivity/source/drivers/ado/ado_post_sys_include.h                            |   43 +++-------
 connectivity/source/drivers/ado/ado_pre_sys_include.h                             |   43 +++-------
 connectivity/source/drivers/ado/adoimp.cxx                                        |   37 +++-----
 connectivity/source/drivers/calc/CCatalog.cxx                                     |   37 +++-----
 connectivity/source/drivers/calc/CColumns.cxx                                     |   43 +++-------
 connectivity/source/drivers/calc/CConnection.cxx                                  |   37 +++-----
 connectivity/source/drivers/calc/CDatabaseMetaData.cxx                            |   37 +++-----
 connectivity/source/drivers/calc/CDriver.cxx                                      |   37 +++-----
 connectivity/source/drivers/calc/CPreparedStatement.cxx                           |   43 +++-------
 connectivity/source/drivers/calc/CResultSet.cxx                                   |   37 +++-----
 connectivity/source/drivers/calc/CStatement.cxx                                   |   43 +++-------
 connectivity/source/drivers/calc/CTable.cxx                                       |   37 +++-----
 connectivity/source/drivers/calc/CTables.cxx                                      |   43 +++-------
 connectivity/source/drivers/calc/CalcDriver.xml                                   |   17 +++
 connectivity/source/drivers/calc/Cservices.cxx                                    |   37 +++-----
 connectivity/source/drivers/calc/calc.component                                   |   43 +++-------
 connectivity/source/drivers/dbase/DCatalog.cxx                                    |   43 +++-------
 connectivity/source/drivers/dbase/DCode.cxx                                       |   37 +++-----
 connectivity/source/drivers/dbase/DColumns.cxx                                    |   37 +++-----
 connectivity/source/drivers/dbase/DConnection.cxx                                 |   37 +++-----
 connectivity/source/drivers/dbase/DDatabaseMetaData.cxx                           |   37 +++-----
 connectivity/source/drivers/dbase/DDriver.cxx                                     |   37 +++-----
 connectivity/source/drivers/dbase/DIndex.cxx                                      |   37 +++-----
 connectivity/source/drivers/dbase/DIndexColumns.cxx                               |   37 +++-----
 connectivity/source/drivers/dbase/DIndexIter.cxx                                  |   37 +++-----
 connectivity/source/drivers/dbase/DIndexes.cxx                                    |   37 +++-----
 connectivity/source/drivers/dbase/DPreparedStatement.cxx                          |   43 +++-------
 connectivity/source/drivers/dbase/DResultSet.cxx                                  |   37 +++-----
 connectivity/source/drivers/dbase/DStatement.cxx                                  |   43 +++-------
 connectivity/source/drivers/dbase/DTable.cxx                                      |   37 +++-----
 connectivity/source/drivers/dbase/DTables.cxx                                     |   37 +++-----
 connectivity/source/drivers/dbase/Dservices.cxx                                   |   37 +++-----
 connectivity/source/drivers/dbase/dbase.component                                 |   43 +++-------
 connectivity/source/drivers/dbase/dbase.xml                                       |   17 +++
 connectivity/source/drivers/dbase/dindexnode.cxx                                  |   37 +++-----
 connectivity/source/drivers/evoab2/NCatalog.cxx                                   |   37 +++-----
 connectivity/source/drivers/evoab2/NCatalog.hxx                                   |   43 +++-------
 connectivity/source/drivers/evoab2/NColumns.cxx                                   |   37 +++-----
 connectivity/source/drivers/evoab2/NColumns.hxx                                   |   43 +++-------
 connectivity/source/drivers/evoab2/NConnection.cxx                                |   37 +++-----
 connectivity/source/drivers/evoab2/NConnection.hxx                                |   37 +++-----
 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx                          |   37 +++-----
 connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx                          |   37 +++-----
 connectivity/source/drivers/evoab2/NDriver.cxx                                    |   37 +++-----
 connectivity/source/drivers/evoab2/NDriver.hxx                                    |   37 +++-----
 connectivity/source/drivers/evoab2/NPreparedStatement.cxx                         |   37 +++-----
 connectivity/source/drivers/evoab2/NPreparedStatement.hxx                         |   37 +++-----
 connectivity/source/drivers/evoab2/NResultSet.cxx                                 |   37 +++-----
 connectivity/source/drivers/evoab2/NResultSet.hxx                                 |   37 +++-----
 connectivity/source/drivers/evoab2/NResultSetMetaData.cxx                         |   37 +++-----
 connectivity/source/drivers/evoab2/NResultSetMetaData.hxx                         |   37 +++-----
 connectivity/source/drivers/evoab2/NServices.cxx                                  |   37 +++-----
 connectivity/source/drivers/evoab2/NStatement.cxx                                 |   37 +++-----
 connectivity/source/drivers/evoab2/NStatement.hxx                                 |   37 +++-----
 connectivity/source/drivers/evoab2/NTable.cxx                                     |   37 +++-----
 connectivity/source/drivers/evoab2/NTable.hxx                                     |   43 +++-------
 connectivity/source/drivers/evoab2/NTables.cxx                                    |   37 +++-----
 connectivity/source/drivers/evoab2/NTables.hxx                                    |   43 +++-------
 connectivity/source/drivers/evoab2/evoab.component                                |   43 +++-------
 connectivity/source/drivers/evoab2/evoab.xml                                      |   17 +++
 connectivity/source/drivers/file/FCatalog.cxx                                     |   37 +++-----
 connectivity/source/drivers/file/FColumns.cxx                                     |   37 +++-----
 connectivity/source/drivers/file/FConnection.cxx                                  |   37 +++-----
 connectivity/source/drivers/file/FDatabaseMetaData.cxx                            |   37 +++-----
 connectivity/source/drivers/file/FDateFunctions.cxx                               |   37 +++-----
 connectivity/source/drivers/file/FDriver.cxx                                      |   37 +++-----
 connectivity/source/drivers/file/FNoException.cxx                                 |   37 +++-----
 connectivity/source/drivers/file/FNumericFunctions.cxx                            |   37 +++-----
 connectivity/source/drivers/file/FPreparedStatement.cxx                           |   37 +++-----
 connectivity/source/drivers/file/FResultSet.cxx                                   |   37 +++-----
 connectivity/source/drivers/file/FResultSetMetaData.cxx                           |   37 +++-----
 connectivity/source/drivers/file/FStatement.cxx                                   |   37 +++-----
 connectivity/source/drivers/file/FStringFunctions.cxx                             |   37 +++-----
 connectivity/source/drivers/file/FTable.cxx                                       |   37 +++-----
 connectivity/source/drivers/file/FTables.cxx                                      |   37 +++-----
 connectivity/source/drivers/file/fanalyzer.cxx                                    |   37 +++-----
 connectivity/source/drivers/file/fcode.cxx                                        |   37 +++-----
 connectivity/source/drivers/file/fcomp.cxx                                        |   37 +++-----
 connectivity/source/drivers/file/file.xml                                         |   17 +++
 connectivity/source/drivers/file/quotedstring.cxx                                 |   37 +++-----
 connectivity/source/drivers/flat/ECatalog.cxx                                     |   43 +++-------
 connectivity/source/drivers/flat/EColumns.cxx                                     |   43 +++-------
 connectivity/source/drivers/flat/EConnection.cxx                                  |   37 +++-----
 connectivity/source/drivers/flat/EDatabaseMetaData.cxx                            |   37 +++-----
 connectivity/source/drivers/flat/EDriver.cxx                                      |   37 +++-----
 connectivity/source/drivers/flat/EPreparedStatement.cxx                           |   43 +++-------
 connectivity/source/drivers/flat/EResultSet.cxx                                   |   37 +++-----
 connectivity/source/drivers/flat/EStatement.cxx                                   |   43 +++-------
 connectivity/source/drivers/flat/ETables.cxx                                      |   43 +++-------
 connectivity/source/drivers/flat/Eservices.cxx                                    |   37 +++-----
 connectivity/source/drivers/flat/flat.component                                   |   43 +++-------
 connectivity/source/drivers/flat/flat.xml                                         |   17 +++
 connectivity/source/drivers/hsqldb/HCatalog.cxx                                   |   37 +++-----
 connectivity/source/drivers/hsqldb/HColumns.cxx                                   |   37 +++-----
 connectivity/source/drivers/hsqldb/HConnection.cxx                                |   37 +++-----
 connectivity/source/drivers/hsqldb/HDriver.cxx                                    |   37 +++-----
 connectivity/source/drivers/hsqldb/HStorage.hxx                                   |   37 +++-----
 connectivity/source/drivers/hsqldb/HStorageAccess.cxx                             |   37 +++-----
 connectivity/source/drivers/hsqldb/HStorageMap.cxx                                |   37 +++-----
 connectivity/source/drivers/hsqldb/HTable.cxx                                     |   37 +++-----
 connectivity/source/drivers/hsqldb/HTables.cxx                                    |   37 +++-----
 connectivity/source/drivers/hsqldb/HTerminateListener.cxx                         |   43 +++-------
 connectivity/source/drivers/hsqldb/HTerminateListener.hxx                         |   43 +++-------
 connectivity/source/drivers/hsqldb/HTools.cxx                                     |   37 +++-----
 connectivity/source/drivers/hsqldb/HUser.cxx                                      |   37 +++-----
 connectivity/source/drivers/hsqldb/HUsers.cxx                                     |   37 +++-----
 connectivity/source/drivers/hsqldb/HView.cxx                                      |   37 +++-----
 connectivity/source/drivers/hsqldb/HViews.cxx                                     |   37 +++-----
 connectivity/source/drivers/hsqldb/Hservices.cxx                                  |   37 +++-----
 connectivity/source/drivers/hsqldb/StorageFileAccess.cxx                          |   37 +++-----
 connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx                   |   37 +++-----
 connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx                  |   37 +++-----
 connectivity/source/drivers/hsqldb/accesslog.cxx                                  |   37 +++-----
 connectivity/source/drivers/hsqldb/accesslog.hxx                                  |   37 +++-----
 connectivity/source/drivers/hsqldb/hsqldb.component                               |   43 +++-------
 connectivity/source/drivers/hsqldb/hsqldb.xml                                     |   17 +++
 connectivity/source/drivers/hsqldb/hsqlui.hrc                                     |   43 +++-------
 connectivity/source/drivers/hsqldb/hsqlui.src                                     |   43 +++-------
 connectivity/source/drivers/jdbc/Array.cxx                                        |   37 +++-----
 connectivity/source/drivers/jdbc/Blob.cxx                                         |   37 +++-----
 connectivity/source/drivers/jdbc/Boolean.cxx                                      |   43 +++-------
 connectivity/source/drivers/jdbc/CallableStatement.cxx                            |   37 +++-----
 connectivity/source/drivers/jdbc/Class.cxx                                        |   37 +++-----
 connectivity/source/drivers/jdbc/Clob.cxx                                         |   37 +++-----
 connectivity/source/drivers/jdbc/ConnectionLog.cxx                                |   37 +++-----
 connectivity/source/drivers/jdbc/ContextClassLoader.cxx                           |   37 +++-----
 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx                             |   37 +++-----
 connectivity/source/drivers/jdbc/Date.cxx                                         |   43 +++-------
 connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx                           |   37 +++-----
 connectivity/source/drivers/jdbc/Exception.cxx                                    |   43 +++-------
 connectivity/source/drivers/jdbc/InputStream.cxx                                  |   37 +++-----
 connectivity/source/drivers/jdbc/JBigDecimal.cxx                                  |   37 +++-----
 connectivity/source/drivers/jdbc/JConnection.cxx                                  |   37 +++-----
 connectivity/source/drivers/jdbc/JDriver.cxx                                      |   37 +++-----
 connectivity/source/drivers/jdbc/JStatement.cxx                                   |   37 +++-----
 connectivity/source/drivers/jdbc/Object.cxx                                       |   37 +++-----
 connectivity/source/drivers/jdbc/PreparedStatement.cxx                            |   37 +++-----
 connectivity/source/drivers/jdbc/Reader.cxx                                       |   37 +++-----
 connectivity/source/drivers/jdbc/Ref.cxx                                          |   43 +++-------
 connectivity/source/drivers/jdbc/ResultSet.cxx                                    |   37 +++-----
 connectivity/source/drivers/jdbc/ResultSetMetaData.cxx                            |   37 +++-----
 connectivity/source/drivers/jdbc/SQLException.cxx                                 |   37 +++-----
 connectivity/source/drivers/jdbc/SQLWarning.cxx                                   |   43 +++-------
 connectivity/source/drivers/jdbc/String.cxx                                       |   43 +++-------
 connectivity/source/drivers/jdbc/Throwable.cxx                                    |   43 +++-------
 connectivity/source/drivers/jdbc/Timestamp.cxx                                    |   37 +++-----
 connectivity/source/drivers/jdbc/jdbc.component                                   |   43 +++-------
 connectivity/source/drivers/jdbc/jdbc.xml                                         |   17 +++
 connectivity/source/drivers/jdbc/jservices.cxx                                    |   37 +++-----
 connectivity/source/drivers/jdbc/tools.cxx                                        |   37 +++-----
 connectivity/source/drivers/kab/KCatalog.cxx                                      |   37 +++-----
 connectivity/source/drivers/kab/KCatalog.hxx                                      |   43 +++-------
 connectivity/source/drivers/kab/KColumns.cxx                                      |   37 +++-----
 connectivity/source/drivers/kab/KColumns.hxx                                      |   43 +++-------
 connectivity/source/drivers/kab/KConnection.cxx                                   |   37 +++-----
 connectivity/source/drivers/kab/KConnection.hxx                                   |   37 +++-----
 connectivity/source/drivers/kab/KDEInit.cxx                                       |   37 +++-----
 connectivity/source/drivers/kab/KDEInit.h                                         |   43 +++-------
 connectivity/source/drivers/kab/KDatabaseMetaData.cxx                             |   37 +++-----
 connectivity/source/drivers/kab/KDatabaseMetaData.hxx                             |   37 +++-----
 connectivity/source/drivers/kab/KDriver.cxx                                       |   37 +++-----
 connectivity/source/drivers/kab/KDriver.hxx                                       |   37 +++-----
 connectivity/source/drivers/kab/KPreparedStatement.cxx                            |   37 +++-----
 connectivity/source/drivers/kab/KPreparedStatement.hxx                            |   37 +++-----
 connectivity/source/drivers/kab/KResultSet.cxx                                    |   37 +++-----
 connectivity/source/drivers/kab/KResultSet.hxx                                    |   37 +++-----
 connectivity/source/drivers/kab/KResultSetMetaData.cxx                            |   37 +++-----
 connectivity/source/drivers/kab/KResultSetMetaData.hxx                            |   37 +++-----
 connectivity/source/drivers/kab/KServices.cxx                                     |   37 +++-----
 connectivity/source/drivers/kab/KStatement.cxx                                    |   37 +++-----
 connectivity/source/drivers/kab/KStatement.hxx                                    |   37 +++-----
 connectivity/source/drivers/kab/KTable.cxx                                        |   37 +++-----
 connectivity/source/drivers/kab/KTable.hxx                                        |   43 +++-------
 connectivity/source/drivers/kab/KTables.cxx                                       |   37 +++-----
 connectivity/source/drivers/kab/KTables.hxx                                       |   43 +++-------
 connectivity/source/drivers/kab/kab.xml                                           |   17 +++
 connectivity/source/drivers/kab/kab1.component                                    |   43 +++-------
 connectivity/source/drivers/kab/kcondition.cxx                                    |   37 +++-----
 connectivity/source/drivers/kab/kcondition.hxx                                    |   37 +++-----
 connectivity/source/drivers/kab/kfields.cxx                                       |   37 +++-----
 connectivity/source/drivers/kab/kfields.hxx                                       |   43 +++-------
 connectivity/source/drivers/kab/korder.cxx                                        |   37 +++-----
 connectivity/source/drivers/kab/korder.hxx                                        |   37 +++-----
 connectivity/source/drivers/macab/MacabAddressBook.cxx                            |   37 +++-----
 connectivity/source/drivers/macab/MacabAddressBook.hxx                            |   37 +++-----
 connectivity/source/drivers/macab/MacabCatalog.cxx                                |   37 +++-----
 connectivity/source/drivers/macab/MacabCatalog.hxx                                |   43 +++-------
 connectivity/source/drivers/macab/MacabColumns.cxx                                |   37 +++-----
 connectivity/source/drivers/macab/MacabColumns.hxx                                |   43 +++-------
 connectivity/source/drivers/macab/MacabConnection.cxx                             |   37 +++-----
 connectivity/source/drivers/macab/MacabConnection.hxx                             |   37 +++-----
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx                       |   37 +++-----
 connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx                       |   37 +++-----
 connectivity/source/drivers/macab/MacabDriver.cxx                                 |   37 +++-----
 connectivity/source/drivers/macab/MacabDriver.hxx                                 |   37 +++-----
 connectivity/source/drivers/macab/MacabGroup.cxx                                  |   37 +++-----
 connectivity/source/drivers/macab/MacabGroup.hxx                                  |   43 +++-------
 connectivity/source/drivers/macab/MacabHeader.cxx                                 |   37 +++-----
 connectivity/source/drivers/macab/MacabHeader.hxx                                 |   37 +++-----
 connectivity/source/drivers/macab/MacabPreparedStatement.cxx                      |   37 +++-----
 connectivity/source/drivers/macab/MacabPreparedStatement.hxx                      |   37 +++-----
 connectivity/source/drivers/macab/MacabRecord.cxx                                 |   37 +++-----
 connectivity/source/drivers/macab/MacabRecord.hxx                                 |   37 +++-----
 connectivity/source/drivers/macab/MacabRecords.cxx                                |   37 +++-----
 connectivity/source/drivers/macab/MacabRecords.hxx                                |   37 +++-----
 connectivity/source/drivers/macab/MacabResultSet.cxx                              |   37 +++-----
 connectivity/source/drivers/macab/MacabResultSet.hxx                              |   37 +++-----
 connectivity/source/drivers/macab/MacabResultSetMetaData.cxx                      |   37 +++-----
 connectivity/source/drivers/macab/MacabResultSetMetaData.hxx                      |   37 +++-----
 connectivity/source/drivers/macab/MacabServices.cxx                               |   37 +++-----
 connectivity/source/drivers/macab/MacabStatement.cxx                              |   37 +++-----
 connectivity/source/drivers/macab/MacabStatement.hxx                              |   37 +++-----
 connectivity/source/drivers/macab/MacabTable.cxx                                  |   37 +++-----
 connectivity/source/drivers/macab/MacabTable.hxx                                  |   43 +++-------
 connectivity/source/drivers/macab/MacabTables.cxx                                 |   37 +++-----
 connectivity/source/drivers/macab/MacabTables.hxx                                 |   43 +++-------
 connectivity/source/drivers/macab/macab.xml                                       |   17 +++
 connectivity/source/drivers/macab/macab1.component                                |   43 +++-------
 connectivity/source/drivers/macab/macabcondition.cxx                              |   37 +++-----
 connectivity/source/drivers/macab/macabcondition.hxx                              |   37 +++-----
 connectivity/source/drivers/macab/macaborder.cxx                                  |   37 +++-----
 connectivity/source/drivers/macab/macaborder.hxx                                  |   37 +++-----
 connectivity/source/drivers/macab/macabutilities.hxx                              |   37 +++-----
 connectivity/source/drivers/mozab/MCatalog.cxx                                    |   37 +++-----
 connectivity/source/drivers/mozab/MCatalog.hxx                                    |   43 +++-------
 connectivity/source/drivers/mozab/MColumnAlias.cxx                                |   37 +++-----
 connectivity/source/drivers/mozab/MColumnAlias.hxx                                |   37 +++-----
 connectivity/source/drivers/mozab/MColumns.cxx                                    |   37 +++-----
 connectivity/source/drivers/mozab/MColumns.hxx                                    |   43 +++-------
 connectivity/source/drivers/mozab/MConfigAccess.cxx                               |   37 +++-----
 connectivity/source/drivers/mozab/MConfigAccess.hxx                               |   43 +++-------
 connectivity/source/drivers/mozab/MConnection.cxx                                 |   37 +++-----
 connectivity/source/drivers/mozab/MConnection.hxx                                 |   37 +++-----
 connectivity/source/drivers/mozab/MDatabaseMetaData.cxx                           |   37 +++-----
 connectivity/source/drivers/mozab/MDatabaseMetaData.hxx                           |   37 +++-----
 connectivity/source/drivers/mozab/MDriver.cxx                                     |   37 +++-----
 connectivity/source/drivers/mozab/MDriver.hxx                                     |   37 +++-----
 connectivity/source/drivers/mozab/MExtConfigAccess.hxx                            |   43 +++-------
 connectivity/source/drivers/mozab/MPreparedStatement.cxx                          |   37 +++-----
 connectivity/source/drivers/mozab/MPreparedStatement.hxx                          |   37 +++-----
 connectivity/source/drivers/mozab/MResultSet.cxx                                  |   37 +++-----
 connectivity/source/drivers/mozab/MResultSet.hxx                                  |   37 +++-----
 connectivity/source/drivers/mozab/MResultSetMetaData.cxx                          |   37 +++-----
 connectivity/source/drivers/mozab/MResultSetMetaData.hxx                          |   37 +++-----
 connectivity/source/drivers/mozab/MServices.cxx                                   |   37 +++-----
 connectivity/source/drivers/mozab/MStatement.cxx                                  |   37 +++-----
 connectivity/source/drivers/mozab/MStatement.hxx                                  |   37 +++-----
 connectivity/source/drivers/mozab/MTable.cxx                                      |   37 +++-----
 connectivity/source/drivers/mozab/MTable.hxx                                      |   43 +++-------
 connectivity/source/drivers/mozab/MTables.cxx                                     |   37 +++-----
 connectivity/source/drivers/mozab/MTables.hxx                                     |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx                 |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx                 |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx                        |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx                        |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx                      |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx                      |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx                           |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx                           |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx                        |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx                        |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx      |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx      |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx                |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx                |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx                 |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx                 |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx                       |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx                       |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component                |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h                      |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h                   |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h            |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h              |   37 +++-----
 connectivity/source/drivers/mozab/bootstrap/post_include_windows.h                |   43 +++-------
 connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h                 |   43 +++-------
 connectivity/source/drivers/mozab/mozab.component                                 |   43 +++-------
 connectivity/source/drivers/mozab/mozab.xml                                       |   17 +++
 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx          |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx          |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx                   |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx                |   36 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx                |   36 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx                      |   43 +++-------
 connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx                       |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx                    |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx                    |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx             |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx             |   43 +++-------
 connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx                      |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx                      |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx                           |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx                           |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx                     |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx                     |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx                   |   37 +++-----
 connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx                   |   43 +++-------
 connectivity/source/drivers/mozab/post_include_mozilla.h                          |   43 +++-------
 connectivity/source/drivers/mozab/pre_include_mozilla.h                           |   43 +++-------
 connectivity/source/drivers/mysql/YCatalog.cxx                                    |   37 +++-----
 connectivity/source/drivers/mysql/YColumns.cxx                                    |   37 +++-----
 connectivity/source/drivers/mysql/YDriver.cxx                                     |   37 +++-----
 connectivity/source/drivers/mysql/YTable.cxx                                      |   37 +++-----
 connectivity/source/drivers/mysql/YTables.cxx                                     |   37 +++-----
 connectivity/source/drivers/mysql/YUser.cxx                                       |   37 +++-----
 connectivity/source/drivers/mysql/YUsers.cxx                                      |   37 +++-----
 connectivity/source/drivers/mysql/YViews.cxx                                      |   37 +++-----
 connectivity/source/drivers/mysql/Yservices.cxx                                   |   37 +++-----
 connectivity/source/drivers/mysql/mysql.component                                 |   43 +++-------
 connectivity/source/drivers/mysql/mysql.xml                                       |   17 +++
 connectivity/source/drivers/odbc/OFunctions.cxx                                   |   37 +++-----
 connectivity/source/drivers/odbc/ORealDriver.cxx                                  |   37 +++-----
 connectivity/source/drivers/odbc/ORealDriver.hxx                                  |   36 +++-----
 connectivity/source/drivers/odbc/odbc.component                                   |   43 +++-------
 connectivity/source/drivers/odbc/odbc.xml                                         |   17 +++
 connectivity/source/drivers/odbc/oservices.cxx                                    |   37 +++-----
 connectivity/source/drivers/odbcbase/OConnection.cxx                              |   37 +++-----
 connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx                        |   37 +++-----
 connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx               |   37 +++-----
 connectivity/source/drivers/odbcbase/ODriver.cxx                                  |   37 +++-----
 connectivity/source/drivers/odbcbase/OPreparedStatement.cxx                       |   37 +++-----
 connectivity/source/drivers/odbcbase/OResultSet.cxx                               |   37 +++-----
 connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx                       |   37 +++-----
 connectivity/source/drivers/odbcbase/OStatement.cxx                               |   37 +++-----
 connectivity/source/drivers/odbcbase/OTools.cxx                                   |   37 +++-----
 connectivity/source/inc/AutoRetrievingBase.hxx                                    |   43 +++-------
 connectivity/source/inc/FDatabaseMetaDataResultSet.hxx                            |   37 +++-----
 connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx                    |   37 +++-----
 connectivity/source/inc/OColumn.hxx                                               |   37 +++-----
 connectivity/source/inc/OTypeInfo.hxx                                             |   37 +++-----
 connectivity/source/inc/ParameterSubstitution.hxx                                 |   37 +++-----
 connectivity/source/inc/RowFunctionParser.hxx                                     |   37 +++-----
 connectivity/source/inc/TConnection.hxx                                           |   37 +++-----
 connectivity/source/inc/TDatabaseMetaDataBase.hxx                                 |   37 +++-----
 connectivity/source/inc/TKeyValue.hxx                                             |   37 +++-----
 connectivity/source/inc/TPrivilegesResultSet.hxx                                  |   43 +++-------
 connectivity/source/inc/TResultSetHelper.hxx                                      |   43 +++-------
 connectivity/source/inc/TSkipDeletedSet.hxx                                       |   37 +++-----
 connectivity/source/inc/TSortIndex.hxx                                            |   37 +++-----
 connectivity/source/inc/UStringDescription_Impl.hxx                               |   37 +++-----
 connectivity/source/inc/ado/ACallableStatement.hxx                                |   37 +++-----
 connectivity/source/inc/ado/ACatalog.hxx                                          |   43 +++-------
 connectivity/source/inc/ado/ACollection.hxx                                       |   37 +++-----
 connectivity/source/inc/ado/AColumn.hxx                                           |   43 +++-------
 connectivity/source/inc/ado/AColumns.hxx                                          |   43 +++-------
 connectivity/source/inc/ado/AConnection.hxx                                       |   37 +++-----
 connectivity/source/inc/ado/ADatabaseMetaData.hxx                                 |   37 +++-----
 connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx                        |   37 +++-----
 connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx                |   37 +++-----
 connectivity/source/inc/ado/ADriver.hxx                                           |   37 +++-----
 connectivity/source/inc/ado/AGroup.hxx                                            |   37 +++-----
 connectivity/source/inc/ado/AGroups.hxx                                           |   43 +++-------
 connectivity/source/inc/ado/AIndex.hxx                                            |   43 +++-------
 connectivity/source/inc/ado/AIndexColumn.hxx                                      |   43 +++-------
 connectivity/source/inc/ado/AIndexes.hxx                                          |   43 +++-------
 connectivity/source/inc/ado/AKey.hxx                                              |   37 +++-----
 connectivity/source/inc/ado/AKeyColumn.hxx                                        |   43 +++-------
 connectivity/source/inc/ado/AKeyColumns.hxx                                       |   43 +++-------
 connectivity/source/inc/ado/AKeys.hxx                                             |   43 +++-------
 connectivity/source/inc/ado/APreparedStatement.hxx                                |   37 +++-----
 connectivity/source/inc/ado/AResultSet.hxx                                        |   37 +++-----
 connectivity/source/inc/ado/AResultSetMetaData.hxx                                |   37 +++-----
 connectivity/source/inc/ado/AStatement.hxx                                        |   37 +++-----
 connectivity/source/inc/ado/ATable.hxx                                            |   37 +++-----
 connectivity/source/inc/ado/ATables.hxx                                           |   43 +++-------
 connectivity/source/inc/ado/AUser.hxx                                             |   37 +++-----
 connectivity/source/inc/ado/AUsers.hxx                                            |   43 +++-------
 connectivity/source/inc/ado/AView.hxx                                             |   43 +++-------
 connectivity/source/inc/ado/AViews.hxx                                            |   43 +++-------
 connectivity/source/inc/ado/Aolevariant.hxx                                       |   37 +++-----
 connectivity/source/inc/ado/Aolewrap.hxx                                          |   37 +++-----
 connectivity/source/inc/ado/Awrapado.hxx                                          |   37 +++-----
 connectivity/source/inc/ado/Awrapadox.hxx                                         |   37 +++-----
 connectivity/source/inc/ado/WrapCatalog.hxx                                       |   43 +++-------
 connectivity/source/inc/ado/WrapColumn.hxx                                        |   37 +++-----
 connectivity/source/inc/ado/WrapIndex.hxx                                         |   43 +++-------
 connectivity/source/inc/ado/WrapKey.hxx                                           |   43 +++-------
 connectivity/source/inc/ado/WrapTable.hxx                                         |   43 +++-------
 connectivity/source/inc/ado/WrapTypeDefs.hxx                                      |   43 +++-------
 connectivity/source/inc/ado/adoimp.hxx                                            |   37 +++-----
 connectivity/source/inc/calc/CCatalog.hxx                                         |   43 +++-------
 connectivity/source/inc/calc/CColumns.hxx                                         |   43 +++-------
 connectivity/source/inc/calc/CConnection.hxx                                      |   37 +++-----
 connectivity/source/inc/calc/CDatabaseMetaData.hxx                                |   43 +++-------
 connectivity/source/inc/calc/CDriver.hxx                                          |   43 +++-------
 connectivity/source/inc/calc/CPreparedStatement.hxx                               |   43 +++-------
 connectivity/source/inc/calc/CResultSet.hxx                                       |   37 +++-----
 connectivity/source/inc/calc/CStatement.hxx                                       |   43 +++-------
 connectivity/source/inc/calc/CTable.hxx                                           |   37 +++-----
 connectivity/source/inc/calc/CTables.hxx                                          |   43 +++-------
 connectivity/source/inc/dbase/DCatalog.hxx                                        |   43 +++-------
 connectivity/source/inc/dbase/DCode.hxx                                           |   43 +++-------
 connectivity/source/inc/dbase/DColumns.hxx                                        |   43 +++-------
 connectivity/source/inc/dbase/DConnection.hxx                                     |   43 +++-------
 connectivity/source/inc/dbase/DDatabaseMetaData.hxx                               |   43 +++-------
 connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx                      |   37 +++-----
 connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx              |   37 +++-----
 connectivity/source/inc/dbase/DDriver.hxx                                         |   43 +++-------
 connectivity/source/inc/dbase/DIndex.hxx                                          |   37 +++-----
 connectivity/source/inc/dbase/DIndexColumns.hxx                                   |   43 +++-------
 connectivity/source/inc/dbase/DIndexIter.hxx                                      |   37 +++-----
 connectivity/source/inc/dbase/DIndexPage.hxx                                      |   43 +++-------
 connectivity/source/inc/dbase/DIndexes.hxx                                        |   43 +++-------
 connectivity/source/inc/dbase/DPreparedStatement.hxx                              |   43 +++-------
 connectivity/source/inc/dbase/DResultSet.hxx                                      |   37 +++-----
 connectivity/source/inc/dbase/DStatement.hxx                                      |   43 +++-------
 connectivity/source/inc/dbase/DTable.hxx                                          |   37 +++-----
 connectivity/source/inc/dbase/DTables.hxx                                         |   43 +++-------
 connectivity/source/inc/dbase/dindexnode.hxx                                      |   37 +++-----
 connectivity/source/inc/diagnose_ex.h                                             |   43 +++-------
 connectivity/source/inc/file/FCatalog.hxx                                         |   37 +++-----
 connectivity/source/inc/file/FColumns.hxx                                         |   43 +++-------
 connectivity/source/inc/file/FConnection.hxx                                      |   37 +++-----
 connectivity/source/inc/file/FDatabaseMetaData.hxx                                |   37 +++-----
 connectivity/source/inc/file/FDateFunctions.hxx                                   |   37 +++-----
 connectivity/source/inc/file/FDriver.hxx                                          |   37 +++-----
 connectivity/source/inc/file/FNumericFunctions.hxx                                |   37 +++-----
 connectivity/source/inc/file/FPreparedStatement.hxx                               |   37 +++-----
 connectivity/source/inc/file/FResultSet.hxx                                       |   37 +++-----
 connectivity/source/inc/file/FResultSetMetaData.hxx                               |   37 +++-----
 connectivity/source/inc/file/FStatement.hxx                                       |   37 +++-----
 connectivity/source/inc/file/FStringFunctions.hxx                                 |   37 +++-----
 connectivity/source/inc/file/FTable.hxx                                           |   37 +++-----
 connectivity/source/inc/file/FTables.hxx                                          |   43 +++-------
 connectivity/source/inc/file/fanalyzer.hxx                                        |   37 +++-----
 connectivity/source/inc/file/fcode.hxx                                            |   37 +++-----
 connectivity/source/inc/file/fcomp.hxx                                            |   37 +++-----
 connectivity/source/inc/file/filedllapi.hxx                                       |   36 +++-----
 connectivity/source/inc/file/quotedstring.hxx                                     |   43 +++-------
 connectivity/source/inc/flat/ECatalog.hxx                                         |   43 +++-------
 connectivity/source/inc/flat/EColumns.hxx                                         |   43 +++-------
 connectivity/source/inc/flat/EConnection.hxx                                      |   37 +++-----
 connectivity/source/inc/flat/EDatabaseMetaData.hxx                                |   43 +++-------
 connectivity/source/inc/flat/EDriver.hxx                                          |   43 +++-------
 connectivity/source/inc/flat/EPreparedStatement.hxx                               |   43 +++-------
 connectivity/source/inc/flat/EResultSet.hxx                                       |   37 +++-----
 connectivity/source/inc/flat/EStatement.hxx                                       |   43 +++-------
 connectivity/source/inc/flat/ETable.hxx                                           |   37 +++-----
 connectivity/source/inc/flat/ETables.hxx                                          |   43 +++-------
 connectivity/source/inc/hsqldb/HCatalog.hxx                                       |   37 +++-----
 connectivity/source/inc/hsqldb/HColumns.hxx                                       |   43 +++-------
 connectivity/source/inc/hsqldb/HConnection.hxx                                    |   37 +++-----
 connectivity/source/inc/hsqldb/HDriver.hxx                                        |   37 +++-----
 connectivity/source/inc/hsqldb/HStorageAccess.h                                   |   18 ++++
 connectivity/source/inc/hsqldb/HStorageAccess.hxx                                 |   43 +++-------
 connectivity/source/inc/hsqldb/HStorageMap.hxx                                    |   37 +++-----
 connectivity/source/inc/hsqldb/HTable.hxx                                         |   37 +++-----
 connectivity/source/inc/hsqldb/HTables.hxx                                        |   37 +++-----
 connectivity/source/inc/hsqldb/HTools.hxx                                         |   43 +++-------
 connectivity/source/inc/hsqldb/HUser.hxx                                          |   37 +++-----
 connectivity/source/inc/hsqldb/HUsers.hxx                                         |   43 +++-------
 connectivity/source/inc/hsqldb/HView.hxx                                          |   37 +++-----
 connectivity/source/inc/hsqldb/HViews.hxx                                         |   43 +++-------
 connectivity/source/inc/hsqldb/StorageFileAccess.h                                |   18 ++++
 connectivity/source/inc/hsqldb/StorageNativeInputStream.h                         |   18 ++++
 connectivity/source/inc/internalnode.hxx                                          |   43 +++-------
 connectivity/source/inc/java/ContextClassLoader.hxx                               |   37 +++-----
 connectivity/source/inc/java/GlobalRef.hxx                                        |   37 +++-----
 connectivity/source/inc/java/LocalRef.hxx                                         |   37 +++-----
 connectivity/source/inc/java/io/InputStream.hxx                                   |   43 +++-------
 connectivity/source/inc/java/io/Reader.hxx                                        |   43 +++-------
 connectivity/source/inc/java/lang/Boolean.hxx                                     |   43 +++-------
 connectivity/source/inc/java/lang/Class.hxx                                       |   43 +++-------
 connectivity/source/inc/java/lang/Exception.hxx                                   |   43 +++-------
 connectivity/source/inc/java/lang/Object.hxx                                      |   37 +++-----
 connectivity/source/inc/java/lang/String.hxx                                      |   43 +++-------
 connectivity/source/inc/java/lang/Throwable.hxx                                   |   43 +++-------
 connectivity/source/inc/java/math/BigDecimal.hxx                                  |   43 +++-------
 connectivity/source/inc/java/sql/Array.hxx                                        |   43 +++-------
 connectivity/source/inc/java/sql/Blob.hxx                                         |   43 +++-------
 connectivity/source/inc/java/sql/CallableStatement.hxx                            |   37 +++-----
 connectivity/source/inc/java/sql/Clob.hxx                                         |   43 +++-------
 connectivity/source/inc/java/sql/Connection.hxx                                   |   37 +++-----
 connectivity/source/inc/java/sql/ConnectionLog.hxx                                |   37 +++-----
 connectivity/source/inc/java/sql/DatabaseMetaData.hxx                             |   37 +++-----
 connectivity/source/inc/java/sql/Driver.hxx                                       |   37 +++-----
 connectivity/source/inc/java/sql/DriverPropertyInfo.hxx                           |   43 +++-------
 connectivity/source/inc/java/sql/JStatement.hxx                                   |   37 +++-----
 connectivity/source/inc/java/sql/PreparedStatement.hxx                            |   37 +++-----
 connectivity/source/inc/java/sql/Ref.hxx                                          |   43 +++-------
 connectivity/source/inc/java/sql/ResultSet.hxx                                    |   37 +++-----
 connectivity/source/inc/java/sql/ResultSetMetaData.hxx                            |   37 +++-----
 connectivity/source/inc/java/sql/SQLException.hxx                                 |   43 +++-------
 connectivity/source/inc/java/sql/SQLWarning.hxx                                   |   43 +++-------
 connectivity/source/inc/java/sql/Timestamp.hxx                                    |   37 +++-----
 connectivity/source/inc/java/tools.hxx                                            |   37 +++-----
 connectivity/source/inc/java/util/Date.hxx                                        |   43 +++-------
 connectivity/source/inc/java/util/Property.hxx                                    |   43 +++-------
 connectivity/source/inc/mysql/YCatalog.hxx                                        |   37 +++-----
 connectivity/source/inc/mysql/YColumns.hxx                                        |   43 +++-------
 connectivity/source/inc/mysql/YDriver.hxx                                         |   37 +++-----
 connectivity/source/inc/mysql/YTable.hxx                                          |   37 +++-----
 connectivity/source/inc/mysql/YTables.hxx                                         |   37 +++-----
 connectivity/source/inc/mysql/YUser.hxx                                           |   37 +++-----
 connectivity/source/inc/mysql/YUsers.hxx                                          |   43 +++-------
 connectivity/source/inc/mysql/YViews.hxx                                          |   43 +++-------
 connectivity/source/inc/odbc/OBoundParam.hxx                                      |   37 +++-----
 connectivity/source/inc/odbc/OConnection.hxx                                      |   37 +++-----
 connectivity/source/inc/odbc/ODatabaseMetaData.hxx                                |   37 +++-----
 connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx                       |   37 +++-----
 connectivity/source/inc/odbc/ODriver.hxx                                          |   37 +++-----
 connectivity/source/inc/odbc/OFunctiondefs.hxx                                    |   37 +++-----
 connectivity/source/inc/odbc/OFunctions.hxx                                       |   37 +++-----
 connectivity/source/inc/odbc/OPreparedStatement.hxx                               |   37 +++-----
 connectivity/source/inc/odbc/OResultSet.hxx                                       |   37 +++-----
 connectivity/source/inc/odbc/OResultSetMetaData.hxx                               |   37 +++-----
 connectivity/source/inc/odbc/OStatement.hxx                                       |   37 +++-----
 connectivity/source/inc/odbc/OTools.hxx                                           |   37 +++-----
 connectivity/source/inc/odbc/odbcbasedllapi.hxx                                   |   36 +++-----
 connectivity/source/inc/propertyids.hxx                                           |   37 +++-----
 connectivity/source/inc/resource/ado_res.hrc                                      |   43 +++-------
 connectivity/source/inc/resource/calc_res.hrc                                     |   43 +++-------
 connectivity/source/inc/resource/common_res.hrc                                   |   37 +++-----
 connectivity/source/inc/resource/conn_shared_res.hrc                              |   43 +++-------
 connectivity/source/inc/resource/dbase_res.hrc                                    |   43 +++-------
 connectivity/source/inc/resource/evoab2_res.hrc                                   |   43 +++-------
 connectivity/source/inc/resource/file_res.hrc                                     |   43 +++-------
 connectivity/source/inc/resource/hsqldb_res.hrc                                   |   43 +++-------
 connectivity/source/inc/resource/jdbc_log.hrc                                     |   37 +++-----
 connectivity/source/inc/resource/kab_res.hrc                                      |   43 +++-------
 connectivity/source/inc/resource/macab_res.hrc                                    |   43 +++-------
 connectivity/source/inc/resource/mozab_res.hrc                                    |   37 +++-----
 connectivity/source/inc/resource/sharedresources.hxx                              |   37 +++-----
 connectivity/source/inc/sqlscan.hxx                                               |   37 +++-----
 connectivity/source/manager/mdrivermanager.cxx                                    |   37 +++-----
 connectivity/source/manager/mdrivermanager.hxx                                    |   37 +++-----
 connectivity/source/manager/mregistration.cxx                                     |   37 +++-----
 connectivity/source/manager/sdbc2.component                                       |   43 +++-------
 connectivity/source/parse/PColumn.cxx                                             |   37 +++-----
 connectivity/source/parse/internalnode.cxx                                        |   37 +++-----
 connectivity/source/parse/sqlflex.l                                               |   33 ++-----
 connectivity/source/parse/sqliterator.cxx                                         |   37 +++-----
 connectivity/source/parse/sqlnode.cxx                                             |   37 +++-----
 connectivity/source/resource/conn_error_message.src                               |   37 +++-----
 connectivity/source/resource/conn_log_res.src                                     |   37 +++-----
 connectivity/source/resource/conn_shared_res.src                                  |   37 +++-----
 connectivity/source/resource/sharedresources.cxx                                  |   37 +++-----
 connectivity/source/sdbcx/VCatalog.cxx                                            |   37 +++-----
 connectivity/source/sdbcx/VCollection.cxx                                         |   37 +++-----
 connectivity/source/sdbcx/VColumn.cxx                                             |   37 +++-----
 connectivity/source/sdbcx/VDescriptor.cxx                                         |   37 +++-----
 connectivity/source/sdbcx/VGroup.cxx                                              |   37 +++-----
 connectivity/source/sdbcx/VIndex.cxx                                              |   37 +++-----
 connectivity/source/sdbcx/VIndexColumn.cxx                                        |   37 +++-----
 connectivity/source/sdbcx/VKey.cxx                                                |   37 +++-----
 connectivity/source/sdbcx/VKeyColumn.cxx                                          |   37 +++-----
 connectivity/source/sdbcx/VTable.cxx                                              |   37 +++-----
 connectivity/source/sdbcx/VUser.cxx                                               |   37 +++-----
 connectivity/source/sdbcx/VView.cxx                                               |   37 +++-----
 connectivity/source/simpledbt/charset_s.cxx                                       |   37 +++-----
 connectivity/source/simpledbt/charset_s.hxx                                       |   43 +++-------
 connectivity/source/simpledbt/dbtfactory.cxx                                      |   37 +++-----
 connectivity/source/simpledbt/dbtfactory.hxx                                      |   37 +++-----
 connectivity/source/simpledbt/parsenode_s.cxx                                     |   37 +++-----
 connectivity/source/simpledbt/parsenode_s.hxx                                     |   37 +++-----
 connectivity/source/simpledbt/parser_s.cxx                                        |   37 +++-----
 connectivity/source/simpledbt/parser_s.hxx                                        |   37 +++-----
 connectivity/source/simpledbt/refbase.cxx                                         |   43 +++-------
 connectivity/source/simpledbt/refbase.hxx                                         |   43 +++-------
 connectivity/source/simpledbt/staticdbtools_s.cxx                                 |   37 +++-----
 connectivity/source/simpledbt/staticdbtools_s.hxx                                 |   37 +++-----
 connectivity/workben/iniParser/main.cxx                                           |   37 +++-----
 connectivity/workben/iniParser/makefile.mk                                        |   33 ++-----
 connectivity/workben/little/main.cxx                                              |   37 +++-----
 connectivity/workben/little/makefile.mk                                           |   33 ++-----
 connectivity/workben/skeleton/SResultSet.hxx                                      |   37 +++-----
 connectivity/workben/skeleton/how_to_write_a_driver.txt                           |   18 ++++
 connectivity/workben/testmoz/initUNO.cxx                                          |   43 +++-------
 connectivity/workben/testmoz/main.cxx                                             |   37 +++-----
 connectivity/workben/testmoz/makefile.mk                                          |   33 ++-----
 connectivity/workben/testmoz/mozthread.cxx                                        |   37 +++-----
 853 files changed, 12776 insertions(+), 19690 deletions(-)

New commits:
commit ddaf53acd4f4052d90d3685f3c158b773ce3433d
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jun 12 22:04:38 2012 +0100

    re-base on ALv2 code.

diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
index af8bced..f38fdfe 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 
 // NOTE:
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
index fa14c7f..7b546f4 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
  /*
  * NativeInputStreamHelper.java
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 451dc6b..42781d4 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 package com.sun.star.sdbcx.comp.hsqldb;
 
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
index cc4faaa..53fc912 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
@@ -1,4 +1,22 @@
 /*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+/*
  * NativeOutputStreamHelper.java
  *
  * Created on 1. September 2004, 10:39
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
index 276119e..dee7a35 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
@@ -1,29 +1,20 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
  *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 /*
  * StorageAccess.java
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
index 6797ab3..13afecf 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 package com.sun.star.sdbcx.comp.hsqldb;
 
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index 4e24cd4..89fd15e 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
@@ -1,29 +1,20 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
  *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 /*
  * StorageFileAccess.java
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
index 2ac4d2d..b40f5f6 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
@@ -1,29 +1,20 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
  *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 /*
  * StorageNativeInputStream.java
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
index 6b9a4db..2895938 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
@@ -1,4 +1,22 @@
 /*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+/*
  * StorageNativeOutputStream.java
  *
  * Created on 1. September 2004, 10:20
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/connectivity/inc/connectivity/BlobHelper.hxx
index a50de9d..6788a17 100644
--- a/connectivity/inc/connectivity/BlobHelper.hxx
+++ b/connectivity/inc/connectivity/BlobHelper.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef _CONNECTIVITY_BLOBHELPER_HXX_
 #define _CONNECTIVITY_BLOBHELPER_HXX_
 
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index 79f666f..13999ab 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
 #define _CONNECTIVITY_COMMONTOOLS_HXX_
 
diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx
index 1689db1..4c3966b 100644
--- a/connectivity/inc/connectivity/ConnectionWrapper.hxx
+++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_
 #define _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_
diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx
index 45afacf..7a6a9e4 100644
--- a/connectivity/inc/connectivity/DateConversion.hxx
+++ b/connectivity/inc/connectivity/DateConversion.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _CONNECTIVITY_DATECONVERSION_HXX_
 #define _CONNECTIVITY_DATECONVERSION_HXX_
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index 97db65f..4520112 100644
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
 #define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
 
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index db46884..117d06a 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _CONNECTIVITY_FILE_VALUE_HXX_
 #define _CONNECTIVITY_FILE_VALUE_HXX_
diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx
index 1724b73..794996b 100644
--- a/connectivity/inc/connectivity/IParseContext.hxx
+++ b/connectivity/inc/connectivity/IParseContext.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef CONNECTIVITY_IPARSECONTEXT_HXX
 #define CONNECTIVITY_IPARSECONTEXT_HXX
 
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 7fb664a..9ac4eb5 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef _CONNECTIVITY_PCOLUMN_HXX_
 #define _CONNECTIVITY_PCOLUMN_HXX_
 
diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx
index 64cb5fa..0c9c92e 100644
--- a/connectivity/inc/connectivity/ParameterCont.hxx
+++ b/connectivity/inc/connectivity/ParameterCont.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef CONNECTIVITY_PARAMETERCONTINUATION_HXX_INCLUDED
 #define CONNECTIVITY_PARAMETERCONTINUATION_HXX_INCLUDED
 
diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx
index daf1ddc..eca8b61 100644
--- a/connectivity/inc/connectivity/SQLStatementHelper.hxx
+++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
 #define _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx
index 50dd143..d957f22 100644
--- a/connectivity/inc/connectivity/StdTypeDefs.hxx
+++ b/connectivity/inc/connectivity/StdTypeDefs.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef CONNECTIVITY_STDTYPEDEFS_HXX
 #define CONNECTIVITY_STDTYPEDEFS_HXX
 
diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx
index 92d0cbd..3e874f9 100644
--- a/connectivity/inc/connectivity/TColumnsHelper.hxx
+++ b/connectivity/inc/connectivity/TColumnsHelper.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_COLUMNSHELPER_HXX
 #define CONNECTIVITY_COLUMNSHELPER_HXX
diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx
index 518bc69..331a942 100644
--- a/connectivity/inc/connectivity/TIndex.hxx
+++ b/connectivity/inc/connectivity/TIndex.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_INDEXHELPER_HXX_
 #define CONNECTIVITY_INDEXHELPER_HXX_
diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx
index 8526a14..2bf459d 100644
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/connectivity/TIndexColumns.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_INDEXCOLUMNSHELPER_HXX
 #define CONNECTIVITY_INDEXCOLUMNSHELPER_HXX
diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx
index 9a8296e..4566a60 100644
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/connectivity/inc/connectivity/TIndexes.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_INDEXESHELPER_HXX
 #define CONNECTIVITY_INDEXESHELPER_HXX
diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx
index 8d8fb08..5099245 100644
--- a/connectivity/inc/connectivity/TKey.hxx
+++ b/connectivity/inc/connectivity/TKey.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_TKEY_HXX
 #define CONNECTIVITY_TKEY_HXX
diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx
index a4ab8f4..d7a2f8f 100644
--- a/connectivity/inc/connectivity/TKeyColumns.hxx
+++ b/connectivity/inc/connectivity/TKeyColumns.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_TKEYCOLUMNS_HXX
 #define CONNECTIVITY_TKEYCOLUMNS_HXX
diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx
index a1e3f8b..26024e7 100644
--- a/connectivity/inc/connectivity/TKeys.hxx
+++ b/connectivity/inc/connectivity/TKeys.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_TKEYS_HXX
 #define CONNECTIVITY_TKEYS_HXX
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index 63b91a5..2155893 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_TABLEHELPER_HXX
 #define CONNECTIVITY_TABLEHELPER_HXX
diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx
index 374e70a..1eec5ac 100644
--- a/connectivity/inc/connectivity/conncleanup.hxx
+++ b/connectivity/inc/connectivity/conncleanup.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _CONNECTIVITY_CONNCLEANUP_HXX_
 #define _CONNECTIVITY_CONNCLEANUP_HXX_
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx
index cbaceb0..6ed56b6 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _DBHELPER_DBCHARSET_HXX_
 #define _DBHELPER_DBCHARSET_HXX_
diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx
index 9f726e1..0f16414 100644
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _DBHELPER_DBCONVERSION_HXX_
 #define _DBHELPER_DBCONVERSION_HXX_
diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx
index aa87f82..75d0ab8 100644
--- a/connectivity/inc/connectivity/dbexception.hxx
+++ b/connectivity/inc/connectivity/dbexception.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _DBHELPER_DBEXCEPTION_HXX_
 #define _DBHELPER_DBEXCEPTION_HXX_
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index e1a7bfc..42eb5fc 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
 #define CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index ff11b00..4c08dd1 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _CONNECTIVITY_DBTOOLS_HXX_
 #define _CONNECTIVITY_DBTOOLS_HXX_
diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
index f322ce3..51210a6 100644
--- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx
+++ b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
@@ -1,29 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/*
+ * This file is part of the LibreOffice project.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * This file incorporates work covered by the following license notice:
  *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX
 #define INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index b6e537a..65516ce 100644
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef CONNECTIVITY_FILTERMANAGER_HXX
 #define CONNECTIVITY_FILTERMANAGER_HXX
 
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index a2ae4c3..7e222fd 100644
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
 #define CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 765ef38..7c91850 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef CONNECTIVITY_PARAMETERS_HXX
 #define CONNECTIVITY_PARAMETERS_HXX
 
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index aa0a502..f60a01d 100644
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_PARAMWRAPPER_HXX
 #define CONNECTIVITY_PARAMWRAPPER_HXX
diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx
index c16a27a..6350821 100644
--- a/connectivity/inc/connectivity/predicateinput.hxx
+++ b/connectivity/inc/connectivity/predicateinput.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef CONNECTIVITY_PREDICATEINPUT_HXX
 #define CONNECTIVITY_PREDICATEINPUT_HXX
diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
index 318f006..629b2b3 100644
--- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
 #define _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
 
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index dac591e..7004554 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _CONNECTIVITY_SDBCX_CATALOG_HXX_
 #define _CONNECTIVITY_SDBCX_CATALOG_HXX_
diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index 6db38b2..77424f7 100644
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list