[Libreoffice-commits] .: basebmp/inc basebmp/Makefile basebmp/source basebmp/test extras/source extras/unx extras/util qadevOOo/Makefile qadevOOo/objdsc qadevOOo/qa qadevOOo/tests reportbuilder/Extension_reportbuilder.mk reportbuilder/java reportbuilder/license reportbuilder/Makefile reportbuilder/Package_readme.mk reportbuilder/prj reportbuilder/registry reportbuilder/template reportbuilder/util

Michael Meeks michael at kemper.freedesktop.org
Wed Jul 18 07:00:01 PDT 2012


 basebmp/Makefile                                                                          |    7 
 basebmp/inc/basebmp/accessortraits.hxx                                                    |   37 
 basebmp/inc/basebmp/basebmpdllapi.h                                                       |   43 
 basebmp/inc/basebmp/bitmapdevice.hxx                                                      |  226 +-
 basebmp/inc/basebmp/clippedlinerenderer.hxx                                               |   37 
 basebmp/inc/basebmp/colorblendaccessoradapter.hxx                                         |   37 
 basebmp/inc/basebmp/debug.hxx                                                             |   43 
 basebmp/inc/basebmp/metafunctions.hxx                                                     |   37 
 basebmp/inc/basebmp/polypolygonrenderer.hxx                                               |   37 
 basebmp/inc/basebmp/tools.hxx                                                             |   37 
 basebmp/source/bitmapdevice.cxx                                                           |   37 
 basebmp/source/debug.cxx                                                                  |   37 
 basebmp/source/intconversion.hxx                                                          |   37 
 basebmp/test/basebmp_cppunittester_all.cxx                                                |   43 
 basebmp/test/basictest.cxx                                                                |   37 
 basebmp/test/bmpdemo.cxx                                                                  |   37 
 basebmp/test/bmpmasktest.cxx                                                              |   37 
 basebmp/test/bmptest.cxx                                                                  |   37 
 basebmp/test/cliptest.cxx                                                                 |   37 
 basebmp/test/filltest.cxx                                                                 |   37 
 basebmp/test/linetest.cxx                                                                 |   37 
 basebmp/test/masktest.cxx                                                                 |   37 
 basebmp/test/polytest.cxx                                                                 |   37 
 extras/source/autotext/lang/makefile.mk                                                   |   33 
 extras/source/autotext/makefile.mk                                                        |   33 
 extras/source/database/makefile.mk                                                        |   33 
 extras/source/gallery/bullets/makefile.mk                                                 |   33 
 extras/source/gallery/gallery_sound/makefile.mk                                           |   33 
 extras/source/gallery/gallery_system/makefile.mk                                          |   33 
 extras/source/gallery/htmlexpo/makefile.mk                                                |   33 
 extras/source/gallery/makefile.mk                                                         |   33 
 extras/source/gallery/rulers/makefile.mk                                                  |   33 
 extras/source/gallery/sounds/makefile.mk                                                  |   33 
 extras/source/gallery/www-back/makefile.mk                                                |   33 
 extras/source/gallery/www-graf/makefile.mk                                                |   24 
 extras/source/misc_config/makefile.mk                                                     |   33 
 extras/source/misc_config/wizard/form/styles/beige.css                                    |   18 
 extras/source/misc_config/wizard/form/styles/bgr.css                                      |   18 
 extras/source/misc_config/wizard/form/styles/dark.css                                     |   18 
 extras/source/misc_config/wizard/form/styles/grey.css                                     |   18 
 extras/source/misc_config/wizard/form/styles/ibg.css                                      |   18 
 extras/source/misc_config/wizard/form/styles/ice.css                                      |   18 
 extras/source/misc_config/wizard/form/styles/orange.css                                   |   18 
 extras/source/misc_config/wizard/form/styles/red.css                                      |   18 
 extras/source/misc_config/wizard/form/styles/violet.css                                   |   18 
 extras/source/misc_config/wizard/form/styles/water.css                                    |   18 
 extras/source/misc_config/wizard/web/layouts/diagonal/index.html.xsl                      |   34 
 extras/source/misc_config/wizard/web/layouts/frame_bottom/index.html.xsl                  |   20 
 extras/source/misc_config/wizard/web/layouts/frame_bottom/tocframe.html.xsl               |   17 
 extras/source/misc_config/wizard/web/layouts/frame_left/index.html.xsl                    |   20 
 extras/source/misc_config/wizard/web/layouts/frame_left/tocframe.html.xsl                 |   17 
 extras/source/misc_config/wizard/web/layouts/frame_right/index.html.xsl                   |   20 
 extras/source/misc_config/wizard/web/layouts/frame_right/tocframe.html.xsl                |   17 
 extras/source/misc_config/wizard/web/layouts/frame_top/index.html.xsl                     |   20 
 extras/source/misc_config/wizard/web/layouts/frame_top/tocframe.html.xsl                  |   17 
 extras/source/misc_config/wizard/web/layouts/layout.xsl                                   |   41 
 extras/source/misc_config/wizard/web/layouts/layoutF.xsl                                  |   41 
 extras/source/misc_config/wizard/web/layouts/layoutX.xsl                                  |   52 
 extras/source/misc_config/wizard/web/layouts/simple/index.html.xsl                        |   17 
 extras/source/misc_config/wizard/web/layouts/source.xml.xsl                               |   63 
 extras/source/misc_config/wizard/web/layouts/table_2/index.html.xsl                       |   17 
 extras/source/misc_config/wizard/web/layouts/table_3/index.html.xsl                       |   17 
 extras/source/misc_config/wizard/web/layouts/zigzag/index.html.xsl                        |   17 
 extras/source/misc_config/wizard/web/styles/beige.css                                     |   18 
 extras/source/misc_config/wizard/web/styles/bg.css                                        |   18 
 extras/source/misc_config/wizard/web/styles/bgr.css                                       |   18 
 extras/source/misc_config/wizard/web/styles/bgrey.css                                     |   18 
 extras/source/misc_config/wizard/web/styles/bwb.css                                       |   18 
 extras/source/misc_config/wizard/web/styles/bwo.css                                       |   18 
 extras/source/misc_config/wizard/web/styles/dark.css                                      |   18 
 extras/source/misc_config/wizard/web/styles/dp.css                                        |   18 
 extras/source/misc_config/wizard/web/styles/forest.css                                    |   18 
 extras/source/misc_config/wizard/web/styles/green.css                                     |   18 
 extras/source/misc_config/wizard/web/styles/greenred.css                                  |   18 
 extras/source/misc_config/wizard/web/styles/grey.css                                      |   18 
 extras/source/misc_config/wizard/web/styles/ibg.css                                       |   18 
 extras/source/misc_config/wizard/web/styles/ice.css                                       |   18 
 extras/source/misc_config/wizard/web/styles/marine.css                                    |   18 
 extras/source/misc_config/wizard/web/styles/orange.css                                    |   18 
 extras/source/misc_config/wizard/web/styles/pc_old.css                                    |   18 
 extras/source/misc_config/wizard/web/styles/red.css                                       |   18 
 extras/source/misc_config/wizard/web/styles/rgb.css                                       |   18 
 extras/source/misc_config/wizard/web/styles/strange.css                                   |   18 
 extras/source/misc_config/wizard/web/styles/violet.css                                    |   18 
 extras/source/misc_config/wizard/web/styles/water.css                                     |   18 
 extras/source/palettes/makefile.mk                                                        |   33 
 extras/source/templates/lang/makefile.mk                                                  |   33 
 extras/source/templates/layout/makefile.mk                                                |   36 
 extras/source/templates/presnt/lang/makefile.mk                                           |   33 
 extras/source/templates/wizard/agenda/lang/makefile.mk                                    |   33 
 extras/source/templates/wizard/bitmap/makefile.mk                                         |   33 
 extras/source/templates/wizard/desktop/lang/makefile.mk                                   |   33 
 extras/source/templates/wizard/desktop/makefile.mk                                        |   33 
 extras/source/templates/wizard/fax/lang/makefile.mk                                       |   33 
 extras/source/templates/wizard/letter/lang/makefile.mk                                    |   33 
 extras/source/templates/wizard/report/lang/makefile.mk                                    |   33 
 extras/source/templates/wizard/styles/lang/makefile.mk                                    |   33 
 extras/source/templates/wizard/web/lang/makefile.mk                                       |   36 
 extras/source/wordbook/makefile.mk                                                        |   33 
 extras/unx/source/bitmaps/makefile.mk                                                     |   33 
 extras/unx/source/kde/applnk/SPAdmin.kdelnk                                               |   17 
 extras/unx/source/kde/applnk/Setup.kdelnk                                                 |   17 
 extras/unx/source/kde/applnk/StarOffice.kdelnk                                            |   17 
 extras/unx/source/kde/applnk/makefile.mk                                                  |   33 
 extras/unx/source/kde/icons/makefile.mk                                                   |   33 
 extras/unx/source/kde/icons/mini/makefile.mk                                              |   33 
 extras/unx/source/kde/mimelnk/application/makefile.mk                                     |   33 
 extras/unx/source/kde/mimelnk/application/x-scalc.kdelnk                                  |   17 
 extras/unx/source/kde/mimelnk/application/x-sda.kdelnk                                    |   17 
 extras/unx/source/kde/mimelnk/application/x-sdf.kdelnk                                    |   17 
 extras/unx/source/kde/mimelnk/application/x-sdraw.kdelnk                                  |   17 
 extras/unx/source/kde/mimelnk/application/x-sds.kdelnk                                    |   17 
 extras/unx/source/kde/mimelnk/application/x-sgl.kdelnk                                    |   17 
 extras/unx/source/kde/mimelnk/application/x-smf.kdelnk                                    |   17 
 extras/unx/source/kde/mimelnk/application/x-swriter.kdelnk                                |   17 
 extras/unx/source/kde/mimelnk/text/html.kdelnk                                            |   17 
 extras/unx/source/kde/mimelnk/text/makefile.mk                                            |   33 
 extras/util/target.pmk                                                                    |   33 
 qadevOOo/Makefile                                                                         |    7 
 qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.ConfigurationProvider.csv       |   33 
 qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.DefaultProvider.csv             |   33 
 qadevOOo/qa/unoapi/qadevOOo.sce                                                           |   17 
 qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java                                 |   38 
 qadevOOo/tests/java/mod/_acceptor/package.html                                            |   17 
 qadevOOo/tests/java/mod/_brdgfctr/package.html                                            |   17 
 qadevOOo/tests/java/mod/_bridgefac.uno/package.html                                       |   17 
 qadevOOo/tests/java/mod/_connector.uno/package.html                                       |   17 
 qadevOOo/tests/java/mod/_connectr/package.html                                            |   17 
 qadevOOo/tests/java/mod/_corefl/package.html                                              |   17 
 qadevOOo/tests/java/mod/_corereflection.uno/package.html                                  |   17 
 qadevOOo/tests/java/mod/_cpld/package.html                                                |   17 
 qadevOOo/tests/java/mod/_dbaccess/package.html                                            |   17 
 qadevOOo/tests/java/mod/_defreg/package.html                                              |   17 
 qadevOOo/tests/java/mod/_fileacc/package.html                                             |   17 
 qadevOOo/tests/java/mod/_forms/package.html                                               |   17 
 qadevOOo/tests/java/mod/_implreg.uno/package.html                                         |   17 
 qadevOOo/tests/java/mod/_impreg/package.html                                              |   17 
 qadevOOo/tests/java/mod/_insp/package.html                                                |   17 
 qadevOOo/tests/java/mod/_introspection.uno/package.html                                   |   17 
 qadevOOo/tests/java/mod/_inv/package.html                                                 |   17 
 qadevOOo/tests/java/mod/_invadp/package.html                                              |   17 
 qadevOOo/tests/java/mod/_invocadapt.uno/package.html                                      |   17 
 qadevOOo/tests/java/mod/_invocation.uno/package.html                                      |   17 
 qadevOOo/tests/java/mod/_jen/package.html                                                 |   17 
 qadevOOo/tests/java/mod/_namingservice/package.html                                       |   17 
 qadevOOo/tests/java/mod/_nestedreg.uno/package.html                                       |   17 
 qadevOOo/tests/java/mod/_proxyfac/package.html                                            |   17 
 qadevOOo/tests/java/mod/_rdbtdp/package.html                                              |   17 
 qadevOOo/tests/java/mod/_remotebridge/package.html                                        |   17 
 qadevOOo/tests/java/mod/_sc/package.html                                                  |   17 
 qadevOOo/tests/java/mod/_sd/package.html                                                  |   17 
 qadevOOo/tests/java/mod/_servicemgr.uno/package.html                                      |   17 
 qadevOOo/tests/java/mod/_shlibloader.uno/package.html                                     |   17 
 qadevOOo/tests/java/mod/_simplereg.uno/package.html                                       |   17 
 qadevOOo/tests/java/mod/_simreg/package.html                                              |   17 
 qadevOOo/tests/java/mod/_smgr/package.html                                                |   17 
 qadevOOo/tests/java/mod/_stm/package.html                                                 |   17 
 qadevOOo/tests/java/mod/_streams.uno/package.html                                         |   17 
 qadevOOo/tests/java/mod/_svx/package.html                                                 |   17 
 qadevOOo/tests/java/mod/_sw/package.html                                                  |   17 
 qadevOOo/tests/java/mod/_sysdtrans/package.html                                           |   17 
 qadevOOo/tests/java/mod/_tcv/package.html                                                 |   17 
 qadevOOo/tests/java/mod/_tdmgr/package.html                                               |   17 
 qadevOOo/tests/java/mod/_toolkit/package.html                                             |   17 
 qadevOOo/tests/java/mod/_typeconverter.uno/package.html                                   |   17 
 qadevOOo/tests/java/mod/_typemgr.uno/package.html                                         |   17 
 qadevOOo/tests/java/mod/_uuresolver.uno/package.html                                      |   17 
 qadevOOo/tests/java/mod/_uuresolver/package.html                                          |   17 
 reportbuilder/Extension_reportbuilder.mk                                                  |    1 
 reportbuilder/Makefile                                                                    |    7 
 reportbuilder/Package_readme.mk                                                           |    1 
 reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties       |   33 
 reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties |   33 
 reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties        |   33 
 reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties  |   33 
 reportbuilder/java/com/sun/star/report/function/metadata/category.properties              |   33 
 reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties        |   33 
 reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java                  |   37 
 reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java               |   37 
 reportbuilder/java/com/sun/star/report/pentaho/configuration.properties                   |   33 
 reportbuilder/java/com/sun/star/report/pentaho/module.properties                          |   33 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-datastyle.css                        |   18 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-style.css                            |   18 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css                            |   18 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-text.css                             |   18 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd              |   41 
 reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties                |   33 
 reportbuilder/java/com/sun/star/report/pentaho/star-report.css                            |   18 
 reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml                     |   41 
 reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd                     |   42 
 reportbuilder/java/jfreereport.properties                                                 |   33 
 reportbuilder/java/libformula.properties                                                  |   33 
 reportbuilder/java/loader.properties                                                      |   33 
 reportbuilder/license/THIRDPARTYREADMELICENSE.html                                        |  768 ----------
 reportbuilder/license/readme_en-US.html                                                   |   18 
 reportbuilder/license/readme_en-US.txt                                                    |   31 
 reportbuilder/prj/rpt.xml                                                                 |   17 
 reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu                        |   37 
 reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu                          |   43 
 reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu                           |   43 
 reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu                 |   37 
 reportbuilder/registry/data/org/openoffice/Office/Paths.xcu                               |   43 
 reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu                        |   43 
 reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu                       |   37 
 reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu              |   37 
 reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu                   |   37 
 reportbuilder/registry/data/org/openoffice/Setup.xcu                                      |   43 
 reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu                       |   37 
 reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu                        |   37 
 reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs                      |   37 
 reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs            |   37 
 reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs                 |   37 
 reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu                      |   43 
 reportbuilder/util/components.rdb                                                         |    8 
 reportbuilder/util/description.xml                                                        |   17 
 reportbuilder/util/manifest.xml                                                           |   17 
 216 files changed, 3410 insertions(+), 3054 deletions(-)

New commits:
commit cf342fe92880710e070fb98583a9dcbff77a0522
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Jul 18 11:16:40 2012 +0100

    re-base on ALv2 code. Includes:
    
        reportbuilder, license file not needed.
        Patch contributed by Armin Le Grand
        http://svn.apache.org/viewvc?view=revision&revision=1305814
        Adapting extras/ to our wordbook setup.

diff --git a/basebmp/Makefile b/basebmp/Makefile
index ccb1c85..0997e62 100644
--- a/basebmp/Makefile
+++ b/basebmp/Makefile
@@ -1,4 +1,11 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
diff --git a/basebmp/inc/basebmp/accessortraits.hxx b/basebmp/inc/basebmp/accessortraits.hxx
index 30bdcd5..4ce9e69 100644
--- a/basebmp/inc/basebmp/accessortraits.hxx
+++ b/basebmp/inc/basebmp/accessortraits.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_BASEBMP_ACCESSORTRAITS_HXX
 #define INCLUDED_BASEBMP_ACCESSORTRAITS_HXX
diff --git a/basebmp/inc/basebmp/basebmpdllapi.h b/basebmp/inc/basebmp/basebmpdllapi.h
index 9dca0c5..c44eee0 100644
--- a/basebmp/inc/basebmp/basebmpdllapi.h
+++ b/basebmp/inc/basebmp/basebmpdllapi.h
@@ -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 INCLUDED_BASEBMP_BASEBMPDLLAPI_H
 #define INCLUDED_BASEBMP_BASEBMPDLLAPI_H
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
index b4995ec..98e0325 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.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_BASEBMP_BITMAPDEVICE_HXX
 #define INCLUDED_BASEBMP_BITMAPDEVICE_HXX
@@ -554,104 +545,103 @@ public:
                            const BitmapDeviceSharedPtr& rClip );
 
 protected:
-    BitmapDevice( const basegfx::B2IBox&           rBounds,
-                  sal_Int32                        nScanlineFormat,
-                  sal_Int32                        nScanlineStride,
-                  sal_uInt8*                       pFirstScanline,
-                  const RawMemorySharedArray&      rMem,
-                  const PaletteMemorySharedVector& rPalette );
-
-    virtual ~BitmapDevice();
+    BASEBMP_DLLPRIVATE BitmapDevice( const basegfx::B2IBox&           rBounds,
+                                     sal_Int32                        nScanlineFormat,
+                                     sal_Int32                        nScanlineStride,
+                                     sal_uInt8*                       pFirstScanline,
+                                     const RawMemorySharedArray&      rMem,
+                                     const PaletteMemorySharedVector& rPalette );
+    BASEBMP_DLLPRIVATE virtual ~BitmapDevice();
 
 private:
-    virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const = 0;
-    virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const = 0;
-    virtual bool isCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const = 0;
-
-    virtual void clear_i( Color                  fillColor,
-                          const basegfx::B2IBox& rBounds ) = 0;
-
-    virtual void setPixel_i( const basegfx::B2IPoint& rPt,
-                             Color                    lineColor,
-                             DrawMode                 drawMode ) = 0;
-    virtual void setPixel_i( const basegfx::B2IPoint&     rPt,
-                             Color                        lineColor,
-                             DrawMode                     drawMode,
-                             const BitmapDeviceSharedPtr& rClip ) = 0;
-
-    virtual Color getPixel_i( const basegfx::B2IPoint& rPt ) = 0;
-
-    virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt ) = 0;
-
-    virtual void drawLine_i( const basegfx::B2IPoint& rPt1,
-                             const basegfx::B2IPoint& rPt2,
-                             const basegfx::B2IBox&   rBounds,
-                             Color                    lineColor,
-                             DrawMode                 drawMode ) = 0;
-    virtual void drawLine_i( const basegfx::B2IPoint&     rPt1,
-                             const basegfx::B2IPoint&     rPt2,
-                             const basegfx::B2IBox&       rBounds,
-                             Color                        lineColor,
-                             DrawMode                     drawMode,
-                             const BitmapDeviceSharedPtr& rClip ) = 0;
-
-    virtual void drawPolygon_i( const basegfx::B2DPolygon& rPoly,
-                                const basegfx::B2IBox&     rBounds,
-                                Color                      lineColor,
-                                DrawMode                   drawMode ) = 0;
-    virtual void drawPolygon_i( const basegfx::B2DPolygon&   rPoly,
-                                const basegfx::B2IBox&       rBounds,
-                                Color                        lineColor,
-                                DrawMode                     drawMode,
-                                const BitmapDeviceSharedPtr& rClip ) = 0;
-
-    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
-                                    Color                          fillColor,
-                                    DrawMode                       drawMode,
-                                    const basegfx::B2IBox&         rBounds ) = 0;
-    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
-                                    Color                          fillColor,
-                                    DrawMode                       drawMode,
-                                    const basegfx::B2IBox&         rBounds,
-                                    const BitmapDeviceSharedPtr&   rClip ) = 0;
+    BASEBMP_DLLPRIVATE virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const = 0;
+    BASEBMP_DLLPRIVATE virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const = 0;
+    BASEBMP_DLLPRIVATE virtual bool isCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const = 0;
+
+    BASEBMP_DLLPRIVATE virtual void clear_i( Color                  fillColor,
+                                             const basegfx::B2IBox& rBounds ) = 0;
+
+    BASEBMP_DLLPRIVATE virtual void setPixel_i( const basegfx::B2IPoint& rPt,
+                                               Color                    lineColor,
+                                               DrawMode                 drawMode ) = 0;
+    BASEBMP_DLLPRIVATE virtual void setPixel_i( const basegfx::B2IPoint&     rPt,
+                                                Color                        lineColor,
+                                                DrawMode                     drawMode,
+                                                const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    BASEBMP_DLLPRIVATE virtual Color getPixel_i( const basegfx::B2IPoint& rPt ) = 0;
+
+    BASEBMP_DLLPRIVATE virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt ) = 0;
+
+    BASEBMP_DLLPRIVATE virtual void drawLine_i( const basegfx::B2IPoint& rPt1,
+                                                const basegfx::B2IPoint& rPt2,
+                                                const basegfx::B2IBox&   rBounds,
+                                                Color                    lineColor,
+                                                DrawMode                 drawMode ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawLine_i( const basegfx::B2IPoint&     rPt1,
+                                                const basegfx::B2IPoint&     rPt2,
+                                                const basegfx::B2IBox&       rBounds,
+                                                Color                        lineColor,
+                                                DrawMode                     drawMode,
+                                                const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    BASEBMP_DLLPRIVATE virtual void drawPolygon_i( const basegfx::B2DPolygon& rPoly,
+                                                   const basegfx::B2IBox&     rBounds,
+                                                   Color                      lineColor,
+                                                   DrawMode                   drawMode ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawPolygon_i( const basegfx::B2DPolygon&   rPoly,
+                                                   const basegfx::B2IBox&       rBounds,
+                                                   Color                        lineColor,
+                                                   DrawMode                     drawMode,
+                                                   const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    BASEBMP_DLLPRIVATE virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
+                                                       Color                          fillColor,
+                                                       DrawMode                       drawMode,
+                                                       const basegfx::B2IBox&         rBounds ) = 0;
+    BASEBMP_DLLPRIVATE virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
+                                                       Color                          fillColor,
+                                                       DrawMode                       drawMode,
+                                                       const basegfx::B2IBox&         rBounds,
+                                                       const BitmapDeviceSharedPtr&   rClip ) = 0;
 
     // must work with *this == rSrcBitmap!
-    virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
-                               const basegfx::B2IBox&       rSrcRect,
-                               const basegfx::B2IBox&       rDstRect,
-                               DrawMode                     drawMode ) = 0;
-    virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
-                               const basegfx::B2IBox&       rSrcRect,
-                               const basegfx::B2IBox&       rDstRect,
-                               DrawMode                     drawMode,
-                               const BitmapDeviceSharedPtr& rClip ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                                  const basegfx::B2IBox&       rSrcRect,
+                                                  const basegfx::B2IBox&       rDstRect,
+                                                  DrawMode                     drawMode ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                                  const basegfx::B2IBox&       rSrcRect,
+                                                  const basegfx::B2IBox&       rDstRect,
+                                                  DrawMode                     drawMode,
+                                                  const BitmapDeviceSharedPtr& rClip ) = 0;
 
     // must work with *this == rSrcBitmap!
-    virtual void drawMaskedColor_i( Color                        rSrcColor,
-                                    const BitmapDeviceSharedPtr& rAlphaMask,
-                                    const basegfx::B2IBox&       rSrcRect,
-                                    const basegfx::B2IPoint&     rDstPoint ) = 0;
-    virtual void drawMaskedColor_i( Color                        rSrcColor,
-                                    const BitmapDeviceSharedPtr& rAlphaMask,
-                                    const basegfx::B2IBox&       rSrcRect,
-                                    const basegfx::B2IPoint&     rDstPoint,
-                                    const BitmapDeviceSharedPtr& rClip ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawMaskedColor_i( Color                        rSrcColor,
+                                                       const BitmapDeviceSharedPtr& rAlphaMask,
+                                                       const basegfx::B2IBox&       rSrcRect,
+                                                       const basegfx::B2IPoint&     rDstPoint ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawMaskedColor_i( Color                        rSrcColor,
+                                                       const BitmapDeviceSharedPtr& rAlphaMask,
+                                                       const basegfx::B2IBox&       rSrcRect,
+                                                       const basegfx::B2IPoint&     rDstPoint,
+                                                       const BitmapDeviceSharedPtr& rClip ) = 0;
 
     // must work with *this == rSrcBitmap!
-    virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
-                                     const BitmapDeviceSharedPtr& rMask,
-                                     const basegfx::B2IBox&       rSrcRect,
-                                     const basegfx::B2IBox&       rDstRect,
-                                     DrawMode                     drawMode ) = 0;
-    virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
-                                     const BitmapDeviceSharedPtr& rMask,
-                                     const basegfx::B2IBox&       rSrcRect,
-                                     const basegfx::B2IBox&       rDstRect,
-                                     DrawMode                     drawMode,
-                                     const BitmapDeviceSharedPtr& rClip ) = 0;
-
-    virtual IBitmapDeviceDamageTrackerSharedPtr getDamageTracker_i() const = 0;
-    virtual void setDamageTracker_i( const IBitmapDeviceDamageTrackerSharedPtr& rDamage ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                                        const BitmapDeviceSharedPtr& rMask,
+                                                        const basegfx::B2IBox&       rSrcRect,
+                                                        const basegfx::B2IBox&       rDstRect,
+                                                        DrawMode                     drawMode ) = 0;
+    BASEBMP_DLLPRIVATE virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                                        const BitmapDeviceSharedPtr& rMask,
+                                                        const basegfx::B2IBox&       rSrcRect,
+                                                        const basegfx::B2IBox&       rDstRect,
+                                                        DrawMode                     drawMode,
+                                                        const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    BASEBMP_DLLPRIVATE virtual IBitmapDeviceDamageTrackerSharedPtr getDamageTracker_i() const = 0;
+    BASEBMP_DLLPRIVATE virtual void setDamageTracker_i( const IBitmapDeviceDamageTrackerSharedPtr& rDamage ) = 0;
 
     BitmapDeviceSharedPtr getGenericRenderer() const;
 
@@ -660,7 +650,7 @@ private:
 
 /** Function to create a BitmapDevice for given scanline format
  */
-BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
+BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVector& rSize,
                                                             bool                      bTopDown,
                                                             sal_Int32                 nScanlineFormat );
 
@@ -671,7 +661,7 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe
     lookups for the whole range of pixel values from the specified
     format.
  */
-BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize,
+BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVector&        rSize,
                                                             bool                             bTopDown,
                                                             sal_Int32                        nScanlineFormat,
                                                             const PaletteMemorySharedVector& rPalette );
@@ -682,7 +672,7 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe
     Note: the provided memory must have sufficient size, to store the
     image of the specified area and format.
  */
-BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize,
+BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVector&        rSize,
                                                             bool                             bTopDown,
                                                             sal_Int32                        nScanlineFormat,
                                                             const RawMemorySharedArray&      rMem,
@@ -697,7 +687,7 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe
     area. Useful to implement rectangular clips (usually faster than
     setting up a 1bpp clip mask).
  */
-BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr& rProto,
+BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC subsetBitmapDevice( const BitmapDeviceSharedPtr& rProto,
                                                             const basegfx::B2IBox&       rSubset );
 
 /** Function to clone a BitmapDevice from a given prototype.
@@ -706,7 +696,7 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSh
     copied, only the size can be varied. Note that the prototype's
     bitmap content is <em>not</em> copied, only a palette (if any).
  */
-BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector&    rSize,
+BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC cloneBitmapDevice( const basegfx::B2IVector&    rSize,
                                                            const BitmapDeviceSharedPtr& rProto );
 
 }
diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx
index 01262c0..92ca167 100644
--- a/basebmp/inc/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/basebmp/clippedlinerenderer.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_BASEBMP_CLIPPEDLINERENDERER_HXX
 #define INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX
diff --git a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
index e272dc3..c4511c7 100644
--- a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
+++ b/basebmp/inc/basebmp/colorblendaccessoradapter.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_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
 #define INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
diff --git a/basebmp/inc/basebmp/debug.hxx b/basebmp/inc/basebmp/debug.hxx
index 0a8c721..688daf4 100644
--- a/basebmp/inc/basebmp/debug.hxx
+++ b/basebmp/inc/basebmp/debug.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 INCLUDED_BASEBMP_DEBUG_HXX
 #define INCLUDED_BASEBMP_DEBUG_HXX
diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx
index 5f9f8a7..e451dce 100644
--- a/basebmp/inc/basebmp/metafunctions.hxx
+++ b/basebmp/inc/basebmp/metafunctions.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_BASEBMP_METAFUNCTIONS_HXX
 #define INCLUDED_BASEBMP_METAFUNCTIONS_HXX
diff --git a/basebmp/inc/basebmp/polypolygonrenderer.hxx b/basebmp/inc/basebmp/polypolygonrenderer.hxx
index 37b568e..80f73ac 100644
--- a/basebmp/inc/basebmp/polypolygonrenderer.hxx
+++ b/basebmp/inc/basebmp/polypolygonrenderer.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_BASEBMP_POLYPOLYGONRENDERER_HXX
 #define INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX
diff --git a/basebmp/inc/basebmp/tools.hxx b/basebmp/inc/basebmp/tools.hxx
index 403041d..31854a1 100644
--- a/basebmp/inc/basebmp/tools.hxx
+++ b/basebmp/inc/basebmp/tools.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_BASEBMP_TOOLS_HXX
 #define INCLUDED_BASEBMP_TOOLS_HXX
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 07a36ce..82a430f 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -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 .
+ */
 
 #include "basebmp/bitmapdevice.hxx"
 
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
index 53e7bf7..8ea42de 100644
--- a/basebmp/source/debug.cxx
+++ b/basebmp/source/debug.cxx
@@ -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 .
+ */
 
 #if OSL_DEBUG_LEVEL > 2
 
diff --git a/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx
index 407948e..e1e3ff5 100644
--- a/basebmp/source/intconversion.hxx
+++ b/basebmp/source/intconversion.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_BASEBMP_INTCONVERSION_HXX
 #define INCLUDED_BASEBMP_INTCONVERSION_HXX
diff --git a/basebmp/test/basebmp_cppunittester_all.cxx b/basebmp/test/basebmp_cppunittester_all.cxx
index aecb816..2e0497d 100644
--- a/basebmp/test/basebmp_cppunittester_all.cxx
+++ b/basebmp/test/basebmp_cppunittester_all.cxx
@@ -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 .
+ */
 
 #include <cstdlib>
 #include <iostream>
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index c3c2114..4c8cc3b 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -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 .
+ */
 
 #ifdef IOS
 #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_basebmp
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 2ac3064..8ea3270 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -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  _USE_MATH_DEFINES
 #define  _USE_MATH_DEFINES  // needed by Visual C++ for math constants
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index a263bc7..f81083f 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -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 .
+ */
 
 // autogenerated file with codegen.pl
 
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 89704dd..e4b0931 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -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 .
+ */
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 748bea9..ca13ef8 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -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 .
+ */
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index f4c7dea..5e7b02f 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -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 .
+ */
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index a05bfe8..cf5f394 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -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 .
+ */
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index dbfbb5c..9dc5e61 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -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 .
+ */
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index ca90ca1..a5c9b30 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -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 .
+ */
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
diff --git a/extras/source/autotext/lang/makefile.mk b/extras/source/autotext/lang/makefile.mk
index c3882b3..0a5841c 100644
--- a/extras/source/autotext/lang/makefile.mk
+++ b/extras/source/autotext/lang/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/autotext/makefile.mk b/extras/source/autotext/makefile.mk
index 6ed3e80..d92b1c2 100644
--- a/extras/source/autotext/makefile.mk
+++ b/extras/source/autotext/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..
 
 
diff --git a/extras/source/database/makefile.mk b/extras/source/database/makefile.mk
index 9395961..592773e 100644
--- a/extras/source/database/makefile.mk
+++ b/extras/source/database/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..
 
 
diff --git a/extras/source/gallery/bullets/makefile.mk b/extras/source/gallery/bullets/makefile.mk
index 3a7d043..8b15b75 100644
--- a/extras/source/gallery/bullets/makefile.mk
+++ b/extras/source/gallery/bullets/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/gallery/gallery_sound/makefile.mk b/extras/source/gallery/gallery_sound/makefile.mk
index 240afce..ce5e175 100644
--- a/extras/source/gallery/gallery_sound/makefile.mk
+++ b/extras/source/gallery/gallery_sound/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/gallery/gallery_system/makefile.mk b/extras/source/gallery/gallery_system/makefile.mk
index 0c53f6c..07da85a 100644
--- a/extras/source/gallery/gallery_system/makefile.mk
+++ b/extras/source/gallery/gallery_system/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/gallery/htmlexpo/makefile.mk b/extras/source/gallery/htmlexpo/makefile.mk
index 3004e72..7a5614e 100644
--- a/extras/source/gallery/htmlexpo/makefile.mk
+++ b/extras/source/gallery/htmlexpo/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/gallery/makefile.mk b/extras/source/gallery/makefile.mk
index 8a33939..c56ad3e 100644
--- a/extras/source/gallery/makefile.mk
+++ b/extras/source/gallery/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..
 
 
diff --git a/extras/source/gallery/rulers/makefile.mk b/extras/source/gallery/rulers/makefile.mk
index cd977c2..0cc2faa 100644
--- a/extras/source/gallery/rulers/makefile.mk
+++ b/extras/source/gallery/rulers/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/gallery/sounds/makefile.mk b/extras/source/gallery/sounds/makefile.mk
index 9e7988b..5fe5376 100644
--- a/extras/source/gallery/sounds/makefile.mk
+++ b/extras/source/gallery/sounds/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/gallery/www-back/makefile.mk b/extras/source/gallery/www-back/makefile.mk
index fb84e6d..e70089f 100644
--- a/extras/source/gallery/www-back/makefile.mk
+++ b/extras/source/gallery/www-back/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..$/..
 
 
diff --git a/extras/source/gallery/www-graf/makefile.mk b/extras/source/gallery/www-graf/makefile.mk
index 9004671..b0f653f 100644
--- a/extras/source/gallery/www-graf/makefile.mk
+++ b/extras/source/gallery/www-graf/makefile.mk
@@ -1,6 +1,22 @@
-PRJ=..$/..$/..
-
+#
+# 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 .
+#
 
+PRJ=..$/..$/..
 
 PRJNAME=extras
 TARGET=gallerywwwgraf
@@ -9,14 +25,10 @@ TARGET=gallerywwwgraf
 
 .INCLUDE : $(PRJ)$/util$/target.pmk
 
-
-
 ZIP1TARGET      = $(GALLERY_WWWGRAF_TARGET)
 
 ZIP1LIST        = * -x makefile.*
 
-
-
 .INCLUDE : target.mk
 
 
diff --git a/extras/source/misc_config/makefile.mk b/extras/source/misc_config/makefile.mk
index e706a04..f3187d9 100644
--- a/extras/source/misc_config/makefile.mk
+++ b/extras/source/misc_config/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
 PRJ=..$/..
 
 
diff --git a/extras/source/misc_config/wizard/form/styles/beige.css b/extras/source/misc_config/wizard/form/styles/beige.css
index a1a2c4d..8443273 100644
--- a/extras/source/misc_config/wizard/form/styles/beige.css
+++ b/extras/source/misc_config/wizard/form/styles/beige.css
@@ -1,3 +1,21 @@
+/*
+ * 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 .
+ */
+
 .doctitle {
 	font-family: "Times New Roman", Times, serif;
 	font-size: 14px;
diff --git a/extras/source/misc_config/wizard/form/styles/bgr.css b/extras/source/misc_config/wizard/form/styles/bgr.css
index 72a241b..cb2d363 100644
--- a/extras/source/misc_config/wizard/form/styles/bgr.css
+++ b/extras/source/misc_config/wizard/form/styles/bgr.css
@@ -1,3 +1,21 @@
+/*
+ * 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 .
+ */
+
 .doctitle {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 14px;
diff --git a/extras/source/misc_config/wizard/form/styles/dark.css b/extras/source/misc_config/wizard/form/styles/dark.css
index dcff590..eb92790 100644
--- a/extras/source/misc_config/wizard/form/styles/dark.css
+++ b/extras/source/misc_config/wizard/form/styles/dark.css
@@ -1,3 +1,21 @@
+/*
+ * This file is part of the LibreOffice project.
+ *

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list