[Libreoffice-commits] .: 8 commits - bridges/inc bridges/Makefile bridges/source bridges/test editeng/inc editeng/source framework/AllLangResTarget_fwe.mk framework/dtd framework/inc framework/JunitTest_framework_complex.mk framework/JunitTest_framework_unoapi.mk framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk framework/Module_framework.mk framework/Package_inc.mk framework/qa framework/source framework/uiconfig framework/util instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure instsetoo_native/util qadevOOo/tests svx/inc svx/source vcl/unx xmloff/dtd xmloff/inc xmloff/JunitTest_xmloff_unoapi.mk xmloff/Library_xof.mk xmloff/Module_xmloff.mk xmloff/Package_inc.mk xmloff/qa xmloff/source xmloff/util xmloff/xml

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 15 08:06:54 PST 2012


 bridges/Makefile                                                             |    7 
 bridges/inc/bridges/cpp_uno/bridge.hxx                                       |   37 -
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx                         |   37 -
 bridges/source/cpp_uno/cc50_solaris_intel/call.s                             |   18 
 bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx                        |   37 -
 bridges/source/cpp_uno/cc50_solaris_intel/except.cxx                         |   59 +
 bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx                        |   37 -
 bridges/source/cpp_uno/cc50_solaris_sparc/call.s                             |   18 
 bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx                        |   37 -
 bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx                         |   59 +
 bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx                        |   37 -
 bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.s               |   37 -
 bridges/source/cpp_uno/cc5_solaris_sparc64/fp.s                              |   37 -
 bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx                       |   37 -
 bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.s                  |   37 -
 bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx                          |   38 -
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx                           |   56 -
 bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx                            |   37 -
 bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx                          |   39 -
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx                              |   37 -
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx                               |   58 +
 bridges/source/cpp_uno/gcc3_ios_arm/helper.s                                 |   37 -
 bridges/source/cpp_uno/gcc3_ios_arm/share.hxx                                |   37 -
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx                              |   37 -
 bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx                          |   37 -
 bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx                           |   57 -
 bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S                            |   18 
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx                            |   37 -
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx                             |   75 +-
 bridges/source/cpp_uno/gcc3_linux_arm/share.hxx                              |   37 -
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx                            |   37 -
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx                            |   57 -
 bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx                            |   57 -
 bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx                |   37 -
 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx                |   43 -
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx                          |   37 -
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx                           |   64 +-
 bridges/source/cpp_uno/gcc3_linux_intel/share.hxx                            |   37 -
 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx                          |   37 -
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx                            |   57 -
 bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx                            |   57 -
 bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx                        |   37 -
 bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx                         |   57 -
 bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx                        |   37 -
 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx                      |   37 -
 bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx                       |   57 -
 bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx                      |   37 -
 bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx                            |   57 -
 bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx                          |   37 -
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx                           |   57 -
 bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx                          |   37 -
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx                           |   57 -
 bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx                          |   37 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx                             |   43 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx               |   37 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx               |   43 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx                         |   37 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx                          |   51 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx                           |   37 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx                         |   37 -
 bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx                         |   37 -
 bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx                          |   57 -
 bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx                         |   37 -
 bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx                       |   37 -
 bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx                        |   57 -
 bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx                       |   37 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx                            |   43 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx              |   37 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx              |   43 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx                        |   37 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx                         |   60 +
 bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx                          |   37 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx                        |   37 -
 bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx                        |   37 -
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx                         |   57 -
 bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx                        |   37 -
 bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx                        |   37 -
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx                         |   57 -
 bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx                        |   37 -
 bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx                     |   37 -
 bridges/source/cpp_uno/mingw_intel/callvirtualmethod.hxx                     |   43 -
 bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx                               |   37 -
 bridges/source/cpp_uno/mingw_intel/except.cxx                                |   57 -
 bridges/source/cpp_uno/mingw_intel/share.hxx                                 |   37 -
 bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx                               |   37 -
 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx                          |   37 -
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx                           |   55 -
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx                         |   37 -
 bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx                         |   43 -
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx                          |   56 -
 bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx                            |   43 -
 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx                         |   37 -
 bridges/source/cpp_uno/shared/component.cxx                                  |   37 -
 bridges/source/cpp_uno/shared/vtablefactory.cxx                              |   37 -
 bridges/source/jni_uno/jni_base.h                                            |   37 -
 bridges/source/jni_uno/jni_bridge.cxx                                        |   37 -
 bridges/source/jni_uno/jni_data.cxx                                          |   37 -
 bridges/source/jni_uno/jni_helper.h                                          |   37 -
 bridges/source/jni_uno/jni_info.cxx                                          |   37 -
 bridges/source/jni_uno/jni_info.h                                            |   37 -
 bridges/source/jni_uno/jni_java2uno.cxx                                      |   37 -
 bridges/source/jni_uno/jni_uno2java.cxx                                      |   37 -
 bridges/source/jni_uno/nativethreadpool.cxx                                  |   37 -
 bridges/test/java_uno/acquire/makefile.mk                                    |   33 -
 bridges/test/java_uno/acquire/testacquire.cxx                                |   37 -
 bridges/test/java_uno/equals/makefile.mk                                     |   33 -
 bridges/test/java_uno/equals/testequals.cxx                                  |   37 -
 bridges/test/java_uno/nativethreadpool/makefile.mk                           |   33 -
 bridges/test/java_uno/nativethreadpool/readme                                |   33 -
 bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx        |   37 -
 bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx        |   37 -
 bridges/test/java_uno/nativethreadpool/version.map                           |   33 -
 bridges/test/performance/makefile.mk                                         |   33 -
 bridges/test/testcomp.cxx                                                    |   37 -
 bridges/test/testoffice.cxx                                                  |   37 -
 bridges/test/testserver.cxx                                                  |   37 -
 editeng/inc/editeng/unopracc.hxx                                             |   54 -
 editeng/inc/editeng/unotext.hxx                                              |  195 +++---
 editeng/source/uno/unopracc.cxx                                              |   64 ++
 editeng/source/uno/unotext.cxx                                               |  302 ++++++++--
 editeng/source/uno/unotext2.cxx                                              |  234 ++++++-
 framework/AllLangResTarget_fwe.mk                                            |   33 -
 framework/JunitTest_framework_complex.mk                                     |   33 -
 framework/JunitTest_framework_unoapi.mk                                      |   33 -
 framework/Library_fwe.mk                                                     |   33 -
 framework/Library_fwi.mk                                                     |   33 -
 framework/Library_fwk.mk                                                     |   33 -
 framework/Library_fwl.mk                                                     |   33 -
 framework/Library_fwm.mk                                                     |   33 -
 framework/Module_framework.mk                                                |   36 -
 framework/Package_inc.mk                                                     |   33 -
 framework/dtd/accelerator.dtd                                                |   39 -
 framework/dtd/event.dtd                                                      |   39 -
 framework/dtd/groupuinames.dtd                                               |   40 -
 framework/dtd/image.dtd                                                      |   39 -
 framework/dtd/menubar.dtd                                                    |   39 -
 framework/dtd/statusbar.dtd                                                  |   39 -
 framework/dtd/toolbar.dtd                                                    |   39 -
 framework/inc/classes/converter.hxx                                          |   43 -
 framework/inc/classes/filtercachedata.hxx                                    |   37 -
 framework/inc/classes/framecontainer.hxx                                     |   37 -
 framework/inc/classes/fwktabwindow.hxx                                       |   37 -
 framework/inc/classes/menumanager.hxx                                        |   37 -
 framework/inc/classes/protocolhandlercache.hxx                               |   37 -
 framework/inc/classes/rootactiontriggercontainer.hxx                         |   37 -
 framework/inc/dispatch/closedispatcher.hxx                                   |   37 -
 framework/inc/dispatch/dispatchprovider.hxx                                  |   37 -
 framework/inc/dispatch/mailtodispatcher.hxx                                  |   37 -
 framework/inc/dispatch/menudispatcher.hxx                                    |   37 -
 framework/inc/dispatch/servicehandler.hxx                                    |   37 -
 framework/inc/dispatch/systemexec.hxx                                        |   37 -
 framework/inc/dispatchcommands.h                                             |   43 -
 framework/inc/framework/actiontriggerhelper.hxx                              |   37 -
 framework/inc/framework/addonmenu.hxx                                        |   37 -
 framework/inc/framework/addonsoptions.hxx                                    |   37 -
 framework/inc/framework/bmkmenu.hxx                                          |   37 -
 framework/inc/framework/eventsconfiguration.hxx                              |   43 -
 framework/inc/framework/iguard.hxx                                           |   43 -
 framework/inc/framework/imageproducer.hxx                                    |   43 -
 framework/inc/framework/imutex.hxx                                           |   43 -
 framework/inc/framework/menuconfiguration.hxx                                |   37 -
 framework/inc/framework/menuextensionsupplier.hxx                            |   43 -
 framework/inc/framework/preventduplicateinteraction.hxx                      |   37 -
 framework/inc/framework/sfxhelperfunctions.hxx                               |   37 -
 framework/inc/framework/statusbarconfiguration.hxx                           |   43 -
 framework/inc/framework/titlehelper.hxx                                      |   37 -
 framework/inc/framework/undomanagerhelper.hxx                                |   36 -
 framework/inc/general.h                                                      |   43 -
 framework/inc/helper/ilayoutnotifications.hxx                                |   43 -
 framework/inc/helper/mischelper.hxx                                          |   37 -
 framework/inc/helper/oframes.hxx                                             |   37 -
 framework/inc/helper/shareablemutex.hxx                                      |   37 -
 framework/inc/helper/statusindicatorfactory.hxx                              |   37 -
 framework/inc/helper/titlebarupdate.hxx                                      |   37 -
 framework/inc/jobs/jobexecutor.hxx                                           |   37 -
 framework/inc/macros/debug/assertion.hxx                                     |   37 -
 framework/inc/macros/debug/registration.hxx                                  |   37 -
 framework/inc/macros/generic.hxx                                             |   43 -
 framework/inc/macros/registration.hxx                                        |   37 -
 framework/inc/macros/xserviceinfo.hxx                                        |   37 -
 framework/inc/properties.h                                                   |   37 -
 framework/inc/protocols.h                                                    |   37 -
 framework/inc/services/autorecovery.hxx                                      |   37 -
 framework/inc/services/desktop.hxx                                           |   37 -
 framework/inc/services/frame.hxx                                             |   37 -
 framework/inc/services/layoutmanager.hxx                                     |   37 -
 framework/inc/services/license.hxx                                           |   37 -
 framework/inc/services/licensedlg.hxx                                        |   37 -
 framework/inc/services/logindialog.hxx                                       |   37 -
 framework/inc/services/pathsettings.hxx                                      |   37 -
 framework/inc/services/sessionlistener.hxx                                   |   37 -
 framework/inc/services/substitutepathvars.hxx                                |   37 -
 framework/inc/services/tabwindowservice.hxx                                  |   37 -
 framework/inc/services/taskcreatorsrv.hxx                                    |   37 -
 framework/inc/stdtypes.h                                                     |   37 -
 framework/inc/tabwin/tabwindow.hxx                                           |   37 -
 framework/inc/threadhelp/igate.h                                             |   43 -
 framework/inc/threadhelp/irwlock.h                                           |   37 -
 framework/inc/threadhelp/itransactionmanager.h                               |   37 -
 framework/inc/threadhelp/lockhelper.hxx                                      |   37 -
 framework/inc/threadhelp/threadhelpbase.hxx                                  |   37 -
 framework/inc/uiconfiguration/imagetype.hxx                                  |   43 -
 framework/inc/uiconfiguration/moduleimagemanager.hxx                         |   37 -
 framework/inc/uiconfiguration/moduleuicfgsupplier.hxx                        |   37 -
 framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx               |   37 -
 framework/inc/uiconfiguration/uiconfigurationmanager.hxx                     |   37 -
 framework/inc/uiconfiguration/windowstateconfiguration.hxx                   |   37 -
 framework/inc/uielement/addonstoolbarmanager.hxx                             |   37 -
 framework/inc/uielement/comboboxtoolbarcontroller.hxx                        |   37 -
 framework/inc/uielement/constitemcontainer.hxx                               |   37 -
 framework/inc/uielement/controlmenucontroller.hxx                            |   37 -
 framework/inc/uielement/dropdownboxtoolbarcontroller.hxx                     |   37 -
 framework/inc/uielement/edittoolbarcontroller.hxx                            |   37 -
 framework/inc/uielement/itemcontainer.hxx                                    |   37 -
 framework/inc/uielement/menubarmanager.hxx                                   |   37 -
 framework/inc/uielement/newmenucontroller.hxx                                |   37 -
 framework/inc/uielement/recentfilesmenucontroller.hxx                        |   37 -
 framework/inc/uielement/rootitemcontainer.hxx                                |   37 -
 framework/inc/uielement/spinfieldtoolbarcontroller.hxx                       |   37 -
 framework/inc/uielement/statusbarmanager.hxx                                 |   37 -
 framework/inc/uielement/toolbarmanager.hxx                                   |   37 -
 framework/inc/uielement/uicommanddescription.hxx                             |   37 -
 framework/inc/uielement/uielement.hxx                                        |   37 -
 framework/inc/uifactory/factoryconfiguration.hxx                             |   37 -
 framework/inc/uifactory/uielementfactorymanager.hxx                          |   37 -
 framework/inc/xml/imagesconfiguration.hxx                                    |   37 -
 framework/inc/xml/imagesdocumenthandler.hxx                                  |   37 -
 framework/inc/xml/menudocumenthandler.hxx                                    |   37 -
 framework/inc/xml/saxnamespacefilter.hxx                                     |   37 -
 framework/inc/xml/statusbardocumenthandler.hxx                               |   37 -
 framework/inc/xml/toolboxdocumenthandler.hxx                                 |   37 -
 framework/inc/xml/xmlnamespaces.hxx                                          |   43 -
 framework/qa/unoapi/knownissues.xcl                                          |   18 
 framework/source/accelerators/acceleratorconfiguration.cxx                   |   37 -
 framework/source/accelerators/documentacceleratorconfiguration.cxx           |   37 -
 framework/source/accelerators/globalacceleratorconfiguration.cxx             |   37 -
 framework/source/accelerators/keymapping.cxx                                 |   37 -
 framework/source/accelerators/moduleacceleratorconfiguration.cxx             |   37 -
 framework/source/accelerators/presethandler.cxx                              |   37 -
 framework/source/accelerators/storageholder.cxx                              |   37 -
 framework/source/classes/droptargetlistener.cxx                              |   37 -
 framework/source/classes/framecontainer.cxx                                  |   37 -
 framework/source/classes/fwktabwindow.cxx                                    |   37 -
 framework/source/classes/fwlresid.cxx                                        |   43 -
 framework/source/classes/menumanager.cxx                                     |   37 -
 framework/source/classes/resource.src                                        |   37 -
 framework/source/classes/taskcreator.cxx                                     |   37 -
 framework/source/dispatch/closedispatcher.cxx                                |   37 -
 framework/source/dispatch/dispatchinformationprovider.cxx                    |   37 -
 framework/source/dispatch/dispatchprovider.cxx                               |   37 -
 framework/source/dispatch/interceptionhelper.cxx                             |   37 -
 framework/source/dispatch/loaddispatcher.cxx                                 |   37 -
 framework/source/dispatch/mailtodispatcher.cxx                               |   37 -
 framework/source/dispatch/menudispatcher.cxx                                 |   37 -
 framework/source/dispatch/oxt_handler.cxx                                    |   37 -
 framework/source/dispatch/popupmenudispatcher.cxx                            |   37 -
 framework/source/dispatch/servicehandler.cxx                                 |   37 -
 framework/source/dispatch/startmoduledispatcher.cxx                          |   37 -
 framework/source/dispatch/systemexec.cxx                                     |   37 -
 framework/source/dispatch/windowcommanddispatch.cxx                          |   37 -
 framework/source/fwe/classes/actiontriggercontainer.cxx                      |   42 -
 framework/source/fwe/classes/actiontriggerpropertyset.cxx                    |   42 -
 framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx           |   42 -
 framework/source/fwe/classes/addonmenu.cxx                                   |   37 -
 framework/source/fwe/classes/addonsoptions.cxx                               |   37 -
 framework/source/fwe/classes/bmkmenu.cxx                                     |   37 -
 framework/source/fwe/classes/framelistanalyzer.cxx                           |   37 -
 framework/source/fwe/classes/fwkresid.cxx                                    |   43 -
 framework/source/fwe/classes/menuextensionsupplier.cxx                       |   43 -
 framework/source/fwe/classes/rootactiontriggercontainer.cxx                  |   39 -
 framework/source/fwe/classes/sfxhelperfunctions.cxx                          |   37 -
 framework/source/fwe/helper/actiontriggerhelper.cxx                          |   37 -
 framework/source/fwe/helper/configimporter.cxx                               |   37 -
 framework/source/fwe/helper/imageproducer.cxx                                |   43 -
 framework/source/fwe/helper/propertysetcontainer.cxx                         |   37 -
 framework/source/fwe/helper/titlehelper.cxx                                  |   37 -
 framework/source/fwe/helper/undomanagerhelper.cxx                            |   36 -
 framework/source/fwe/xml/menuconfiguration.cxx                               |   37 -
 framework/source/fwe/xml/menudocumenthandler.cxx                             |   37 -
 framework/source/fwe/xml/saxnamespacefilter.cxx                              |   37 -
 framework/source/fwe/xml/statusbarconfiguration.cxx                          |   37 -
 framework/source/fwe/xml/statusbardocumenthandler.cxx                        |   37 -
 framework/source/fwe/xml/toolboxconfiguration.cxx                            |   37 -
 framework/source/fwe/xml/toolboxdocumenthandler.cxx                          |   37 -
 framework/source/fwe/xml/xmlnamespaces.cxx                                   |   37 -
 framework/source/fwi/classes/converter.cxx                                   |   37 -
 framework/source/fwi/classes/propertysethelper.cxx                           |   37 -
 framework/source/fwi/classes/protocolhandlercache.cxx                        |   37 -
 framework/source/fwi/helper/mischelper.cxx                                   |   37 -
 framework/source/fwi/helper/networkdomain.cxx                                |   37 -
 framework/source/fwi/helper/shareablemutex.cxx                               |   37 -
 framework/source/fwi/jobs/configaccess.cxx                                   |   37 -
 framework/source/fwi/jobs/jobconst.cxx                                       |   43 -
 framework/source/fwi/threadhelp/lockhelper.cxx                               |   37 -
 framework/source/fwi/uielement/constitemcontainer.cxx                        |   37 -
 framework/source/fwi/uielement/itemcontainer.cxx                             |   37 -
 framework/source/fwi/uielement/rootitemcontainer.cxx                         |   37 -
 framework/source/helper/dockingareadefaultacceptor.cxx                       |   37 -
 framework/source/helper/oframes.cxx                                          |   37 -
 framework/source/helper/persistentwindowstate.cxx                            |   37 -
 framework/source/helper/statusindicatorfactory.cxx                           |   37 -
 framework/source/helper/titlebarupdate.cxx                                   |   37 -
 framework/source/helper/uiconfigelementwrapperbase.cxx                       |   37 -
 framework/source/helper/uielementwrapperbase.cxx                             |   37 -
 framework/source/helper/vclstatusindicator.cxx                               |   37 -
 framework/source/inc/accelerators/acceleratorcache.hxx                       |   37 -
 framework/source/inc/accelerators/acceleratorconfiguration.hxx               |   37 -
 framework/source/inc/accelerators/globalacceleratorconfiguration.hxx         |   37 -
 framework/source/inc/accelerators/istoragelistener.hxx                       |   43 -
 framework/source/inc/accelerators/keymapping.hxx                             |   37 -
 framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx         |   37 -
 framework/source/inc/accelerators/storageholder.hxx                          |   37 -
 framework/source/inc/dispatch/windowcommanddispatch.hxx                      |   37 -
 framework/source/inc/loadenv/loadenv.hxx                                     |   37 -
 framework/source/inc/loadenv/loadenvexception.hxx                            |   37 -
 framework/source/inc/pattern/configuration.hxx                               |   37 -
 framework/source/inc/pattern/window.hxx                                      |   37 -
 framework/source/jobs/helponstartup.cxx                                      |   37 -
 framework/source/jobs/job.cxx                                                |   37 -
 framework/source/jobs/jobdata.cxx                                            |   37 -
 framework/source/jobs/jobdispatch.cxx                                        |   37 -
 framework/source/jobs/jobexecutor.cxx                                        |   37 -
 framework/source/jobs/joburl.cxx                                             |   37 -
 framework/source/jobs/shelljob.cxx                                           |   37 -
 framework/source/layoutmanager/helpers.cxx                                   |   37 -
 framework/source/layoutmanager/helpers.hxx                                   |   37 -
 framework/source/layoutmanager/layoutmanager.cxx                             |   37 -
 framework/source/layoutmanager/toolbarlayoutmanager.cxx                      |   51 -
 framework/source/layoutmanager/toolbarlayoutmanager.hxx                      |   42 -
 framework/source/layoutmanager/uielement.cxx                                 |   37 -
 framework/source/loadenv/loadenv.cxx                                         |   38 -
 framework/source/loadenv/targethelper.cxx                                    |   37 -
 framework/source/recording/dispatchrecorder.cxx                              |   37 -
 framework/source/register/register3rdcomponents.cxx                          |   43 -
 framework/source/register/registerlogindialog.cxx                            |   43 -
 framework/source/register/registerservices.cxx                               |   37 -
 framework/source/register/registertemp.cxx                                   |   37 -
 framework/source/services/autorecovery.cxx                                   |   37 -
 framework/source/services/backingcomp.cxx                                    |   38 -
 framework/source/services/backingwindow.cxx                                  |   38 -
 framework/source/services/backingwindow.hxx                                  |   37 -
 framework/source/services/desktop.cxx                                        |   37 -
 framework/source/services/dispatchhelper.cxx                                 |   37 -
 framework/source/services/frame.cxx                                          |   37 -
 framework/source/services/fwk_services.src                                   |   37 -
 framework/source/services/license.cxx                                        |   37 -
 framework/source/services/mediatypedetectionhelper.cxx                       |   37 -
 framework/source/services/modulemanager.cxx                                  |   37 -
 framework/source/services/pathsettings.cxx                                   |   37 -
 framework/source/services/sessionlistener.cxx                                |   37 -
 framework/source/services/substitutepathvars.cxx                             |   37 -
 framework/source/services/tabwindowservice.cxx                               |   37 -
 framework/source/services/taskcreatorsrv.cxx                                 |   37 -
 framework/source/services/urltransformer.cxx                                 |   37 -
 framework/source/tabwin/tabwindow.cxx                                        |   37 -
 framework/source/tabwin/tabwinfactory.cxx                                    |   37 -
 framework/source/uiconfiguration/globalsettings.cxx                          |   37 -
 framework/source/uiconfiguration/imagemanager.cxx                            |   51 -
 framework/source/uiconfiguration/imagemanagerimpl.cxx                        |   59 -
 framework/source/uiconfiguration/imagemanagerimpl.hxx                        |   51 -
 framework/source/uiconfiguration/moduleimagemanager.cxx                      |   51 -
 framework/source/uiconfiguration/moduleuicfgsupplier.cxx                     |   37 -
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx            |   37 -
 framework/source/uiconfiguration/uicategorydescription.cxx                   |   37 -
 framework/source/uiconfiguration/uiconfigurationmanager.cxx                  |   37 -
 framework/source/uiconfiguration/windowstateconfiguration.cxx                |   37 -
 framework/source/uielement/addonstoolbarmanager.cxx                          |   37 -
 framework/source/uielement/addonstoolbarwrapper.cxx                          |   37 -
 framework/source/uielement/buttontoolbarcontroller.cxx                       |   37 -
 framework/source/uielement/comboboxtoolbarcontroller.cxx                     |   37 -
 framework/source/uielement/complextoolbarcontroller.cxx                      |   37 -
 framework/source/uielement/controlmenucontroller.cxx                         |   37 -
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx                  |   37 -
 framework/source/uielement/edittoolbarcontroller.cxx                         |   37 -
 framework/source/uielement/fontmenucontroller.cxx                            |   37 -
 framework/source/uielement/fontsizemenucontroller.cxx                        |   37 -
 framework/source/uielement/generictoolbarcontroller.cxx                      |   37 -
 framework/source/uielement/headermenucontroller.cxx                          |   37 -
 framework/source/uielement/imagebuttontoolbarcontroller.cxx                  |   37 -
 framework/source/uielement/langselectionmenucontroller.cxx                   |   37 -
 framework/source/uielement/langselectionstatusbarcontroller.cxx              |   37 -
 framework/source/uielement/logoimagestatusbarcontroller.cxx                  |   37 -
 framework/source/uielement/logotextstatusbarcontroller.cxx                   |   37 -
 framework/source/uielement/macrosmenucontroller.cxx                          |   37 -
 framework/source/uielement/menubarmanager.cxx                                |   37 -
 framework/source/uielement/menubarmerger.cxx                                 |   37 -
 framework/source/uielement/menubarwrapper.cxx                                |   37 -
 framework/source/uielement/newmenucontroller.cxx                             |   37 -
 framework/source/uielement/objectmenucontroller.cxx                          |   37 -
 framework/source/uielement/popupmenucontroller.cxx                           |   37 -
 framework/source/uielement/progressbarwrapper.cxx                            |   37 -
 framework/source/uielement/recentfilesmenucontroller.cxx                     |   37 -
 framework/source/uielement/simpletextstatusbarcontroller.cxx                 |   37 -
 framework/source/uielement/spinfieldtoolbarcontroller.cxx                    |   37 -
 framework/source/uielement/statusbar.cxx                                     |   37 -
 framework/source/uielement/statusbarmanager.cxx                              |   37 -
 framework/source/uielement/statusbarwrapper.cxx                              |   37 -
 framework/source/uielement/togglebuttontoolbarcontroller.cxx                 |   37 -
 framework/source/uielement/toolbarmanager.cxx                                |   37 -
 framework/source/uielement/toolbarmerger.cxx                                 |   37 -
 framework/source/uielement/toolbarsmenucontroller.cxx                        |   37 -
 framework/source/uielement/toolbarwrapper.cxx                                |   37 -
 framework/source/uielement/uicommanddescription.cxx                          |   37 -
 framework/source/uifactory/addonstoolboxfactory.cxx                          |   37 -
 framework/source/uifactory/factoryconfiguration.cxx                          |   37 -
 framework/source/uifactory/menubarfactory.cxx                                |   37 -
 framework/source/uifactory/toolbarcontrollerfactory.cxx                      |   37 -
 framework/source/uifactory/uielementfactorymanager.cxx                       |   37 -
 framework/source/uifactory/windowcontentfactorymanager.cxx                   |   37 -
 framework/source/xml/acceleratorconfigurationreader.cxx                      |   37 -
 framework/source/xml/acceleratorconfigurationwriter.cxx                      |   37 -
 framework/source/xml/imagesconfiguration.cxx                                 |   37 -
 framework/source/xml/imagesdocumenthandler.cxx                               |   37 -
 framework/uiconfig/startmodule/menubar/menubar.xml                           |   17 
 framework/uiconfig/startmodule/toolbar/standardbar.xml                       |   17 
 framework/util/fwk.component                                                 |   43 -
 framework/util/fwl.component                                                 |   43 -
 framework/util/fwm.component                                                 |   43 -
 instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt             |   18 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt      |   18 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt    |   19 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt |   19 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt             |   18 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt      |   18 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/ooo_patchcodes.txt    |   19 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt |   19 
 instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh                  |   17 
 instsetoo_native/inc_openoffice/unix/find-requires-x11.sh                    |   17 
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf            |   18 
 instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf           |   18 
 instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf           |   18 
 instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk            |   33 -
 instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt              |   18 
 instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt       |   18 
 instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt                   |   18 
 instsetoo_native/inc_ure/windows/msi_templates/codes.txt                     |   18 
 instsetoo_native/util/update.xml                                             |   17 
 qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java                           |    8 
 svx/inc/svx/unoshape.hxx                                                     |   43 -
 svx/source/table/cell.cxx                                                    |   74 ++
 svx/source/table/cell.hxx                                                    |   25 
 svx/source/unodraw/unoprov.cxx                                               |   66 --
 svx/source/unodraw/unoshap4.cxx                                              |   58 -
 svx/source/unodraw/unoshape.cxx                                              |   67 +-
 vcl/unx/gtk/a11y/atkwrapper.cxx                                              |   21 
 xmloff/JunitTest_xmloff_unoapi.mk                                            |   33 -
 xmloff/Library_xof.mk                                                        |   33 -
 xmloff/Module_xmloff.mk                                                      |   33 -
 xmloff/Package_inc.mk                                                        |    1 
 xmloff/dtd/Blocklist.dtd                                                     |   50 -
 xmloff/dtd/chart.mod                                                         |   40 -
 xmloff/dtd/datastyl.mod                                                      |   39 -
 xmloff/dtd/defs.mod                                                          |   40 -
 xmloff/dtd/drawing.mod                                                       |   39 -
 xmloff/dtd/dtypes.mod                                                        |   39 -
 xmloff/dtd/form.mod                                                          |   39 -
 xmloff/dtd/meta.mod                                                          |   40 -
 xmloff/dtd/nmspace.mod                                                       |   39 -
 xmloff/dtd/office.dtd                                                        |   39 -
 xmloff/dtd/office.mod                                                        |   39 -
 xmloff/dtd/openoffice-2.0-schema.rng                                         |   39 -
 xmloff/dtd/script.mod                                                        |   39 -
 xmloff/dtd/settings.mod                                                      |   39 -
 xmloff/dtd/style.mod                                                         |   39 -
 xmloff/dtd/table.mod                                                         |   39 -
 xmloff/dtd/text.mod                                                          |   41 -
 xmloff/inc/DomBuilderContext.hxx                                             |   37 -
 xmloff/inc/MultiPropertySetHelper.hxx                                        |   37 -
 xmloff/inc/SchXMLExport.hxx                                                  |   37 -
 xmloff/inc/SchXMLImport.hxx                                                  |   37 -
 xmloff/inc/StyleMap.hxx                                                      |   37 -
 xmloff/inc/XMLChartPropertySetMapper.hxx                                     |   37 -
 xmloff/inc/XMLFootnoteConfigurationImportContext.hxx                         |   37 -
 xmloff/inc/XMLTextColumnsContext.hxx                                         |   37 -
 xmloff/inc/XMLTextColumnsExport.hxx                                          |   43 -
 xmloff/inc/txtflde.hxx                                                       |   37 -
 xmloff/inc/txtlists.hxx                                                      |   37 -
 xmloff/inc/xexptran.hxx                                                      |   37 -
 xmloff/inc/xmloff/PropertySetInfoHash.hxx                                    |   90 +-
 xmloff/inc/xmloff/PropertySetInfoKey.hxx                                     |   61 ++
 xmloff/inc/xmloff/SchXMLImportHelper.hxx                                     |   37 -
 xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx                             |   40 -
 xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx                          |   37 -
 xmloff/inc/xmloff/XMLSettingsExportContext.hxx                               |   41 -
 xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx                               |   37 -
 xmloff/inc/xmloff/animationexport.hxx                                        |   43 -
 xmloff/inc/xmloff/attrlist.hxx                                               |   37 -
 xmloff/inc/xmloff/formlayerexport.hxx                                        |   37 -
 xmloff/inc/xmloff/formlayerimport.hxx                                        |   37 -
 xmloff/inc/xmloff/i18nmap.hxx                                                |   37 -
 xmloff/inc/xmloff/maptype.hxx                                                |   37 -
 xmloff/inc/xmloff/nmspmap.hxx                                                |   37 -
 xmloff/inc/xmloff/numehelp.hxx                                               |   37 -
 xmloff/inc/xmloff/shapeexport.hxx                                            |   37 -
 xmloff/inc/xmloff/shapeimport.hxx                                            |   37 -
 xmloff/inc/xmloff/styleexp.hxx                                               |   37 -
 xmloff/inc/xmloff/txtimp.hxx                                                 |   37 -
 xmloff/inc/xmloff/txtimppr.hxx                                               |   37 -
 xmloff/inc/xmloff/txtparae.hxx                                               |    1 
 xmloff/inc/xmloff/txtprmap.hxx                                               |   37 -
 xmloff/inc/xmloff/txtstyli.hxx                                               |   37 -
 xmloff/inc/xmloff/unoatrcn.hxx                                               |   37 -
 xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx                   |   18 
 xmloff/inc/xmloff/xmlaustp.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlcnimp.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlcnitm.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlerror.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlexp.hxx                                                 |   37 -
 xmloff/inc/xmloff/xmlexppr.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlictxt.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlimp.hxx                                                 |   51 -
 xmloff/inc/xmloff/xmlimppr.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlnmspe.hxx                                               |   37 -
 xmloff/inc/xmloff/xmlnume.hxx                                                |   37 -
 xmloff/inc/xmloff/xmlnumfi.hxx                                               |   37 -
 xmloff/inc/xmloff/xmluconv.hxx                                               |   37 -
 xmloff/qa/unoapi/knownissues.xcl                                             |   18 
 xmloff/source/chart/ColorPropertySet.cxx                                     |   37 -
 xmloff/source/chart/ColorPropertySet.hxx                                     |   37 -
 xmloff/source/chart/MultiPropertySetHandler.hxx                              |   37 -
 xmloff/source/chart/PropertyMap.hxx                                          |   37 -
 xmloff/source/chart/PropertyMaps.cxx                                         |   37 -
 xmloff/source/chart/SchXMLAutoStylePoolP.cxx                                 |   37 -
 xmloff/source/chart/SchXMLAxisContext.cxx                                    |   37 -
 xmloff/source/chart/SchXMLCalculationSettingsContext.cxx                     |   37 -
 xmloff/source/chart/SchXMLChartContext.cxx                                   |   37 -
 xmloff/source/chart/SchXMLChartContext.hxx                                   |   37 -
 xmloff/source/chart/SchXMLExport.cxx                                         |   37 -
 xmloff/source/chart/SchXMLImport.cxx                                         |   37 -
 xmloff/source/chart/SchXMLLegendContext.cxx                                  |   37 -
 xmloff/source/chart/SchXMLParagraphContext.cxx                               |   37 -
 xmloff/source/chart/SchXMLPlotAreaContext.cxx                                |   37 -
 xmloff/source/chart/SchXMLPlotAreaContext.hxx                                |   37 -
 xmloff/source/chart/SchXMLSeries2Context.cxx                                 |   37 -
 xmloff/source/chart/SchXMLSeries2Context.hxx                                 |   37 -
 xmloff/source/chart/SchXMLSeriesHelper.cxx                                   |   37 -
 xmloff/source/chart/SchXMLSeriesHelper.hxx                                   |   37 -
 xmloff/source/chart/SchXMLTableContext.cxx                                   |   37 -
 xmloff/source/chart/SchXMLTools.cxx                                          |   37 -
 xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx                           |   37 -
 xmloff/source/chart/XMLChartStyleContext.cxx                                 |   37 -
 xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx                         |   37 -
 xmloff/source/chart/XMLLabelSeparatorContext.cxx                             |   37 -
 xmloff/source/chart/XMLSymbolImageContext.cxx                                |   37 -
 xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx                             |   37 -
 xmloff/source/chart/transporttypes.hxx                                       |   37 -
 xmloff/source/core/DocumentSettingsContext.cxx                               |   37 -
 xmloff/source/core/DomBuilderContext.cxx                                     |   37 -
 xmloff/source/core/DomExport.cxx                                             |   37 -
 xmloff/source/core/ProgressBarHelper.cxx                                     |   37 -
 xmloff/source/core/RDFaExportHelper.cxx                                      |   37 -
 xmloff/source/core/RDFaImportHelper.cxx                                      |   37 -
 xmloff/source/core/SettingsExportHelper.cxx                                  |   37 -
 xmloff/source/core/XMLBase64Export.cxx                                       |   37 -
 xmloff/source/core/XMLBase64ImportContext.cxx                                |   37 -
 xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx                         |   37 -
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx                        |   37 -
 xmloff/source/core/attrlist.cxx                                              |   37 -
 xmloff/source/core/facreg.cxx                                                |   37 -
 xmloff/source/core/i18nmap.cxx                                               |   43 -
 xmloff/source/core/nmspmap.cxx                                               |   37 -
 xmloff/source/core/unoatrcn.cxx                                              |   37 -
 xmloff/source/core/xmlcnimp.cxx                                              |   43 -
 xmloff/source/core/xmlerror.cxx                                              |   37 -
 xmloff/source/core/xmlexp.cxx                                                |   37 -
 xmloff/source/core/xmlimp.cxx                                                |  141 +++-
 xmloff/source/core/xmltkmap.cxx                                              |   37 -
 xmloff/source/core/xmluconv.cxx                                              |   37 -
 xmloff/source/draw/EnhancedCustomShapeToken.cxx                              |   37 -
 xmloff/source/draw/XMLImageMapContext.cxx                                    |   37 -
 xmloff/source/draw/XMLImageMapExport.cxx                                     |   37 -
 xmloff/source/draw/XMLNumberStyles.cxx                                       |   37 -
 xmloff/source/draw/XMLReplacementImageContext.cxx                            |   37 -
 xmloff/source/draw/XMLShapeStyleContext.cxx                                  |   37 -
 xmloff/source/draw/animationexport.cxx                                       |   37 -
 xmloff/source/draw/animationimport.cxx                                       |   37 -
 xmloff/source/draw/animexp.cxx                                               |   37 -
 xmloff/source/draw/animimp.cxx                                               |   37 -
 xmloff/source/draw/descriptionimp.cxx                                        |   37 -
 xmloff/source/draw/eventimp.cxx                                              |   37 -
 xmloff/source/draw/layerexp.cxx                                              |   37 -
 xmloff/source/draw/layerimp.cxx                                              |   37 -
 xmloff/source/draw/propimp0.cxx                                              |   37 -
 xmloff/source/draw/sdxmlexp.cxx                                              |   37 -
 xmloff/source/draw/sdxmlexp_impl.hxx                                         |   37 -
 xmloff/source/draw/sdxmlimp.cxx                                              |   37 -
 xmloff/source/draw/sdxmlimp_impl.hxx                                         |   37 -
 xmloff/source/draw/shapeexport.cxx                                           |   41 -
 xmloff/source/draw/shapeexport3.cxx                                          |   37 -
 xmloff/source/draw/shapeexport4.cxx                                          |   37 -
 xmloff/source/draw/shapeimport.cxx                                           |   37 -
 xmloff/source/draw/xexptran.cxx                                              |   37 -
 xmloff/source/draw/ximp3dobject.cxx                                          |   37 -
 xmloff/source/draw/ximp3dobject.hxx                                          |   37 -
 xmloff/source/draw/ximp3dscene.cxx                                           |   37 -
 xmloff/source/draw/ximp3dscene.hxx                                           |   37 -
 xmloff/source/draw/ximpbody.cxx                                              |   37 -
 xmloff/source/draw/ximpcustomshape.cxx                                       |   37 -
 xmloff/source/draw/ximpgrp.cxx                                               |   37 -
 xmloff/source/draw/ximpgrp.hxx                                               |   37 -
 xmloff/source/draw/ximpnote.cxx                                              |   37 -
 xmloff/source/draw/ximppage.cxx                                              |   37 -
 xmloff/source/draw/ximpshap.cxx                                              |    4 
 xmloff/source/draw/ximpshow.cxx                                              |   37 -
 xmloff/source/draw/ximpstyl.cxx                                              |   37 -
 xmloff/source/draw/ximpstyl.hxx                                              |   37 -
 xmloff/source/forms/attriblistmerge.cxx                                      |   37 -
 xmloff/source/forms/callbacks.hxx                                            |   37 -
 xmloff/source/forms/controlpropertyhdl.cxx                                   |   37 -
 xmloff/source/forms/elementexport.cxx                                        |   37 -
 xmloff/source/forms/elementimport.cxx                                        |   37 -
 xmloff/source/forms/elementimport_impl.hxx                                   |   37 -
 xmloff/source/forms/eventexport.cxx                                          |   37 -
 xmloff/source/forms/eventimport.cxx                                          |   37 -
 xmloff/source/forms/formattributes.cxx                                       |   37 -
 xmloff/source/forms/formattributes.hxx                                       |   37 -
 xmloff/source/forms/formcellbinding.cxx                                      |   37 -
 xmloff/source/forms/formlayerexport.cxx                                      |   37 -
 xmloff/source/forms/formlayerimport.cxx                                      |   37 -
 xmloff/source/forms/gridcolumnproptranslator.cxx                             |   37 -
 xmloff/source/forms/handler/vcl_date_handler.cxx                             |   36 -
 xmloff/source/forms/handler/vcl_time_handler.cxx                             |   36 -
 xmloff/source/forms/layerexport.cxx                                          |   37 -
 xmloff/source/forms/layerexport.hxx                                          |   37 -
 xmloff/source/forms/layerimport.cxx                                          |   37 -
 xmloff/source/forms/layerimport.hxx                                          |   37 -
 xmloff/source/forms/officeforms.cxx                                          |   37 -
 xmloff/source/forms/property_meta_data.cxx                                   |   36 -
 xmloff/source/forms/propertyexport.cxx                                       |   37 -
 xmloff/source/forms/propertyexport.hxx                                       |   37 -
 xmloff/source/forms/propertyimport.cxx                                       |   37 -
 xmloff/source/forms/strings.hxx                                              |   37 -
 xmloff/source/forms/valueproperties.cxx                                      |   37 -
 xmloff/source/meta/MetaExportComponent.cxx                                   |   37 -
 xmloff/source/meta/MetaImportComponent.cxx                                   |   37 -
 xmloff/source/meta/xmlmetae.cxx                                              |   37 -
 xmloff/source/meta/xmlmetai.cxx                                              |   58 -
 xmloff/source/meta/xmlversion.cxx                                            |   37 -
 xmloff/source/script/XMLEventExport.cxx                                      |   37 -
 xmloff/source/script/XMLEventImportHelper.cxx                                |   37 -
 xmloff/source/script/XMLEventsImportContext.cxx                              |   37 -
 xmloff/source/script/XMLStarBasicExportHandler.cxx                           |   37 -
 xmloff/source/script/xmlbasici.cxx                                           |   37 -
 xmloff/source/script/xmlscripti.cxx                                          |   37 -
 xmloff/source/style/DashStyle.cxx                                            |   37 -
 xmloff/source/style/DrawAspectHdl.cxx                                        |   37 -
 xmloff/source/style/EnumPropertyHdl.cxx                                      |   37 -
 xmloff/source/style/FillStyleContext.cxx                                     |   37 -
 xmloff/source/style/GradientStyle.cxx                                        |   37 -
 xmloff/source/style/HatchStyle.cxx                                           |   37 -
 xmloff/source/style/ImageStyle.cxx                                           |   37 -
 xmloff/source/style/MarkerStyle.cxx                                          |   37 -
 xmloff/source/style/MultiPropertySetHelper.cxx                               |   37 -
 xmloff/source/style/PageMasterExportPropMapper.cxx                           |   53 -
 xmloff/source/style/PageMasterImportContext.cxx                              |   37 -
 xmloff/source/style/PageMasterImportPropMapper.cxx                           |   37 -
 xmloff/source/style/PageMasterImportPropMapper.hxx                           |   43 -
 xmloff/source/style/PageMasterPropHdl.cxx                                    |   37 -
 xmloff/source/style/PageMasterStyleMap.cxx                                   |   37 -
 xmloff/source/style/PagePropertySetContext.cxx                               |   37 -
 xmloff/source/style/SinglePropertySetInfoCache.cxx                           |   90 +-
 xmloff/source/style/StyleMap.cxx                                             |   37 -
 xmloff/source/style/TransGradientStyle.cxx                                   |   37 -
 xmloff/source/style/XMLBackgroundImageContext.cxx                            |   37 -
 xmloff/source/style/XMLBackgroundImageExport.cxx                             |   37 -
 xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx                 |   37 -
 xmloff/source/style/XMLClipPropertyHandler.cxx                               |   37 -
 xmloff/source/style/XMLConstantsPropertyHandler.cxx                          |   37 -
 xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx                     |   37 -
 xmloff/source/style/XMLFontAutoStylePool.cxx                                 |   37 -
 xmloff/source/style/XMLFontStylesContext.cxx                                 |   37 -
 xmloff/source/style/XMLFootnoteSeparatorExport.cxx                           |   37 -
 xmloff/source/style/XMLFootnoteSeparatorImport.cxx                           |   37 -
 xmloff/source/style/XMLIsPercentagePropertyHandler.cxx                       |   43 -
 xmloff/source/style/XMLPageExport.cxx                                        |   37 -
 xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx                   |   37 -
 xmloff/source/style/XMLRectangleMembersHandler.cxx                           |   37 -
 xmloff/source/style/adjushdl.cxx                                             |   37 -
 xmloff/source/style/backhdl.cxx                                              |   37 -
 xmloff/source/style/bordrhdl.cxx                                             |   37 -
 xmloff/source/style/cdouthdl.cxx                                             |   37 -
 xmloff/source/style/chrhghdl.cxx                                             |   37 -
 xmloff/source/style/chrlohdl.cxx                                             |   37 -
 xmloff/source/style/csmaphdl.cxx                                             |   37 -
 xmloff/source/style/durationhdl.cxx                                          |   37 -
 xmloff/source/style/escphdl.cxx                                              |   37 -
 xmloff/source/style/fonthdl.cxx                                              |   37 -
 xmloff/source/style/impastp1.cxx                                             |   37 -
 xmloff/source/style/impastp2.cxx                                             |   43 -
 xmloff/source/style/impastp3.cxx                                             |   37 -
 xmloff/source/style/impastp4.cxx                                             |   37 -
 xmloff/source/style/impastpl.hxx                                             |   37 -
 xmloff/source/style/kernihdl.cxx                                             |   37 -
 xmloff/source/style/lspachdl.cxx                                             |   37 -
 xmloff/source/style/numehelp.cxx                                             |   37 -
 xmloff/source/style/postuhdl.cxx                                             |   37 -
 xmloff/source/style/prhdlfac.cxx                                             |   37 -
 xmloff/source/style/prstylei.cxx                                             |   37 -
 xmloff/source/style/shadwhdl.cxx                                             |   37 -
 xmloff/source/style/styleexp.cxx                                             |   37 -
 xmloff/source/style/undlihdl.cxx                                             |   37 -
 xmloff/source/style/weighhdl.cxx                                             |   37 -
 xmloff/source/style/xmlaustp.cxx                                             |   37 -
 xmloff/source/style/xmlbahdl.cxx                                             |   37 -
 xmloff/source/style/xmlbahdl.hxx                                             |   37 -
 xmloff/source/style/xmlexppr.cxx                                             |   95 +--
 xmloff/source/style/xmlimppr.cxx                                             |   37 -
 xmloff/source/style/xmlnume.cxx                                              |   37 -
 xmloff/source/style/xmlnumfe.cxx                                             |   37 -
 xmloff/source/style/xmlnumfi.cxx                                             |   37 -
 xmloff/source/style/xmlnumi.cxx                                              |   37 -
 xmloff/source/style/xmlprmap.cxx                                             |   37 -
 xmloff/source/style/xmlstyle.cxx                                             |   37 -
 xmloff/source/style/xmltabe.cxx                                              |   37 -
 xmloff/source/style/xmltabi.cxx                                              |   37 -
 xmloff/source/table/XMLTableExport.cxx                                       |   37 -
 xmloff/source/table/XMLTableImport.cxx                                       |   37 -
 xmloff/source/text/XMLAutoTextEventExport.cxx                                |   37 -
 xmloff/source/text/XMLAutoTextEventExport.hxx                                |   37 -
 xmloff/source/text/XMLCalculationSettingsContext.cxx                         |   37 -
 xmloff/source/text/XMLChangedRegionImportContext.cxx                         |   37 -
 xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx                 |   37 -
 xmloff/source/text/XMLFootnoteImportContext.cxx                              |   37 -
 xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx                     |   37 -
 xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx              |   37 -
 xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx                       |   37 -
 xmloff/source/text/XMLIndexMarkExport.cxx                                    |   37 -
 xmloff/source/text/XMLIndexObjectSourceContext.cxx                           |   37 -
 xmloff/source/text/XMLIndexSourceBaseContext.cxx                             |   37 -
 xmloff/source/text/XMLIndexTOCContext.cxx                                    |   37 -
 xmloff/source/text/XMLIndexTOCSourceContext.cxx                              |   37 -
 xmloff/source/text/XMLIndexTOCStylesContext.cxx                              |   37 -
 xmloff/source/text/XMLIndexTabStopEntryContext.cxx                           |   37 -
 xmloff/source/text/XMLIndexTableSourceContext.cxx                            |   37 -
 xmloff/source/text/XMLIndexUserSourceContext.cxx                             |   37 -
 xmloff/source/text/XMLLineNumberingExport.cxx                                |   37 -
 xmloff/source/text/XMLLineNumberingImportContext.cxx                         |   37 -
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx                |   37 -
 xmloff/source/text/XMLPropertyBackpatcher.cxx                                |   37 -
 xmloff/source/text/XMLPropertyBackpatcher.hxx                                |   37 -
 xmloff/source/text/XMLRedlineExport.cxx                                      |   37 -
 xmloff/source/text/XMLSectionExport.cxx                                      |   37 -
 xmloff/source/text/XMLSectionFootnoteConfigExport.cxx                        |   37 -
 xmloff/source/text/XMLSectionFootnoteConfigImport.cxx                        |   37 -
 xmloff/source/text/XMLSectionImportContext.cxx                               |   37 -
 xmloff/source/text/XMLSectionSourceDDEImportContext.cxx                      |   37 -
 xmloff/source/text/XMLSectionSourceImportContext.cxx                         |   37 -
 xmloff/source/text/XMLTextColumnsContext.cxx                                 |   37 -
 xmloff/source/text/XMLTextColumnsExport.cxx                                  |   37 -
 xmloff/source/text/XMLTextFrameHyperlinkContext.cxx                          |   37 -
 xmloff/source/text/XMLTextHeaderFooterContext.cxx                            |   37 -
 xmloff/source/text/XMLTextListAutoStylePool.cxx                              |   37 -
 xmloff/source/text/XMLTextListBlockContext.cxx                               |   37 -
 xmloff/source/text/XMLTextListItemContext.cxx                                |   37 -
 xmloff/source/text/XMLTextMarkImportContext.cxx                              |   37 -
 xmloff/source/text/XMLTextMasterPageContext.cxx                              |   37 -
 xmloff/source/text/XMLTextNumRuleInfo.cxx                                    |   37 -
 xmloff/source/text/XMLTextPropertySetContext.cxx                             |   37 -
 xmloff/source/text/XMLTextShapeImportHelper.cxx                              |   37 -
 xmloff/source/text/XMLTrackedChangesImportContext.cxx                        |   37 -
 xmloff/source/text/txtdrope.cxx                                              |   37 -
 xmloff/source/text/txtdropi.cxx                                              |   37 -
 xmloff/source/text/txtexppr.cxx                                              |   42 -
 xmloff/source/text/txtflde.cxx                                               |   37 -
 xmloff/source/text/txtfldi.cxx                                               |   37 -
 xmloff/source/text/txtftne.cxx                                               |   37 -
 xmloff/source/text/txtimp.cxx                                                |   37 -
 xmloff/source/text/txtimppr.cxx                                              |   37 -
 xmloff/source/text/txtlists.cxx                                              |   37 -
 xmloff/source/text/txtparai.cxx                                              |   37 -
 xmloff/source/text/txtprhdl.cxx                                              |   37 -
 xmloff/source/text/txtprmap.cxx                                              |   37 -
 xmloff/source/text/txtsecte.cxx                                              |   37 -
 xmloff/source/text/txtstyle.cxx                                              |   37 -
 xmloff/source/text/txtstyli.cxx                                              |   37 -
 xmloff/source/text/txtvfldi.cxx                                              |   37 -
 xmloff/source/transform/ActionMapTypesOOo.hxx                                |   37 -
 xmloff/source/transform/AttrTransformerAction.hxx                            |   37 -
 xmloff/source/transform/ChartOASISTContext.cxx                               |   37 -
 xmloff/source/transform/ChartOOoTContext.cxx                                 |   37 -
 xmloff/source/transform/ChartPlotAreaOASISTContext.cxx                       |   37 -
 xmloff/source/transform/ChartPlotAreaOOoTContext.cxx                         |   37 -
 xmloff/source/transform/ControlOOoTContext.cxx                               |   37 -
 xmloff/source/transform/DocumentTContext.cxx                                 |   37 -
 xmloff/source/transform/EventOASISTContext.cxx                               |   37 -
 xmloff/source/transform/EventOOoTContext.cxx                                 |   37 -
 xmloff/source/transform/FormPropOOoTContext.cxx                              |   37 -
 xmloff/source/transform/FrameOASISTContext.cxx                               |   37 -
 xmloff/source/transform/IgnoreTContext.hxx                                   |   37 -
 xmloff/source/transform/MergeElemTContext.cxx                                |   37 -
 xmloff/source/transform/MetaTContext.hxx                                     |   37 -
 xmloff/source/transform/MutableAttrList.cxx                                  |   37 -
 xmloff/source/transform/OOo2Oasis.cxx                                        |   37 -
 xmloff/source/transform/Oasis2OOo.cxx                                        |   37 -
 xmloff/source/transform/PersAttrListTContext.hxx                             |   37 -
 xmloff/source/transform/PropertyActionsOOo.cxx                               |   37 -
 xmloff/source/transform/RenameElemTContext.cxx                               |   37 -
 xmloff/source/transform/StyleOASISTContext.cxx                               |   37 -
 xmloff/source/transform/StyleOOoTContext.cxx                                 |   37 -
 xmloff/source/transform/TransformerActionInit.hxx                            |   43 -
 xmloff/source/transform/TransformerActions.cxx                               |   37 -
 xmloff/source/transform/TransformerActions.hxx                               |   37 -
 xmloff/source/transform/TransformerBase.cxx                                  |   37 -
 xmloff/source/transform/TransformerContext.hxx                               |   37 -
 xmloff/source/transform/TransformerTokenMap.hxx                              |   43 -
 xmloff/source/transform/XMLFilterRegistration.cxx                            |   37 -
 xmloff/source/transform/xof.component                                        |   43 -
 xmloff/source/xforms/SchemaRestrictionContext.cxx                            |   37 -
 xmloff/source/xforms/SchemaSimpleTypeContext.cxx                             |   37 -
 xmloff/source/xforms/XFormsBindContext.cxx                                   |   37 -
 xmloff/source/xforms/XFormsInstanceContext.cxx                               |   37 -
 xmloff/source/xforms/XFormsModelContext.cxx                                  |   37 -
 xmloff/source/xforms/XFormsSubmissionContext.cxx                             |   37 -
 xmloff/source/xforms/xformsapi.cxx                                           |   37 -
 xmloff/source/xforms/xformsapi.hxx                                           |   37 -
 xmloff/source/xforms/xformsexport.cxx                                        |   37 -
 xmloff/source/xforms/xformsimport.cxx                                        |   37 -
 xmloff/util/xo.component                                                     |   43 -
 xmloff/xml/components.xml                                                    |   17 
 827 files changed, 13168 insertions(+), 18746 deletions(-)

New commits:
commit 17ff7b41d15ab9928e2e2706faa26234a09802cd
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Nov 12 17:21:24 2012 +0000

    re-base on ALv2 code. Includes:
    
        Patches contributed by: Armin Le Grand.
        #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task.
        http://svn.apache.org/viewvc?view=revision&revision=1195906
        #118485# - Styles for OLEs are not saved.
        http://svn.apache.org/viewvc?view=revision&revision=1182166
        #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles
        http://svn.apache.org/viewvc?view=revision&revision=1293316
        #119337# Solves the wrong get/setPropertyValue calls in
        SvxShapeText (and thus in SvxOle2Shape)
        http://svn.apache.org/viewvc?view=revision&revision=1344156
    
        Patches contributed by Mathias Bauer (and others)
        gnumake4 work variously
        http://svn.apache.org/viewvc?view=revision&revision=1394707
        http://svn.apache.org/viewvc?view=revision&revision=1394326
        cws mba34issues01: #i117717#: remove wrong assertion
        http://svn.apache.org/viewvc?view=revision&revision=1172349
    
        Patch contributed by Herbert Duerr
        goodbye Registration and License dialogs, don't let the door hit you
        http://svn.apache.org/viewvc?view=revision&revision=1172613
        help gcc 4.6.0 on 32bit ubuntu 11.10"
        http://svn.apache.org/viewvc?view=revision&revision=1245357
    
        Do not add targets for junit tests when junit is disabled.
        Patch contributed by Andre Fischer
        http://svn.apache.org/viewvc?view=revision&revision=1241508
    
    Revert "sb140: #i117082# avoid unncessary static class data members
        commit 21d97438e2944861e26e4984195f959a0cce1e41.
    remove obsolete FreeBSD visibility special case.
    retain consolidated BSD bridge code, remove OS/2 pieces.

diff --git a/bridges/Makefile b/bridges/Makefile
index ccb1c85..0997e62 100644
--- a/bridges/Makefile
+++ b/bridges/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/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 7e6350c..3fe9bc5 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.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 _BRIDGES_CPP_UNO_BRIDGE_HXX_
 #define _BRIDGES_CPP_UNO_BRIDGE_HXX_
 
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 6316f9a..e9c6551 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.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_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
 #define INCLUDED_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/call.s b/bridges/source/cpp_uno/cc50_solaris_intel/call.s
index 95bf796..a487491 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/call.s
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/call.s
@@ -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 .
+/
+
     .align 4
     .globl privateSnippetExecutorGeneral
 privateSnippetExecutorGeneral:
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
index 6b53496..7d2a0ea 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.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 <sal/alloca.h>
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
index 90254ed..f7c5514 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.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 <cstddef>
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
index 181f5d7..32330cc 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.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 <sal/alloca.h>
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/call.s b/bridges/source/cpp_uno/cc50_solaris_sparc/call.s
index be4027f..3bbb5f6 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/call.s
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/call.s
@@ -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 .
+!
+
 .global privateSnippetExecutor
 .type privateSnippetExecutor,2
 privateSnippetExecutor:
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
index f665852..fb00833 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.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 <sal/alloca.h>
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
index df832f8..a4a2f66 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.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 <cstddef>
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
index ee7efc2..20142dc 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.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 <sal/alloca.h>
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.s b/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.s
index 67c5aa3..26e4ed5 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.s
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.s
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * This file incorporates work covered by the following license notice:
  *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 .global callVirtualMethod
 .align 8
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.s b/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.s
index 92216d4..337ea4c 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.s
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.s
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * This file incorporates work covered by the following license notice:
  *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 .global fp_loadf0
 .align 8
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
index 6e0a261..abd3b23 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.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 "sal/config.h"
 
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.s b/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.s
index 01a22da..3e187e2 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.s
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.s
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * This file incorporates work covered by the following license notice:
  *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 .global vtableCall
 
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
index ca6b6a5..58863ec 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -1,31 +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 2008 by Sun Microsystems, Inc.
+ * 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 <com/sun/star/uno/genfunc.hxx>
 #include <uno/data.h>
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 817267c..5afea9d 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.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 2008 by Sun Microsystems, Inc.
+ * 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 <stdio.h>
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
index e3f8370..9d57bfa 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.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 2008 by Sun Microsystems, Inc.
+ * 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 "uno/mapping.h"
 
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
index 71fdc6c..dc21514 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
@@ -1,31 +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 2008 by Sun Microsystems, Inc.
+ * 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 <sys/types.h>
 #include <sys/malloc.h>
@@ -42,7 +32,6 @@
 #include <stdio.h>
 #include <string.h>
 
-
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
index f53bddd..0cc87fa 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.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 <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 3f551c9..aa66189 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.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 <stdio.h>
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/helper.s b/bridges/source/cpp_uno/gcc3_ios_arm/helper.s
index 9c5ada3..1221087 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/helper.s
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * This file incorporates work covered by the following license notice:
  *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include "codesnippets.S"
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/share.hxx b/bridges/source/cpp_uno/gcc3_ios_arm/share.hxx
index 06692bf..b2f679a 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/share.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 .
+ */
 
 #include "uno/mapping.h"
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
index e341285..471fc33 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.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 <stdio.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index eed34e3..765a9ef 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.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 <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 7dc3ab5..72774e3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.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 <stdio.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
index 27148dc..4eff3ff 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
@@ -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 .
+@
+
 @ ARM support code for OpenOffice C++/UNO bridging
 @
 @ Written by Peter Naulls <peter at chocky.org>
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 77d5e4a..4656e8b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.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 <malloc.h>
 #include <boost/unordered_map.hpp>
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index f84ffdc..f09e43d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.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 <stdio.h>
 #include <string.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index da36c75..e294243 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.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 _ARM_SHARE_HXX
 #define _ARM_SHARE_HXX
 #include "uno/mapping.h"
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 17d6f05..424adfa 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.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.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
  *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include <malloc.h>
 #include <rtl/alloc.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index e2d9f83..b9cdedf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.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 <malloc.h>
 #include <boost/unordered_map.hpp>
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 77a1250..5d20e79 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.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 <stdio.h>
 #include <string.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 12ba0f6..55cff35 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.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 <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 7dc3ab5..72774e3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.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 <stdio.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
index a3b3bc9..7b3dd84 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.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 <malloc.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
index cb4b574..af060de 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.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 "sal/config.h"
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
index 5159f94..924c4f8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX
 #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index aed05f3..e9958f5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.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 <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index d354a9d..c945c1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -1,34 +1,24 @@
 /* -*- 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.
- *
- ************************************************************************/
-
-
-#include <stdio.h>
-#include <string.h>
+ *   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 <cstdio>
+#include <cstring>
 #include <dlfcn.h>
 #include <boost/unordered_map.hpp>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
index dfa1bf9..e37df21 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.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 .
+ */
 
 #include "uno/mapping.h"
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 64d401b..ade3a0b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.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 defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 6cc5cce..e4c5be1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.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 <malloc.h>
 #include <boost/unordered_map.hpp>
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 77a1250..5d20e79 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.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.
  *

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list