[Libreoffice-commits] .: 2 commits - bridges/source bridges/test comphelper/inc comphelper/JunitTest_comphelper_complex.mk comphelper/Library_comphelper.mk comphelper/Module_comphelper.mk comphelper/Package_inc.mk comphelper/qa comphelper/source comphelper/test comphelper/util cppuhelper/qa dbaccess/qa desktop/test extensions/qa filter/source forms/qa framework/qa jurt/com jurt/test jurt/workbench l10ntools/source qadevOOo/runner qadevOOo/tests reportbuilder/java reportdesign/qa sc/qa scripting/examples scripting/java sfx2/qa swext/mediawiki sw/qa tail_build/Makefile testtools/com ucb/qa unoxml/qa wizards/com xmerge/source

Michael Meeks michael at kemper.freedesktop.org
Fri Jun 29 07:52:31 PDT 2012


 bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java                                      |   37 -
 bridges/test/java_uno/equals/TestEquals.java                                                                 |   37 -
 comphelper/JunitTest_comphelper_complex.mk                                                                   |   33 -
 comphelper/Library_comphelper.mk                                                                             |   33 -
 comphelper/Module_comphelper.mk                                                                              |   35 -
 comphelper/Package_inc.mk                                                                                    |   33 -
 comphelper/inc/comphelper/ChainablePropertySet.hxx                                                           |   37 -
 comphelper/inc/comphelper/ChainablePropertySetInfo.hxx                                                       |   37 -
 comphelper/inc/comphelper/InlineContainer.hxx                                                                |   37 -
 comphelper/inc/comphelper/MasterPropertySet.hxx                                                              |   37 -
 comphelper/inc/comphelper/MasterPropertySetInfo.hxx                                                          |   43 -
 comphelper/inc/comphelper/PropertyInfoHash.hxx                                                               |   37 -
 comphelper/inc/comphelper/SettingsHelper.hxx                                                                 |   37 -
 comphelper/inc/comphelper/TypeGeneration.hxx                                                                 |   37 -
 comphelper/inc/comphelper/accessiblecomponenthelper.hxx                                                      |   37 -
 comphelper/inc/comphelper/accessiblecontexthelper.hxx                                                        |   37 -
 comphelper/inc/comphelper/accessibleeventnotifier.hxx                                                        |   37 -
 comphelper/inc/comphelper/accessibleselectionhelper.hxx                                                      |   37 -
 comphelper/inc/comphelper/accessibletexthelper.hxx                                                           |   37 -
 comphelper/inc/comphelper/accessiblewrapper.hxx                                                              |   37 -
 comphelper/inc/comphelper/accimplaccess.hxx                                                                  |   37 -
 comphelper/inc/comphelper/asyncnotification.hxx                                                              |   37 -
 comphelper/inc/comphelper/attributelist.hxx                                                                  |   37 -
 comphelper/inc/comphelper/componentbase.hxx                                                                  |   36 -
 comphelper/inc/comphelper/componentcontext.hxx                                                               |   37 -
 comphelper/inc/comphelper/componentmodule.hxx                                                                |   37 -
 comphelper/inc/comphelper/container.hxx                                                                      |   37 -
 comphelper/inc/comphelper/containermultiplexer.hxx                                                           |   37 -
 comphelper/inc/comphelper/docpasswordhelper.hxx                                                              |   37 -
 comphelper/inc/comphelper/docpasswordrequest.hxx                                                             |   37 -
 comphelper/inc/comphelper/embeddedobjectcontainer.hxx                                                        |   37 -
 comphelper/inc/comphelper/eventattachermgr.hxx                                                               |   43 -
 comphelper/inc/comphelper/implbase_var.hxx                                                                   |   37 -
 comphelper/inc/comphelper/implementationreference.hxx                                                        |   37 -
 comphelper/inc/comphelper/interaction.hxx                                                                    |   37 -
 comphelper/inc/comphelper/listenernotification.hxx                                                           |   37 -
 comphelper/inc/comphelper/locale.hxx                                                                         |   37 -
 comphelper/inc/comphelper/logging.hxx                                                                        |   37 -
 comphelper/inc/comphelper/mediadescriptor.hxx                                                                |   37 -
 comphelper/inc/comphelper/mimeconfighelper.hxx                                                               |   37 -
 comphelper/inc/comphelper/numberedcollection.hxx                                                             |   37 -
 comphelper/inc/comphelper/officeresourcebundle.hxx                                                           |   37 -
 comphelper/inc/comphelper/processfactory.hxx                                                                 |   37 -
 comphelper/inc/comphelper/propagg.hxx                                                                        |   37 -
 comphelper/inc/comphelper/property.hxx                                                                       |   37 -
 comphelper/inc/comphelper/propertycontainerhelper.hxx                                                        |   37 -
 comphelper/inc/comphelper/propertysethelper.hxx                                                              |   37 -
 comphelper/inc/comphelper/propertysetinfo.hxx                                                                |   37 -
 comphelper/inc/comphelper/propstate.hxx                                                                      |   37 -
 comphelper/inc/comphelper/sequence.hxx                                                                       |   37 -
 comphelper/inc/comphelper/sequenceashashmap.hxx                                                              |   37 -
 comphelper/inc/comphelper/sequenceasvector.hxx                                                               |   37 -
 comphelper/inc/comphelper/servicedecl.hxx                                                                    |   37 -
 comphelper/inc/comphelper/servicehelper.hxx                                                                  |   37 -
 comphelper/inc/comphelper/serviceinfohelper.hxx                                                              |   43 -
 comphelper/inc/comphelper/stl_types.hxx                                                                      |   37 -
 comphelper/inc/comphelper/storagehelper.hxx                                                                  |   37 -
 comphelper/inc/comphelper/streamsection.hxx                                                                  |   37 -
 comphelper/inc/comphelper/string.hxx                                                                         |   37 -
 comphelper/inc/comphelper/types.hxx                                                                          |   37 -
 comphelper/inc/comphelper/uno3.hxx                                                                           |   37 -
 comphelper/inc/comphelper/weakbag.hxx                                                                        |   37 -
 comphelper/qa/string/test_string.cxx                                                                         |   37 -
 comphelper/qa/version.map                                                                                    |   33 -
 comphelper/qa/weakbag/makefile.mk                                                                            |   33 -
 comphelper/qa/weakbag/test_weakbag.cxx                                                                       |   43 -
 comphelper/qa/weakbag/test_weakbag_noadditional.cxx                                                          |   43 -
 comphelper/source/compare/AnyCompareFactory.cxx                                                              |   37 -
 comphelper/source/container/IndexedPropertyValuesContainer.cxx                                               |   37 -
 comphelper/source/container/NamedPropertyValuesContainer.cxx                                                 |   37 -
 comphelper/source/container/container.cxx                                                                    |   37 -
 comphelper/source/container/containermultiplexer.cxx                                                         |   37 -
 comphelper/source/container/embeddedobjectcontainer.cxx                                                      |   37 -
 comphelper/source/container/enumerablemap.cxx                                                                |   36 -
 comphelper/source/container/enumhelper.cxx                                                                   |   37 -
 comphelper/source/eventattachermgr/eventattachermgr.cxx                                                      |   37 -
 comphelper/source/inc/comphelper_module.hxx                                                                  |   36 -
 comphelper/source/misc/accessiblecomponenthelper.cxx                                                         |   37 -
 comphelper/source/misc/accessiblecontexthelper.cxx                                                           |   37 -
 comphelper/source/misc/accessibleeventnotifier.cxx                                                           |   37 -
 comphelper/source/misc/accessibleselectionhelper.cxx                                                         |   37 -
 comphelper/source/misc/accessibletexthelper.cxx                                                              |   37 -
 comphelper/source/misc/accessiblewrapper.cxx                                                                 |   37 -
 comphelper/source/misc/accimplaccess.cxx                                                                     |   37 -
 comphelper/source/misc/anycompare.cxx                                                                        |  170 ++++++-
 comphelper/source/misc/asyncnotification.cxx                                                                 |   37 -
 comphelper/source/misc/comphelper_module.cxx                                                                 |   36 -
 comphelper/source/misc/comphelper_services.cxx                                                               |   36 -
 comphelper/source/misc/componentcontext.cxx                                                                  |   37 -
 comphelper/source/misc/componentmodule.cxx                                                                   |   37 -
 comphelper/source/misc/configurationhelper.cxx                                                               |   37 -
 comphelper/source/misc/docpasswordhelper.cxx                                                                 |   37 -
 comphelper/source/misc/docpasswordrequest.cxx                                                                |   37 -
 comphelper/source/misc/documentinfo.cxx                                                                      |   37 -
 comphelper/source/misc/documentiologring.cxx                                                                 |   37 -
 comphelper/source/misc/documentiologring.hxx                                                                 |   37 -
 comphelper/source/misc/ihwrapnofilter.cxx                                                                    |   37 -
 comphelper/source/misc/interaction.cxx                                                                       |   37 -
 comphelper/source/misc/locale.cxx                                                                            |   37 -
 comphelper/source/misc/logging.cxx                                                                           |   37 -
 comphelper/source/misc/mediadescriptor.cxx                                                                   |   37 -
 comphelper/source/misc/mimeconfighelper.cxx                                                                  |   37 -
 comphelper/source/misc/numberedcollection.cxx                                                                |   37 -
 comphelper/source/misc/numbers.cxx                                                                           |   37 -
 comphelper/source/misc/officeresourcebundle.cxx                                                              |   37 -
 comphelper/source/misc/officerestartmanager.cxx                                                              |   37 -
 comphelper/source/misc/scopeguard.cxx                                                                        |   37 -
 comphelper/source/misc/sequenceashashmap.cxx                                                                 |   37 -
 comphelper/source/misc/serviceinfohelper.cxx                                                                 |   37 -
 comphelper/source/misc/storagehelper.cxx                                                                     |   37 -
 comphelper/source/misc/string.cxx                                                                            |   37 -
 comphelper/source/misc/synchronousdispatch.cxx                                                               |   37 -
 comphelper/source/misc/types.cxx                                                                             |   37 -
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx                                            |   37 -
 comphelper/source/officeinstdir/officeinstallationdirectories.hxx                                            |   37 -
 comphelper/source/processfactory/processfactory.cxx                                                          |   37 -
 comphelper/source/property/ChainablePropertySet.cxx                                                          |   37 -
 comphelper/source/property/ChainablePropertySetInfo.cxx                                                      |   37 -
 comphelper/source/property/MasterPropertySet.cxx                                                             |   37 -
 comphelper/source/property/MasterPropertySetInfo.cxx                                                         |   37 -
 comphelper/source/property/TypeGeneration.cxx                                                                |   37 -
 comphelper/source/property/genericpropertyset.cxx                                                            |   37 -
 comphelper/source/property/opropertybag.cxx                                                                  |   37 -
 comphelper/source/property/propagg.cxx                                                                       |   37 -
 comphelper/source/property/property.cxx                                                                      |   37 -
 comphelper/source/property/propertybag.cxx                                                                   |   37 -
 comphelper/source/property/propertycontainerhelper.cxx                                                       |   37 -
 comphelper/source/property/propertysethelper.cxx                                                             |   37 -
 comphelper/source/property/propertysetinfo.cxx                                                               |   37 -
 comphelper/source/property/propertystatecontainer.cxx                                                        |   37 -
 comphelper/source/property/propstate.cxx                                                                     |   37 -
 comphelper/source/streaming/memorystream.cxx                                                                 |   37 -
 comphelper/source/streaming/oslfile2streamwrap.cxx                                                           |   37 -
 comphelper/source/streaming/seekableinput.cxx                                                                |   37 -
 comphelper/source/streaming/seqinputstreamserv.cxx                                                           |   37 -
 comphelper/source/streaming/seqoutputstreamserv.cxx                                                          |   37 -
 comphelper/source/streaming/streamsection.cxx                                                                |   37 -
 comphelper/source/xml/attributelist.cxx                                                                      |   37 -
 comphelper/source/xml/ofopxmlhelper.cxx                                                                      |   37 -
 comphelper/test/uno_iterators/uno_iterators.cxx                                                              |  221 ----------
 comphelper/util/comphelp.component                                                                           |   43 -
 cppuhelper/qa/propertysetmixin/qa_propertysetmixin.java.component                                            |   43 -
 dbaccess/qa/complex/dbaccess/DatabaseDocument.java                                                           |   37 -
 desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java          |   37 -
 extensions/qa/integration/extensions/ServicesHandler.java                                                    |   37 -
 filter/source/svg/SOTranscoder.java                                                                          |   43 -
 forms/qa/integration/forms/FormControlTest.java                                                              |   37 -
 forms/qa/integration/forms/ListSelection.java                                                                |   37 -
 framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java                                         |   37 -
 framework/qa/complex/api_internal/CheckAPI.java                                                              |   37 -
 framework/qa/complex/framework/autosave/AutoSave.java                                                        |   37 -
 framework/qa/complex/framework/recovery/RecoveryTest.java                                                    |   37 -
 framework/qa/complex/framework/recovery/RecoveryTools.java                                                   |   37 -
 framework/qa/complex/imageManager/CheckImageManager.java                                                     |   18 
 framework/qa/complex/imageManager/_XInitialization.java                                                      |   37 -
 framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java                                             |   37 -
 jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java                                                      |   37 -
 jurt/com/sun/star/comp/loader/JavaLoader.java                                                                |   37 -
 jurt/com/sun/star/comp/servicemanager/ServiceManager.java                                                    |   37 -
 jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java                                              |   37 -
 jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java                                                         |   37 -
 jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java                                            |   37 -
 jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java                                            |   37 -
 jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java                                   |   43 -
 jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java                                    |   37 -
 jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java                              |   37 -
 jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java                                  |   43 -
 jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java                           |   43 -
 jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java                                        |   37 -
 jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java                                        |   43 -
 jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java                                      |   37 -
 jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java                                                |   37 -
 jurt/test/com/sun/star/uno/AnyConverter_Test.java                                                            |   37 -
 jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java                                                   |   37 -
 jurt/test/com/sun/star/uno/WeakReference_Test.java                                                           |   37 -
 jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java                                           |   37 -
 l10ntools/source/filter/merge/FCFGMerge.java                                                                 |   37 -
 l10ntools/source/filter/merge/Merger.java                                                                    |   37 -
 l10ntools/source/filter/utils/FileHelper.java                                                                |   37 -
 l10ntools/source/filter/utils/XMLHelper.java                                                                 |   37 -
 qadevOOo/runner/convwatch/ReportDesignerTest.java                                                            |   36 -
 qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java                                             |   37 -
 qadevOOo/runner/helper/OfficeProvider.java                                                                   |   37 -
 qadevOOo/runner/helper/ProcessHandler.java                                                                   |   37 -
 qadevOOo/runner/helper/URLHelper.java                                                                        |   37 -
 qadevOOo/runner/lib/MultiMethodTest.java                                                                     |   37 -
 qadevOOo/runner/lib/MultiPropertyTest.java                                                                   |   37 -
 qadevOOo/runner/lib/StatusException.java                                                                     |   43 -
 qadevOOo/runner/util/RegistryTools.java                                                                      |   37 -
 qadevOOo/runner/util/ValueChanger.java                                                                       |   37 -
 qadevOOo/runner/util/ValueComparer.java                                                                      |   37 -
 qadevOOo/runner/util/dbg.java                                                                                |   37 -
 qadevOOo/runner/util/utils.java                                                                              |   37 -
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java                                             |   37 -
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java                                                  |   37 -
 qadevOOo/tests/java/ifc/awt/_XComboBox.java                                                                  |   37 -
 qadevOOo/tests/java/ifc/awt/_XCurrencyField.java                                                             |   37 -
 qadevOOo/tests/java/ifc/awt/_XToolkit.java                                                                   |   37 -
 qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java                                                         |   37 -
 qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java                                                        |   37 -
 qadevOOo/tests/java/ifc/beans/_XPropertySet.java                                                             |   37 -
 qadevOOo/tests/java/ifc/beans/_XPropertyState.java                                                           |   37 -
 qadevOOo/tests/java/ifc/connection/_XAcceptor.java                                                           |   37 -
 qadevOOo/tests/java/ifc/connection/_XConnector.java                                                          |   37 -
 qadevOOo/tests/java/ifc/container/_XChild.java                                                               |   37 -
 qadevOOo/tests/java/ifc/container/_XContainer.java                                                           |   37 -
 qadevOOo/tests/java/ifc/container/_XContainerQuery.java                                                      |   37 -
 qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java                                            |   37 -
 qadevOOo/tests/java/ifc/container/_XNamed.java                                                               |   37 -
 qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java                                           |   37 -
 qadevOOo/tests/java/ifc/document/_LinkTarget.java                                                            |   37 -
 qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java                                                   |   37 -
 qadevOOo/tests/java/ifc/document/_XFilter.java                                                               |   37 -
 qadevOOo/tests/java/ifc/drawing/_GenericDrawPage.java                                                        |   37 -
 qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java                                                    |   37 -
 qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java                                                        |   37 -
 qadevOOo/tests/java/ifc/drawing/_Text.java                                                                   |   43 -
 qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator.java                                                    |   37 -
 qadevOOo/tests/java/ifc/drawing/_XDrawView.java                                                              |   37 -
 qadevOOo/tests/java/ifc/form/_XGridColumnFactory.java                                                        |   37 -
 qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java                                                        |   37 -
 qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java                                      |   37 -
 qadevOOo/tests/java/ifc/frame/_XComponentLoader.java                                                         |   37 -
 qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java                                                       |   37 -
 qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java                                                          |   37 -
 qadevOOo/tests/java/ifc/frame/_XModel.java                                                                   |   37 -
 qadevOOo/tests/java/ifc/io/_XPersistObject.java                                                              |   37 -
 qadevOOo/tests/java/ifc/lang/_XInitialization.java                                                           |   37 -
 qadevOOo/tests/java/ifc/lang/_XMultiServiceFactory.java                                                      |   37 -
 qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java                                                     |   37 -
 qadevOOo/tests/java/ifc/sdbc/_XCloseable.java                                                                |   37 -
 qadevOOo/tests/java/ifc/sdbc/_XColumnLocate.java                                                             |   37 -
 qadevOOo/tests/java/ifc/sdbc/_XResultSet.java                                                                |   37 -
 qadevOOo/tests/java/ifc/sdbc/_XRowSet.java                                                                   |   37 -
 qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java                                                         |   37 -
 qadevOOo/tests/java/ifc/sdbcx/_XRowLocate.java                                                               |   37 -
 qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java                                                 |   37 -
 qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java                                                      |   37 -
 qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java                                                      |   37 -
 qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java                                                         |   37 -
 qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java                                                          |   37 -
 qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java                                                             |   37 -
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java                                                         |   37 -
 qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java                                                          |   37 -
 qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java                                                            |   37 -
 qadevOOo/tests/java/ifc/style/_CharacterProperties.java                                                      |   37 -
 qadevOOo/tests/java/ifc/style/_ParagraphProperties.java                                                      |   37 -
 qadevOOo/tests/java/ifc/style/_XStyle.java                                                                   |   37 -
 qadevOOo/tests/java/ifc/table/_XAutoFormattable.java                                                         |   37 -
 qadevOOo/tests/java/ifc/text/_BaseIndex.java                                                                 |   37 -
 qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java                                                            |   37 -
 qadevOOo/tests/java/ifc/text/_XRelativeTextContentInsert.java                                                |   37 -
 qadevOOo/tests/java/ifc/text/_XText.java                                                                     |   37 -
 qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java                                                       |   37 -
 qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java                                                          |   37 -
 qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java                                                         |   37 -
 qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java                                             |   37 -
 qadevOOo/tests/java/ifc/uno/_XComponentContext.java                                                          |   37 -
 qadevOOo/tests/java/ifc/util/_XChangesNotifier.java                                                          |   37 -
 qadevOOo/tests/java/ifc/view/_XControlAccess.java                                                            |   37 -
 qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java                                                        |   37 -
 qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java                                                       |   37 -
 qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java                                                      |   43 -
 qadevOOo/tests/java/mod/_defreg/NestedRegistry.java                                                          |   37 -
 qadevOOo/tests/java/mod/_fwl/TypeDetection.java                                                              |   37 -
 qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java                                                   |   37 -
 qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java                                                               |   37 -
 qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java                                                              |   37 -
 qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java                                                        |   37 -
 qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java                                                            |   37 -
 qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java                                                             |   37 -
 qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java                                                              |   37 -
 qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java                                                             |   37 -
 qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java                                                          |   37 -
 qadevOOo/tests/java/mod/_sc/ScCellsObj.java                                                                  |   37 -
 qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java                                                                |   37 -
 qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java                                                               |   37 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java                                                |   37 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java                                                    |   37 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java                                                   |   37 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java                                                         |   37 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java                                                          |   37 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java                                                         |   37 -
 qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java                                                          |   37 -
 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java                                 |   37 -
 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java                                      |   37 -
 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java                                |   37 -
 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java                               |   37 -
 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java                                     |   37 -
 qadevOOo/tests/java/mod/_sc/ScModelObj.java                                                                  |   37 -
 qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java                                                              |   37 -
 qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java                                                            |   37 -
 qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java                                                             |   37 -
 qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java                                              |   37 -
 qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java                                                      |   37 -
 qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java                                                             |   37 -
 qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java                                                         |   37 -
 qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java                                                         |   37 -
 qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java                                                           |   37 -
 qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java                                                   |   37 -
 qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java                                                          |   37 -
 qadevOOo/tests/java/mod/_sm/SmEditAccessible.java                                                            |   37 -
 qadevOOo/tests/java/mod/_sm/XMLImporter.java                                                                 |   37 -
 qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java                                                             |   37 -
 qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java                                                         |   37 -
 qadevOOo/tests/java/mod/_sw/CharacterStyle.java                                                              |   37 -
 qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java                                                   |   37 -
 qadevOOo/tests/java/mod/_sw/PageStyle.java                                                                   |   37 -
 qadevOOo/tests/java/mod/_sw/ParagraphStyle.java                                                              |   37 -
 qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java                                                        |   37 -
 qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java                                                  |   37 -
 qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java                                                           |   37 -
 qadevOOo/tests/java/mod/_sw/SwXParagraph.java                                                                |   37 -
 qadevOOo/tests/java/mod/_sw/SwXStyle.java                                                                    |   37 -
 qadevOOo/tests/java/mod/_sw/SwXTextColumns.java                                                              |   37 -
 qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java                                                             |   37 -
 qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java                                                           |   37 -
 qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java                                                    |   37 -
 qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java                                                |   37 -
 qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java                                                       |   37 -
 qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java                                                 |   37 -
 qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java                                                    |   37 -
 qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java                                              |   37 -
 qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java                                                 |   37 -
 reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java                                            |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java                                       |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java                             |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java                                       |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java                        |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java                                      |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java                      |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java                     |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java                       |   37 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java                  |   37 -
 reportdesign/qa/complex/reportdesign/ReportDesignerTest.java                                                 |   37 -
 sc/qa/complex/dataPilot/CheckDataPilot.java                                                                  |   37 -
 sc/qa/complex/sc/CalcRTL.java                                                                                |   37 -
 scripting/examples/java/HelloWorld/HelloWorld.java                                                           |   18 
 scripting/examples/java/Highlight/HighlightText.java                                                         |   18 
 scripting/examples/java/MemoryUsage/MemoryUsage.java                                                         |   18 
 scripting/examples/java/Newsgroup/MimeConfiguration.java                                                     |   18 
 scripting/examples/java/Newsgroup/NewsGroup.java                                                             |   18 
 scripting/examples/java/Newsgroup/OfficeAttachment.java                                                      |   18 
 scripting/examples/java/Newsgroup/PostNewsgroup.java                                                         |   18 
 scripting/examples/java/Newsgroup/Sender.java                                                                |   18 
 scripting/examples/java/Newsgroup/StatusWindow.java                                                          |   18 
 scripting/examples/java/Newsgroup/SubscribedNewsgroups.java                                                  |   18 
 scripting/examples/java/debugger/DebugRunner.java                                                            |   18 
 scripting/examples/java/debugger/OOBeanShellDebugger.java                                                    |   18 
 scripting/examples/java/debugger/OORhinoDebugger.java                                                        |   18 
 scripting/examples/java/debugger/OOScriptDebugger.java                                                       |   18 
 scripting/examples/java/selector/ScriptSelector.java                                                         |   18 
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java                                   |   37 -
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java                                |   43 -
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java                                    |   37 -
 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java                |   37 -
 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java              |   37 -
 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java                        |   37 -
 scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.java_                        |   18 
 scripting/java/org/openoffice/netbeans/modules/office/resources/templates/HelloWorld.java_                   |   18 
 sfx2/qa/complex/sfx2/DocumentInfo.java                                                                       |   37 -
 sfx2/qa/complex/sfx2/DocumentMetadataAccess.java                                                             |   37 -
 sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java                                                             |   37 -
 sw/qa/complex/writer/CheckBookmarks.java                                                                     |   37 -
 sw/qa/complex/writer/CheckCrossReferences.java                                                               |   43 -
 sw/qa/complex/writer/LoadSaveTest.java                                                                       |   37 -
 swext/mediawiki/src/com/sun/star/wiki/Helper.java                                                            |   37 -
 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java                                                    |   37 -
 tail_build/Makefile                                                                                          |   33 -
 testtools/com/sun/star/comp/bridge/TestComponent.java                                                        |   37 -
 ucb/qa/complex/tdoc/_XChild.java                                                                             |   37 -
 unoxml/qa/complex/unoxml/DOMTest.java                                                                        |   37 -
 unoxml/qa/complex/unoxml/RDFRepositoryTest.java                                                              |   37 -
 wizards/com/sun/star/wizards/agenda/AgendaTemplate.java                                                      |   37 -
 wizards/com/sun/star/wizards/common/ConfigSet.java                                                           |   37 -
 wizards/com/sun/star/wizards/common/HelpIds.java                                                             |   37 -
 wizards/com/sun/star/wizards/common/Resource.java                                                            |   37 -
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java                                                        |   37 -
 wizards/com/sun/star/wizards/document/OfficeDocument.java                                                    |   37 -
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java                                              |   37 -
 wizards/com/sun/star/wizards/letter/LocaleCodes.java                                                         |   37 -
 wizards/com/sun/star/wizards/report/ReportTextDocument.java                                                  |   37 -
 wizards/com/sun/star/wizards/ui/ControlScroller.java                                                         |   37 -
 wizards/com/sun/star/wizards/ui/SortingComponent.java                                                        |   37 -
 wizards/com/sun/star/wizards/web/WWHID.java                                                                  |   37 -
 wizards/com/sun/star/wizards/web/data/CGDocument.java                                                        |   37 -
 xmerge/source/bridge/java/XMergeBridge.java                                                                  |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java        |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java              |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java            |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java             |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java              |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java                |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java           |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java            |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java         |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java            |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java        |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java                |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java              |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java                   |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java                    |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java              |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java            |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java                |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java                |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java               |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java              |   37 -
 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java   |   37 -
 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java |   37 -
 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java                  |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java                            |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java                          |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java                         |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java                           |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java                                |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java                        |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java                              |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java                         |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java               |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java                 |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java             |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java               |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java                               |   43 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java                                   |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java                                    |   37 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java                       |   37 -
 427 files changed, 6208 insertions(+), 9642 deletions(-)

New commits:
commit 2005a34318af5e10dc9b4fae33a0562c58223bce
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Jun 29 14:02:24 2012 +0100

    re-base on ALv2 code.

diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
index 7625df0..0b19ba6 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.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.bridges.jni_uno;
 
diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java
index 9d7139b..c2dc7b0 100644
--- a/bridges/test/java_uno/equals/TestEquals.java
+++ b/bridges/test/java_uno/equals/TestEquals.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 test.java_uno.equals;
 
diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk
index 78c26a4..ba5645c 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# 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 is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# 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.
+#   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 .
 #
-# 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
 
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 2e46bfd..09a55b2 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# 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 is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# 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.
+#   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 .
 #
-# 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,comphelper))
 
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index 1ccc457..004c02b 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# 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 is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# 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.
+#   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 .
 #
-# 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Module_Module,comphelper))
 
@@ -33,9 +24,11 @@ $(eval $(call gb_Module_add_targets,comphelper,\
     Library_comphelper \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
     JunitTest_comphelper_complex \
 ))
+endif
 
 $(eval $(call gb_Module_add_check_targets,comphelper,\
     CppunitTest_comphelper_test \
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk
index 7ed759b..c9796c5 100644
--- a/comphelper/Package_inc.mk
+++ b/comphelper/Package_inc.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# 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 is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# 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.
+#   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 .
 #
-# 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Package_Package,comphelper_inc,$(SRCDIR)/comphelper/inc))
 $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/flagguard.hxx,comphelper/flagguard.hxx))
diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx
index 913afaf..b281151 100644
--- a/comphelper/inc/comphelper/ChainablePropertySet.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySet.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.
+/*
+ * 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 .
+ */
 
 #ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_
 #define _COMPHELPER_CHAINABLEPROPERTYSET_HXX_
diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
index d419a2f..51cfd9e 100644
--- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.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.
+/*
+ * 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 .
+ */
 
 #ifndef _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_
 #define _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_
diff --git a/comphelper/inc/comphelper/InlineContainer.hxx b/comphelper/inc/comphelper/InlineContainer.hxx
index c7da02f..b23574b 100644
--- a/comphelper/inc/comphelper/InlineContainer.hxx
+++ b/comphelper/inc/comphelper/InlineContainer.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 INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX
 #define INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX
 
diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx
index 6ecf438..03fdd4a 100644
--- a/comphelper/inc/comphelper/MasterPropertySet.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySet.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.
+/*
+ * 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 .
+ */
 
 #ifndef _COMPHELPER_MASTERPROPERTYSETHELPER_HXX_
 #define _COMPHELPER_MASTERPROPERTYSETHELPER_HXX_
diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
index 2ff9c44..48740da 100644
--- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySetInfo.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 _COMPHELPER_MASTERPROPERTYSETINFO_HXX_
 #define _COMPHELPER_MASTERPROPERTYSETINFO_HXX_
diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx
index 7c75b99..41671b7 100644
--- a/comphelper/inc/comphelper/PropertyInfoHash.hxx
+++ b/comphelper/inc/comphelper/PropertyInfoHash.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 _COMPHELPER_PROPERTYINFOHASH_HXX_
 #define _COMPHELPER_PROPERTYINFOHASH_HXX_
diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx
index ed95108..661a4a0 100644
--- a/comphelper/inc/comphelper/SettingsHelper.hxx
+++ b/comphelper/inc/comphelper/SettingsHelper.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 _COMPHELPER_SETTINGSHELPER_HXX_
 #define _COMPHELPER_SETTINGSHELPER_HXX_
diff --git a/comphelper/inc/comphelper/TypeGeneration.hxx b/comphelper/inc/comphelper/TypeGeneration.hxx
index 9492ac8..c946916 100644
--- a/comphelper/inc/comphelper/TypeGeneration.hxx
+++ b/comphelper/inc/comphelper/TypeGeneration.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 _COMPHELPER_TYPEGENERATION_HXX_
 #define _COMPHELPER_TYPEGENERATION_HXX_
diff --git a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx b/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
index 25e5bdd..d0eabc2 100644
--- a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecomponenthelper.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 COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
 #define COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
index 3f02666..258132a 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecontexthelper.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 COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
 #define COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessibleeventnotifier.hxx b/comphelper/inc/comphelper/accessibleeventnotifier.hxx
index 385866a..f0a745b 100644
--- a/comphelper/inc/comphelper/accessibleeventnotifier.hxx
+++ b/comphelper/inc/comphelper/accessibleeventnotifier.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 COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
 #define COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
index 31483d3..e1bb5dd 100644
--- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
+++ b/comphelper/inc/comphelper/accessibleselectionhelper.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 COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
 #define COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx
index b47bc30..502b0b1 100644
--- a/comphelper/inc/comphelper/accessibletexthelper.hxx
+++ b/comphelper/inc/comphelper/accessibletexthelper.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 COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
 #define COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index 48aeed1..dfd144b 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.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 COMPHELPER_ACCESSIBLE_WRAPPER_HXX
 #define COMPHELPER_ACCESSIBLE_WRAPPER_HXX
diff --git a/comphelper/inc/comphelper/accimplaccess.hxx b/comphelper/inc/comphelper/accimplaccess.hxx
index 6f295eb..fd3d4cd 100644
--- a/comphelper/inc/comphelper/accimplaccess.hxx
+++ b/comphelper/inc/comphelper/accimplaccess.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 COMPHELPER_ACCIMPLACCESS_HXX
 #define COMPHELPER_ACCIMPLACCESS_HXX
diff --git a/comphelper/inc/comphelper/asyncnotification.hxx b/comphelper/inc/comphelper/asyncnotification.hxx
index eca91a1..19c1910 100644
--- a/comphelper/inc/comphelper/asyncnotification.hxx
+++ b/comphelper/inc/comphelper/asyncnotification.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 COMPHELPER_ASYNCNOTIFICATION_HXX
 #define COMPHELPER_ASYNCNOTIFICATION_HXX
diff --git a/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx
index 50ad1aa..a309264 100644
--- a/comphelper/inc/comphelper/attributelist.hxx
+++ b/comphelper/inc/comphelper/attributelist.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 _COMPHELPER_ATTRIBUTE_LIST_HXX
 #define _COMPHELPER_ATTRIBUTE_LIST_HXX
diff --git a/comphelper/inc/comphelper/componentbase.hxx b/comphelper/inc/comphelper/componentbase.hxx
index 0b81031..b4035a6 100644
--- a/comphelper/inc/comphelper/componentbase.hxx
+++ b/comphelper/inc/comphelper/componentbase.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 COMPHELPER_COMPONENTBASE_HXX
 #define COMPHELPER_COMPONENTBASE_HXX
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx
index 1ea3d76..c617f8b 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/comphelper/inc/comphelper/componentcontext.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 COMPHELPER_COMPONENTCONTEXT_HXX
 #define COMPHELPER_COMPONENTCONTEXT_HXX
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index dc106ce..17b0da3 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.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 COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
 #define COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
 
diff --git a/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx
index 53b0c31..62903dd 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/comphelper/inc/comphelper/container.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 _COMPHELPER_CONTAINER_HXX_
 #define _COMPHELPER_CONTAINER_HXX_
diff --git a/comphelper/inc/comphelper/containermultiplexer.hxx b/comphelper/inc/comphelper/containermultiplexer.hxx
index 56124d2..364a784 100644
--- a/comphelper/inc/comphelper/containermultiplexer.hxx
+++ b/comphelper/inc/comphelper/containermultiplexer.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 _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
 #define _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
index 68ebcfe..f44838e 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/comphelper/inc/comphelper/docpasswordhelper.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 COMPHELPER_DOCPASSWORDHELPR_HXX
 #define COMPHELPER_DOCPASSWORDHELPR_HXX
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
index 2427b50..fd32322 100644
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/comphelper/inc/comphelper/docpasswordrequest.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 COMPHELPER_DOCPASSWORDREQUEST_HXX
 #define COMPHELPER_DOCPASSWORDREQUEST_HXX
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index d58d288..f9b7bd9 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.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 _COMPHELPER_OBJECTCONTAINER_HXX_
 #define _COMPHELPER_OBJECTCONTAINER_HXX_
 
diff --git a/comphelper/inc/comphelper/eventattachermgr.hxx b/comphelper/inc/comphelper/eventattachermgr.hxx
index 6d2d7f5..2366dc6 100644
--- a/comphelper/inc/comphelper/eventattachermgr.hxx
+++ b/comphelper/inc/comphelper/eventattachermgr.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 _COMPHELPER_EVENTATTACHERMGR_HXX_
 #define _COMPHELPER_EVENTATTACHERMGR_HXX_
diff --git a/comphelper/inc/comphelper/implbase_var.hxx b/comphelper/inc/comphelper/implbase_var.hxx
index 4ced6b8..97e330b 100644
--- a/comphelper/inc/comphelper/implbase_var.hxx
+++ b/comphelper/inc/comphelper/implbase_var.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 .
+ */
 
 /** This header generates the following template classes with a variable number
     of interfaces:
diff --git a/comphelper/inc/comphelper/implementationreference.hxx b/comphelper/inc/comphelper/implementationreference.hxx
index cd90359..7957d64 100644
--- a/comphelper/inc/comphelper/implementationreference.hxx
+++ b/comphelper/inc/comphelper/implementationreference.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 _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
 #define _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx
index e55ae40..230604e 100644
--- a/comphelper/inc/comphelper/interaction.hxx
+++ b/comphelper/inc/comphelper/interaction.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 _COMPHELPER_INTERACTION_HXX_
 #define _COMPHELPER_INTERACTION_HXX_
diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx
index f79f796..21e2ea7 100644
--- a/comphelper/inc/comphelper/listenernotification.hxx
+++ b/comphelper/inc/comphelper/listenernotification.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 COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
 #define COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx
index 85821dd..a865dcb 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.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 _COMPHELPER_LOCALE_HXX_
 #define _COMPHELPER_LOCALE_HXX_
diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx
index c9cb2d4..56bebab 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.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 COMPHELPER_LOGGING_HXX
 #define COMPHELPER_LOGGING_HXX
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 55b89a2..23eba27 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.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 _COMPHELPER_MEDIADESCRIPTOR_HXX_
 #define _COMPHELPER_MEDIADESCRIPTOR_HXX_
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 217ebb8..fbefc13 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.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 _COMPHELPER_MIMECONFIGHELPER_HXX_
 #define _COMPHELPER_MIMECONFIGHELPER_HXX_
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index 19bd542..ada17b7 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.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 _COMPHELPER_NUMBEREDCOLLECTION_HXX_
 #define _COMPHELPER_NUMBEREDCOLLECTION_HXX_
diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx
index 595596d..8bec932 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/comphelper/inc/comphelper/officeresourcebundle.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.
  *

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list