[Libreoffice-commits] .: 8 commits - bridges/source dictionaries filter/source forms/qa forms/source forms/util helpcontent2 svx/AllLangResTarget_gal.mk svx/AllLangResTarget_ofa.mk svx/AllLangResTarget_svx.mk svx/AllLangResTarget_textconversiondlgs.mk svx/Executable_gengal.bin.mk svx/inc svx/JunitTest_svx_unoapi.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk svx/Module_svx.mk svx/Package_gengal.mk svx/Package_inc.mk svx/qa svx/sdi svx/source svx/util svx/workben svx/xml

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 27 04:55:49 PST 2012


 bridges/source/cpp_uno/shared/unointerfaceproxy.cxx                    |    1 
 dictionaries                                                           |    2 
 filter/source/msfilter/escherex.cxx                                    |    3 
 forms/qa/integration/forms/XMLFormSettings.java                        |   48 --
 forms/qa/org/openoffice/xforms/Instance.java                           |   35 -
 forms/qa/unoapi/forms.sce                                              |   19 
 forms/qa/unoapi/knownissues.xcl                                        |   24 -
 forms/source/component/Button.cxx                                      |   37 -
 forms/source/component/Button.hxx                                      |   37 -
 forms/source/component/CheckBox.cxx                                    |   37 -
 forms/source/component/Columns.cxx                                     |   37 -
 forms/source/component/Columns.hxx                                     |   37 -
 forms/source/component/ComboBox.cxx                                    |   37 -
 forms/source/component/ComboBox.hxx                                    |   37 -
 forms/source/component/Currency.cxx                                    |   37 -
 forms/source/component/DatabaseForm.cxx                                |   37 -
 forms/source/component/Date.cxx                                        |   37 -
 forms/source/component/Edit.cxx                                        |   37 -
 forms/source/component/EditBase.cxx                                    |   37 -
 forms/source/component/EventThread.cxx                                 |   37 -
 forms/source/component/EventThread.hxx                                 |   37 -
 forms/source/component/File.cxx                                        |   37 -
 forms/source/component/Filter.cxx                                      |   37 -
 forms/source/component/Filter.hxx                                      |   37 -
 forms/source/component/FormComponent.cxx                               |   37 -
 forms/source/component/FormattedField.cxx                              |   37 -
 forms/source/component/FormattedFieldWrapper.cxx                       |  228 ++++------
 forms/source/component/FormattedFieldWrapper.hxx                       |   55 +-
 forms/source/component/FormsCollection.cxx                             |   37 -
 forms/source/component/Grid.cxx                                        |   37 -
 forms/source/component/GroupBox.cxx                                    |   37 -
 forms/source/component/GroupManager.cxx                                |   37 -
 forms/source/component/GroupManager.hxx                                |   37 -
 forms/source/component/Hidden.cxx                                      |   37 -
 forms/source/component/ImageButton.cxx                                 |   37 -
 forms/source/component/ImageControl.cxx                                |   37 -
 forms/source/component/ListBox.cxx                                     |   37 -
 forms/source/component/ListBox.hxx                                     |   37 -
 forms/source/component/Numeric.cxx                                     |   37 -
 forms/source/component/Pattern.cxx                                     |   37 -
 forms/source/component/RadioButton.cxx                                 |   37 -
 forms/source/component/RadioButton.hxx                                 |   37 -
 forms/source/component/Time.cxx                                        |   37 -
 forms/source/component/clickableimage.cxx                              |   37 -
 forms/source/component/errorbroadcaster.cxx                            |   37 -
 forms/source/component/formcontrolfont.cxx                             |   37 -
 forms/source/component/imgprod.cxx                                     |   37 -
 forms/source/component/imgprod.hxx                                     |   37 -
 forms/source/component/refvaluecomponent.cxx                           |   37 -
 forms/source/component/scrollbar.cxx                                   |   37 -
 forms/source/component/spinbutton.cxx                                  |   37 -
 forms/source/helper/commandimageprovider.cxx                           |   36 -
 forms/source/helper/controlfeatureinterception.cxx                     |   37 -
 forms/source/helper/formnavigation.cxx                                 |   37 -
 forms/source/helper/urltransformer.cxx                                 |   37 -
 forms/source/helper/windowstateguard.cxx                               |   37 -
 forms/source/inc/FormComponent.hxx                                     |   37 -
 forms/source/inc/InterfaceContainer.hxx                                |   37 -
 forms/source/inc/commandimageprovider.hxx                              |   36 -
 forms/source/inc/controlfeatureinterception.hxx                        |   37 -
 forms/source/inc/featuredispatcher.hxx                                 |   37 -
 forms/source/inc/formnavigation.hxx                                    |   37 -
 forms/source/inc/forms_module_impl.hxx                                 |   18 
 forms/source/inc/frm_strings.hxx                                       |   37 -
 forms/source/inc/property.hrc                                          |   39 -
 forms/source/inc/property.hxx                                          |   37 -
 forms/source/inc/propertybaghelper.hxx                                 |   37 -
 forms/source/misc/InterfaceContainer.cxx                               |   37 -
 forms/source/misc/componenttools.cxx                                   |   37 -
 forms/source/misc/limitedformats.cxx                                   |   37 -
 forms/source/misc/listenercontainers.cxx                               |   43 -
 forms/source/misc/property.cxx                                         |   37 -
 forms/source/misc/services.cxx                                         |   37 -
 forms/source/resource/frm_resource.cxx                                 |   37 -
 forms/source/richtext/attributedispatcher.cxx                          |   37 -
 forms/source/richtext/featuredispatcher.cxx                            |   37 -
 forms/source/richtext/richtextcontrol.cxx                              |   37 -
 forms/source/richtext/richtextengine.hxx                               |   37 -
 forms/source/richtext/richtextimplcontrol.cxx                          |   37 -
 forms/source/richtext/richtextmodel.cxx                                |   37 -
 forms/source/richtext/richtextunowrapper.hxx                           |   37 -
 forms/source/richtext/richtextvclcontrol.cxx                           |   37 -
 forms/source/richtext/rtattributehandler.cxx                           |   37 -
 forms/source/richtext/rtattributehandler.hxx                           |   37 -
 forms/source/richtext/rtattributes.hxx                                 |   37 -
 forms/source/richtext/specialdispatchers.cxx                           |   37 -
 forms/source/richtext/textattributelistener.hxx                        |   43 -
 forms/source/runtime/formoperations.cxx                                |   37 -
 forms/source/solar/component/navbarcontrol.cxx                         |   37 -
 forms/source/solar/control/navtoolbar.cxx                              |   37 -
 forms/source/xforms/binding.cxx                                        |   37 -
 forms/source/xforms/binding.hxx                                        |   37 -
 forms/source/xforms/computedexpression.cxx                             |   37 -
 forms/source/xforms/computedexpression.hxx                             |   37 -
 forms/source/xforms/convert.cxx                                        |   37 -
 forms/source/xforms/datatyperepository.cxx                             |   37 -
 forms/source/xforms/datatypes.cxx                                      |   37 -
 forms/source/xforms/model.cxx                                          |   37 -
 forms/source/xforms/model.hxx                                          |   37 -
 forms/source/xforms/model_ui.cxx                                       |   37 -
 forms/source/xforms/pathexpression.cxx                                 |   37 -
 forms/source/xforms/propertysetbase.cxx                                |   37 -
 forms/source/xforms/propertysetbase.hxx                                |   37 -
 forms/source/xforms/resourcehelper.cxx                                 |   37 -
 forms/source/xforms/submission.cxx                                     |   37 -
 forms/source/xforms/submission/replace.cxx                             |   37 -
 forms/source/xforms/submission/serialization_app_xml.cxx               |  153 ++++--
 forms/source/xforms/submission/serialization_app_xml.hxx               |   44 -
 forms/source/xforms/submission/serialization_urlencoded.cxx            |   37 -
 forms/source/xforms/submission/submission.hxx                          |   37 -
 forms/source/xforms/submission/submission_get.cxx                      |   37 -
 forms/source/xforms/submission/submission_post.cxx                     |   37 -
 forms/source/xforms/submission/submission_put.cxx                      |   45 -
 forms/source/xforms/unohelper.cxx                                      |   37 -
 forms/source/xforms/xpathlib/extension.cxx                             |   37 -
 forms/source/xforms/xpathlib/xpathlib.cxx                              |   37 -
 forms/source/xforms/xpathlib/xpathlib.hxx                              |   18 
 forms/util/frm.component                                               |   43 -
 helpcontent2                                                           |    2 
 svx/AllLangResTarget_gal.mk                                            |   33 -
 svx/AllLangResTarget_ofa.mk                                            |   33 -
 svx/AllLangResTarget_svx.mk                                            |   33 -
 svx/AllLangResTarget_textconversiondlgs.mk                             |   33 -
 svx/Executable_gengal.bin.mk                                           |   33 -
 svx/JunitTest_svx_unoapi.mk                                            |   33 -
 svx/Library_svx.mk                                                     |   33 -
 svx/Library_svxcore.mk                                                 |   33 -
 svx/Library_textconversiondlgs.mk                                      |   33 -
 svx/Module_svx.mk                                                      |   35 -
 svx/Package_gengal.mk                                                  |   33 -
 svx/Package_inc.mk                                                     |   37 -
 svx/inc/dragmt3d.hxx                                                   |   37 -
 svx/inc/galbrws2.hxx                                                   |   37 -
 svx/inc/galtheme.hrc                                                   |   39 -
 svx/inc/globlmn_tmpl.hrc                                               |   44 -
 svx/inc/svdibrow.hxx                                                   |   37 -
 svx/inc/svx/AccessibleShapeTreeInfo.hxx                                |   37 -
 svx/inc/svx/AccessibleTextHelper.hxx                                   |   37 -
 svx/inc/svx/DescriptionGenerator.hxx                                   |   37 -
 svx/inc/svx/EnhancedCustomShape2d.hxx                                  |   37 -
 svx/inc/svx/IAccessibleViewForwarderListener.hxx                       |   37 -
 svx/inc/svx/ParseContext.hxx                                           |   37 -
 svx/inc/svx/ShapeTypeHandler.hxx                                       |   37 -
 svx/inc/svx/SmartTagItem.hxx                                           |   37 -
 svx/inc/svx/SvxShapeTypes.hxx                                          |   37 -
 svx/inc/svx/UnoNamespaceMap.hxx                                        |   43 -
 svx/inc/svx/XPropertyTable.hxx                                         |   43 -
 svx/inc/svx/algitem.hxx                                                |   37 -
 svx/inc/svx/anchorid.hxx                                               |   43 -
 svx/inc/svx/bmpmask.hxx                                                |   37 -
 svx/inc/svx/camera3d.hxx                                               |   37 -
 svx/inc/svx/charmap.hxx                                                |   37 -
 svx/inc/svx/checklbx.hxx                                               |   37 -
 svx/inc/svx/chrtitem.hxx                                               |   37 -
 svx/inc/svx/clipfmtitem.hxx                                            |   43 -
 svx/inc/svx/colrctrl.hxx                                               |   37 -
 svx/inc/svx/contdlg.hxx                                                |   37 -
 svx/inc/svx/ctredlin.hxx                                               |   37 -
 svx/inc/svx/cube3d.hxx                                                 |   39 -
 svx/inc/svx/dataaccessdescriptor.hxx                                   |   37 -
 svx/inc/svx/dbaexchange.hxx                                            |   37 -
 svx/inc/svx/dbaobjectex.hxx                                            |   37 -
 svx/inc/svx/dbtoolsclient.hxx                                          |   37 -
 svx/inc/svx/deflt3d.hxx                                                |   37 -
 svx/inc/svx/dialcontrol.hxx                                            |   37 -
 svx/inc/svx/dlgctl3d.hxx                                               |   37 -
 svx/inc/svx/dlgctrl.hxx                                                |   37 -
 svx/inc/svx/dlgutil.hxx                                                |   43 -
 svx/inc/svx/drawitem.hxx                                               |   37 -
 svx/inc/svx/dstribut_enum.hxx                                          |   43 -
 svx/inc/svx/e3ditem.hxx                                                |   37 -
 svx/inc/svx/e3dundo.hxx                                                |   37 -
 svx/inc/svx/extrud3d.hxx                                               |   37 -
 svx/inc/svx/extrusioncolorcontrol.hxx                                  |   43 -
 svx/inc/svx/f3dchild.hxx                                               |   43 -
 svx/inc/svx/fillctrl.hxx                                               |   37 -
 svx/inc/svx/float3d.hxx                                                |   37 -
 svx/inc/svx/fmdmod.hxx                                                 |   43 -
 svx/inc/svx/fmdpage.hxx                                                |   37 -
 svx/inc/svx/fmglob.hxx                                                 |   43 -
 svx/inc/svx/fmgridcl.hxx                                               |   37 -
 svx/inc/svx/fmgridif.hxx                                               |   37 -
 svx/inc/svx/fmmodel.hxx                                                |   37 -
 svx/inc/svx/fmpage.hxx                                                 |   37 -
 svx/inc/svx/fmsearch.hxx                                               |   37 -
 svx/inc/svx/fmshell.hxx                                                |   37 -
 svx/inc/svx/fmsrccfg.hxx                                               |   37 -
 svx/inc/svx/fmsrcimp.hxx                                               |   37 -
 svx/inc/svx/fmtools.hxx                                                |   37 -
 svx/inc/svx/fmview.hxx                                                 |   37 -
 svx/inc/svx/fntctrl.hxx                                                |   37 -
 svx/inc/svx/fontlb.hxx                                                 |   37 -
 svx/inc/svx/fontwork.hxx                                               |   37 -
 svx/inc/svx/fontworkgallery.hxx                                        |   37 -
 svx/inc/svx/framelink.hxx                                              |   37 -
 svx/inc/svx/framelinkarray.hxx                                         |   37 -
 svx/inc/svx/frmdirlbox.hxx                                             |   37 -
 svx/inc/svx/frmsel.hxx                                                 |   37 -
 svx/inc/svx/galbrws.hxx                                                |   37 -
 svx/inc/svx/gallery.hxx                                                |   38 -
 svx/inc/svx/gallery1.hxx                                               |   37 -
 svx/inc/svx/galmisc.hxx                                                |   37 -
 svx/inc/svx/galtheme.hxx                                               |   37 -
 svx/inc/svx/grafctrl.hxx                                               |   37 -
 svx/inc/svx/graphctl.hxx                                               |   37 -
 svx/inc/svx/graphichelper.hxx                                          |   44 -
 svx/inc/svx/grfcrop.hxx                                                |   37 -
 svx/inc/svx/gridctrl.hxx                                               |   37 -
 svx/inc/svx/hdft.hxx                                                   |   37 -
 svx/inc/svx/hlnkitem.hxx                                               |   37 -
 svx/inc/svx/imapdlg.hxx                                                |   37 -
 svx/inc/svx/insctrl.hxx                                                |   43 -
 svx/inc/svx/ipolypolygoneditorcontroller.hxx                           |   37 -
 svx/inc/svx/itemwin.hxx                                                |   37 -
 svx/inc/svx/langbox.hxx                                                |   37 -
 svx/inc/svx/lathe3d.hxx                                                |   39 -
 svx/inc/svx/layctrl.hxx                                                |   37 -
 svx/inc/svx/lboxctrl.hxx                                               |   37 -
 svx/inc/svx/linectrl.hxx                                               |   37 -
 svx/inc/svx/linkwarn.hxx                                               |   44 -
 svx/inc/svx/modctrl.hxx                                                |   43 -
 svx/inc/svx/numfmtsh.hxx                                               |   37 -
 svx/inc/svx/numinf.hxx                                                 |   37 -
 svx/inc/svx/obj3d.hxx                                                  |   37 -
 svx/inc/svx/objfac3d.hxx                                               |   43 -
 svx/inc/svx/ofaitem.hxx                                                |   37 -
 svx/inc/svx/optgrid.hxx                                                |   37 -
 svx/inc/svx/orienthelper.hxx                                           |   37 -
 svx/inc/svx/pageitem.hxx                                               |   37 -
 svx/inc/svx/paraprev.hxx                                               |   37 -
 svx/inc/svx/passwd.hxx                                                 |   37 -
 svx/inc/svx/pfiledlg.hxx                                               |   43 -
 svx/inc/svx/polygn3d.hxx                                               |   39 -
 svx/inc/svx/polysc3d.hxx                                               |   43 -
 svx/inc/svx/postattr.hxx                                               |   37 -
 svx/inc/svx/pszctrl.hxx                                                |   43 -
 svx/inc/svx/relfld.hxx                                                 |   43 -
 svx/inc/svx/rotmodit.hxx                                               |   43 -
 svx/inc/svx/rubydialog.hxx                                             |   37 -
 svx/inc/svx/ruler.hxx                                                  |   37 -
 svx/inc/svx/rulritem.hxx                                               |   37 -
 svx/inc/svx/scene3d.hxx                                                |   37 -
 svx/inc/svx/sdangitm.hxx                                               |   43 -
 svx/inc/svx/sdasaitm.hxx                                               |   37 -
 svx/inc/svx/sdasitm.hxx                                                |   37 -
 svx/inc/svx/sdggaitm.hxx                                               |   43 -
 svx/inc/svx/sdgmoitm.hxx                                               |   43 -
 svx/inc/svx/sdmetitm.hxx                                               |   43 -
 svx/inc/svx/sdooitm.hxx                                                |   43 -
 svx/inc/svx/sdprcitm.hxx                                               |   37 -
 svx/inc/svx/sdr/animation/scheduler.hxx                                |   37 -
 svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx                     |   37 -
 svx/inc/svx/sdr/attribute/sdrtextattribute.hxx                         |   37 -
 svx/inc/svx/sdr/contact/viewcontactofe3d.hxx                           |   37 -
 svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx                       |   37 -
 svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx                   |   37 -
 svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx             |   37 -
 svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx              |   37 -
 svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx                    |   37 -
 svx/inc/svx/sdr/overlay/overlaybitmapex.hxx                            |   37 -
 svx/inc/svx/sdr/overlay/overlayhatchrect.hxx                           |   37 -
 svx/inc/svx/sdr/overlay/overlayline.hxx                                |   43 -
 svx/inc/svx/sdr/overlay/overlaymanager.hxx                             |   37 -
 svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx                     |   37 -
 svx/inc/svx/sdr/overlay/overlayobjectlist.hxx                          |   37 -
 svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx                         |   43 -
 svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx                    |   37 -
 svx/inc/svx/sdr/overlay/overlaytriangle.hxx                            |   43 -
 svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx               |   37 -
 svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx                      |   43 -
 svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx                     |   37 -
 svx/inc/svx/sdr/properties/pageproperties.hxx                          |   37 -
 svx/inc/svx/sdr/properties/properties.hxx                              |   37 -
 svx/inc/svx/sdrobjectuser.hxx                                          |   43 -
 svx/inc/svx/sdrpageuser.hxx                                            |   43 -
 svx/inc/svx/sdrpagewindow.hxx                                          |   37 -
 svx/inc/svx/sdrpaintwindow.hxx                                         |   37 -
 svx/inc/svx/sdtaaitm.hxx                                               |   43 -
 svx/inc/svx/sdtaditm.hxx                                               |   43 -
 svx/inc/svx/sdtaitm.hxx                                                |   37 -
 svx/inc/svx/sdtakitm.hxx                                               |   37 -
 svx/inc/svx/sdtfchim.hxx                                               |   43 -
 svx/inc/svx/sdtfsitm.hxx                                               |   37 -
 svx/inc/svx/sdynitm.hxx                                                |   43 -
 svx/inc/svx/selctrl.hxx                                                |   43 -
 svx/inc/svx/simptabl.hxx                                               |   37 -
 svx/inc/svx/sphere3d.hxx                                               |   39 -
 svx/inc/svx/srchdlg.hxx                                                |   37 -
 svx/inc/svx/strarray.hxx                                               |   43 -
 svx/inc/svx/svdcrtv.hxx                                                |   37 -
 svx/inc/svx/svddrag.hxx                                                |   37 -
 svx/inc/svx/svddrgmt.hxx                                               |   37 -
 svx/inc/svx/svddrgv.hxx                                                |   37 -
 svx/inc/svx/svdedtv.hxx                                                |   37 -
 svx/inc/svx/svdedxv.hxx                                                |   37 -
 svx/inc/svx/svdetc.hxx                                                 |   37 -
 svx/inc/svx/svdglev.hxx                                                |   37 -
 svx/inc/svx/svdglue.hxx                                                |   37 -
 svx/inc/svx/svdhdl.hxx                                                 |   37 -
 svx/inc/svx/svdhlpln.hxx                                               |   37 -
 svx/inc/svx/svditer.hxx                                                |   37 -
 svx/inc/svx/svdlayer.hxx                                               |   37 -
 svx/inc/svx/svdmark.hxx                                                |   37 -
 svx/inc/svx/svdmodel.hxx                                               |   37 -
 svx/inc/svx/svdmrkv.hxx                                                |   37 -
 svx/inc/svx/svdoashp.hxx                                               |   39 -
 svx/inc/svx/svdobj.hxx                                                 |    8 
 svx/inc/svx/svdocapt.hxx                                               |   39 -
 svx/inc/svx/svdocirc.hxx                                               |   39 -
 svx/inc/svx/svdoedge.hxx                                               |   39 -
 svx/inc/svx/svdograf.hxx                                               |    6 
 svx/inc/svx/svdogrp.hxx                                                |   39 -
 svx/inc/svx/svdomeas.hxx                                               |   39 -
 svx/inc/svx/svdomedia.hxx                                              |   37 -
 svx/inc/svx/svdoole2.hxx                                               |   50 +-
 svx/inc/svx/svdopage.hxx                                               |   37 -
 svx/inc/svx/svdopath.hxx                                               |   39 -
 svx/inc/svx/svdorect.hxx                                               |   39 -
 svx/inc/svx/svdotable.hxx                                              |   37 -
 svx/inc/svx/svdotext.hxx                                               |   39 -
 svx/inc/svx/svdouno.hxx                                                |   37 -
 svx/inc/svx/svdovirt.hxx                                               |   37 -
 svx/inc/svx/svdpage.hxx                                                |   37 -
 svx/inc/svx/svdpagv.hxx                                                |   37 -
 svx/inc/svx/svdpntv.hxx                                                |   37 -
 svx/inc/svx/svdpoev.hxx                                                |   37 -
 svx/inc/svx/svdsnpv.hxx                                                |   37 -
 svx/inc/svx/svdsob.hxx                                                 |   37 -
 svx/inc/svx/svdtext.hxx                                                |   37 -
 svx/inc/svx/svdtrans.hxx                                               |   37 -
 svx/inc/svx/svdtypes.hxx                                               |   37 -
 svx/inc/svx/svdundo.hxx                                                |   37 -
 svx/inc/svx/svdview.hxx                                                |   37 -
 svx/inc/svx/svdviter.hxx                                               |   37 -
 svx/inc/svx/svx3ditems.hxx                                             |   37 -
 svx/inc/svx/svxdlg.hxx                                                 |   37 -
 svx/inc/svx/svxerr.hxx                                                 |   37 -
 svx/inc/svx/swframeposstrings.hxx                                      |   37 -
 svx/inc/svx/swframevalidation.hxx                                      |   37 -
 svx/inc/svx/sxcecitm.hxx                                               |   37 -
 svx/inc/svx/sxcikitm.hxx                                               |   43 -
 svx/inc/svx/sxctitm.hxx                                                |   43 -
 svx/inc/svx/sxekitm.hxx                                                |   43 -
 svx/inc/svx/sxelditm.hxx                                               |   43 -
 svx/inc/svx/sxenditm.hxx                                               |   37 -
 svx/inc/svx/sxfiitm.hxx                                                |   43 -
 svx/inc/svx/sxmkitm.hxx                                                |   43 -
 svx/inc/svx/sxmtpitm.hxx                                               |   37 -
 svx/inc/svx/sxmuitm.hxx                                                |   43 -
 svx/inc/svx/tabarea.hxx                                                |   43 -
 svx/inc/svx/tbcontrl.hxx                                               |   37 -
 svx/inc/svx/tbxcolorupdate.hxx                                         |   37 -
 svx/inc/svx/tbxctl.hxx                                                 |   43 -
 svx/inc/svx/txencbox.hxx                                               |   37 -
 svx/inc/svx/txenctab.hxx                                               |   43 -
 svx/inc/svx/unomaster.hxx                                              |   43 -
 svx/inc/svx/unomod.hxx                                                 |   43 -
 svx/inc/svx/unopage.hxx                                                |   37 -
 svx/inc/svx/unoprov.hxx                                                |   37 -
 svx/inc/svx/unoshtxt.hxx                                               |   37 -
 svx/inc/svx/verttexttbxctrl.hxx                                        |   37 -
 svx/inc/svx/view3d.hxx                                                 |   37 -
 svx/inc/svx/viewlayoutitem.hxx                                         |   43 -
 svx/inc/svx/viewpt3d.hxx                                               |   37 -
 svx/inc/svx/wrapfield.hxx                                              |   43 -
 svx/inc/svx/xbitmap.hxx                                                |   37 -
 svx/inc/svx/xbtmpit.hxx                                                |   37 -
 svx/inc/svx/xcolit.hxx                                                 |   43 -
 svx/inc/svx/xexch.hxx                                                  |   43 -
 svx/inc/svx/xfillit0.hxx                                               |   43 -
 svx/inc/svx/xflbmsxy.hxx                                               |   37 -
 svx/inc/svx/xflclit.hxx                                                |   43 -
 svx/inc/svx/xflftrit.hxx                                               |   43 -
 svx/inc/svx/xflgrit.hxx                                                |   37 -
 svx/inc/svx/xflhtit.hxx                                                |   37 -
 svx/inc/svx/xftadit.hxx                                                |   43 -
 svx/inc/svx/xftsfit.hxx                                                |   43 -
 svx/inc/svx/xftshcit.hxx                                               |   43 -
 svx/inc/svx/xftshit.hxx                                                |   43 -
 svx/inc/svx/xit.hxx                                                    |   37 -
 svx/inc/svx/xlineit.hxx                                                |   43 -
 svx/inc/svx/xlineit0.hxx                                               |   43 -
 svx/inc/svx/xlinjoit.hxx                                               |   43 -
 svx/inc/svx/xlnclit.hxx                                                |   43 -
 svx/inc/svx/xlndsit.hxx                                                |   39 -
 svx/inc/svx/xlnedcit.hxx                                               |   43 -
 svx/inc/svx/xlnedit.hxx                                                |   37 -
 svx/inc/svx/xlnedwit.hxx                                               |   43 -
 svx/inc/svx/xlnstcit.hxx                                               |   43 -
 svx/inc/svx/xlnstit.hxx                                                |   37 -
 svx/inc/svx/xlnstwit.hxx                                               |   43 -
 svx/inc/svx/xlnwtit.hxx                                                |   43 -
 svx/inc/svx/xmleohlp.hxx                                               |   37 -
 svx/inc/svx/xmlexchg.hxx                                               |   37 -
 svx/inc/svx/xmlgrhlp.hxx                                               |   37 -
 svx/inc/svx/xmlsecctrl.hxx                                             |   43 -
 svx/inc/svx/xoutbmp.hxx                                                |   37 -
 svx/inc/svx/xpoly.hxx                                                  |   37 -
 svx/inc/svx/xsflclit.hxx                                               |   43 -
 svx/inc/svx/xtable.hxx                                                 |   37 -
 svx/inc/svx/xtextit0.hxx                                               |   37 -
 svx/inc/svx/zoomctrl.hxx                                               |   43 -
 svx/inc/svx/zoomslideritem.hxx                                         |   43 -
 svx/inc/tbunosearchcontrollers.hxx                                     |   37 -
 svx/inc/xpolyimp.hxx                                                   |   37 -
 svx/qa/unoapi/knownissues.xcl                                          |   18 
 svx/sdi/svx.sdi                                                        |   37 -
 svx/sdi/svxitems.sdi                                                   |   37 -
 svx/source/accessibility/AccessibleControlShape.cxx                    |   37 -
 svx/source/accessibility/AccessibleEmptyEditSource.cxx                 |   37 -
 svx/source/accessibility/AccessibleFrameSelector.cxx                   |   37 -
 svx/source/accessibility/AccessibleShape.cxx                           |   37 -
 svx/source/accessibility/AccessibleShapeTreeInfo.cxx                   |   37 -
 svx/source/accessibility/AccessibleTextEventQueue.cxx                  |   37 -
 svx/source/accessibility/AccessibleTextEventQueue.hxx                  |   37 -
 svx/source/accessibility/AccessibleTextHelper.cxx                      |   37 -
 svx/source/accessibility/ChildrenManager.cxx                           |   37 -
 svx/source/accessibility/ChildrenManagerImpl.cxx                       |   37 -
 svx/source/accessibility/ChildrenManagerImpl.hxx                       |   37 -
 svx/source/accessibility/DescriptionGenerator.cxx                      |   37 -
 svx/source/accessibility/GraphCtlAccessibleContext.cxx                 |   37 -
 svx/source/accessibility/ShapeTypeHandler.cxx                          |   37 -
 svx/source/accessibility/SvxShapeTypes.cxx                             |   37 -
 svx/source/accessibility/charmapacc.cxx                                |   37 -
 svx/source/accessibility/lookupcolorname.cxx                           |   37 -
 svx/source/accessibility/lookupcolorname.hxx                           |   43 -
 svx/source/accessibility/svxrectctaccessiblecontext.cxx                |   37 -
 svx/source/core/coreservices.cxx                                       |   37 -
 svx/source/core/graphichelper.cxx                                      |   39 -
 svx/source/customshapes/EnhancedCustomShape2d.cxx                      |   37 -
 svx/source/customshapes/EnhancedCustomShape3d.cxx                      |   37 -
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx                  |   37 -
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx                |   37 -
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx          |   37 -
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx                |   39 -
 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx               |   37 -
 svx/source/customshapes/tbxcustomshapes.cxx                            |   37 -
 svx/source/dialog/SpellDialogChildWindow.cxx                           |   37 -
 svx/source/dialog/_contdlg.cxx                                         |   37 -
 svx/source/dialog/bmpmask.src                                          |   37 -
 svx/source/dialog/charmap.cxx                                          |   37 -
 svx/source/dialog/checklbx.cxx                                         |   37 -
 svx/source/dialog/connctrl.cxx                                         |   37 -
 svx/source/dialog/contdlg.src                                          |   37 -
 svx/source/dialog/contimp.hxx                                          |   37 -
 svx/source/dialog/contwnd.cxx                                          |   37 -
 svx/source/dialog/contwnd.hxx                                          |   37 -
 svx/source/dialog/ctredlin.cxx                                         |   37 -
 svx/source/dialog/ctredlin.src                                         |   45 -
 svx/source/dialog/dialcontrol.cxx                                      |   37 -
 svx/source/dialog/dialmgr.cxx                                          |   43 -
 svx/source/dialog/dlgctl3d.cxx                                         |   37 -
 svx/source/dialog/dlgctrl.cxx                                          |   37 -
 svx/source/dialog/dlgunit.hxx                                          |   44 -
 svx/source/dialog/docrecovery.cxx                                      |   37 -
 svx/source/dialog/docrecovery.src                                      |   37 -
 svx/source/dialog/fntctrl.cxx                                          |   37 -
 svx/source/dialog/fontlb.cxx                                           |   37 -
 svx/source/dialog/fontwork.cxx                                         |   37 -
 svx/source/dialog/fontwork.src                                         |   37 -
 svx/source/dialog/framelink.cxx                                        |   39 -
 svx/source/dialog/framelinkarray.cxx                                   |   37 -
 svx/source/dialog/frmdirlbox.cxx                                       |   37 -
 svx/source/dialog/frmsel.cxx                                           |   37 -
 svx/source/dialog/graphctl.cxx                                         |   37 -
 svx/source/dialog/grfflt.cxx                                           |   37 -
 svx/source/dialog/hdft.cxx                                             |   37 -
 svx/source/dialog/hdft.src                                             |   37 -
 svx/source/dialog/hyperdlg.cxx                                         |   37 -
 svx/source/dialog/imapdlg.cxx                                          |   37 -
 svx/source/dialog/imapdlg.src                                          |   37 -
 svx/source/dialog/imapimp.hxx                                          |   43 -
 svx/source/dialog/imapwnd.cxx                                          |   37 -
 svx/source/dialog/imapwnd.hxx                                          |   37 -
 svx/source/dialog/langbox.cxx                                          |   37 -
 svx/source/dialog/langbox.src                                          |   43 -
 svx/source/dialog/linkwarn.cxx                                         |   39 -
 svx/source/dialog/linkwarn.hrc                                         |   44 -
 svx/source/dialog/linkwarn.src                                         |   38 -
 svx/source/dialog/measctrl.cxx                                         |   37 -
 svx/source/dialog/optgrid.cxx                                          |   37 -
 svx/source/dialog/optgrid.src                                          |   37 -
 svx/source/dialog/orienthelper.cxx                                     |   37 -
 svx/source/dialog/pagectrl.cxx                                         |   37 -
 svx/source/dialog/paraprev.cxx                                         |   37 -
 svx/source/dialog/passwd.cxx                                           |   37 -
 svx/source/dialog/pfiledlg.cxx                                         |   37 -
 svx/source/dialog/prtqry.cxx                                           |   43 -
 svx/source/dialog/relfld.cxx                                           |   37 -
 svx/source/dialog/rlrcitem.cxx                                         |   37 -
 svx/source/dialog/rubydialog.cxx                                       |   37 -
 svx/source/dialog/ruler.src                                            |   37 -
 svx/source/dialog/rulritem.cxx                                         |   37 -
 svx/source/dialog/sdstring.src                                         |   49 +-
 svx/source/dialog/sendreportunx.cxx                                    |   37 -
 svx/source/dialog/sendreportw32.cxx                                    |   37 -
 svx/source/dialog/simptabl.cxx                                         |   37 -
 svx/source/dialog/srchdlg.cxx                                          |   37 -
 svx/source/dialog/srchdlg.src                                          |   37 -
 svx/source/dialog/stddlg.cxx                                           |   43 -
 svx/source/dialog/strarray.cxx                                         |   43 -
 svx/source/dialog/svxbmpnumvalueset.cxx                                |   37 -
 svx/source/dialog/svxruler.cxx                                         |   37 -
 svx/source/dialog/swframeexample.cxx                                   |   37 -
 svx/source/dialog/swframeposstrings.cxx                                |   43 -
 svx/source/dialog/txencbox.cxx                                         |   37 -
 svx/source/dialog/txenctab.cxx                                         |   37 -
 svx/source/dialog/ucsubset.src                                         |   37 -
 svx/source/dialog/wrapfield.cxx                                        |   43 -
 svx/source/engine3d/camera3d.cxx                                       |   37 -
 svx/source/engine3d/cube3d.cxx                                         |   39 -
 svx/source/engine3d/deflt3d.cxx                                        |   37 -
 svx/source/engine3d/dragmt3d.cxx                                       |   37 -
 svx/source/engine3d/e3dundo.cxx                                        |   37 -
 svx/source/engine3d/extrud3d.cxx                                       |   37 -
 svx/source/engine3d/float3d.cxx                                        |   37 -
 svx/source/engine3d/float3d.src                                        |   37 -
 svx/source/engine3d/helperhittest3d.cxx                                |   37 -
 svx/source/engine3d/lathe3d.cxx                                        |   39 -
 svx/source/engine3d/obj3d.cxx                                          |   37 -
 svx/source/engine3d/objfac3d.cxx                                       |   37 -
 svx/source/engine3d/polygn3d.cxx                                       |   39 -
 svx/source/engine3d/polysc3d.cxx                                       |   43 -
 svx/source/engine3d/scene3d.cxx                                        |   37 -
 svx/source/engine3d/sphere3d.cxx                                       |   39 -
 svx/source/engine3d/string3d.src                                       |   37 -
 svx/source/engine3d/svx3ditems.cxx                                     |   37 -
 svx/source/engine3d/view3d.cxx                                         |   37 -
 svx/source/engine3d/view3d1.cxx                                        |   37 -
 svx/source/engine3d/viewpt3d2.cxx                                      |   37 -
 svx/source/fmcomp/dbaexchange.cxx                                      |   37 -
 svx/source/fmcomp/dbaobjectex.cxx                                      |   37 -
 svx/source/fmcomp/fmgridcl.cxx                                         |   37 -
 svx/source/fmcomp/fmgridif.cxx                                         |   37 -
 svx/source/fmcomp/gridcell.cxx                                         |   37 -
 svx/source/fmcomp/gridcols.cxx                                         |   37 -
 svx/source/fmcomp/gridctrl.cxx                                         |   37 -
 svx/source/fmcomp/trace.cxx                                            |   37 -
 svx/source/fmcomp/xmlexchg.cxx                                         |   37 -
 svx/source/form/ParseContext.cxx                                       |   37 -
 svx/source/form/dataaccessdescriptor.cxx                               |   37 -
 svx/source/form/databaselocationinput.cxx                              |   37 -
 svx/source/form/datalistener.cxx                                       |   37 -
 svx/source/form/datanavi.cxx                                           |   37 -
 svx/source/form/datanavi.src                                           |   37 -
 svx/source/form/dbtoolsclient.cxx                                      |   37 -
 svx/source/form/filtnav.cxx                                            |   37 -
 svx/source/form/fmPropBrw.cxx                                          |   37 -
 svx/source/form/fmcontrolbordermanager.cxx                             |   37 -
 svx/source/form/fmcontrollayout.cxx                                    |   37 -
 svx/source/form/fmdmod.cxx                                             |   37 -
 svx/source/form/fmdocumentclassification.cxx                           |   37 -
 svx/source/form/fmdpage.cxx                                            |   37 -
 svx/source/form/fmexch.cxx                                             |   37 -
 svx/source/form/fmexpl.cxx                                             |   37 -
 svx/source/form/fmexpl.src                                             |   37 -
 svx/source/form/fmitems.cxx                                            |   43 -
 svx/source/form/fmmodel.cxx                                            |   37 -
 svx/source/form/fmobj.cxx                                              |   37 -
 svx/source/form/fmobjfac.cxx                                           |   37 -
 svx/source/form/fmpage.cxx                                             |   37 -
 svx/source/form/fmpgeimp.cxx                                           |   37 -
 svx/source/form/fmscriptingenv.cxx                                     |   37 -
 svx/source/form/fmshell.cxx                                            |   37 -
 svx/source/form/fmshimp.cxx                                            |   37 -
 svx/source/form/fmsrccfg.cxx                                           |   37 -
 svx/source/form/fmsrcimp.cxx                                           |   37 -
 svx/source/form/fmstring.src                                           |   37 -
 svx/source/form/fmtextcontrolfeature.cxx                               |   37 -
 svx/source/form/fmtextcontrolshell.cxx                                 |   37 -
 svx/source/form/fmtools.cxx                                            |   37 -
 svx/source/form/fmundo.cxx                                             |   37 -
 svx/source/form/fmview.cxx                                             |   37 -
 svx/source/form/fmvwimp.cxx                                            |   37 -
 svx/source/form/formcontrolfactory.cxx                                 |   36 -
 svx/source/form/formcontroller.cxx                                     |   37 -
 svx/source/form/formcontrolling.cxx                                    |   37 -
 svx/source/form/formfeaturedispatcher.cxx                              |   37 -
 svx/source/form/formtoolbars.cxx                                       |   37 -
 svx/source/form/legacyformcontroller.cxx                               |   36 -
 svx/source/form/navigatortree.cxx                                      |   37 -
 svx/source/form/navigatortreemodel.cxx                                 |   37 -
 svx/source/form/tabwin.cxx                                             |   37 -
 svx/source/form/tbxform.cxx                                            |   37 -
 svx/source/form/xfm_addcondition.cxx                                   |   37 -
 svx/source/gallery2/codec.cxx                                          |   41 -
 svx/source/gallery2/galbrws.cxx                                        |   49 +-
 svx/source/gallery2/galbrws1.cxx                                       |   37 -
 svx/source/gallery2/galbrws1.hxx                                       |   37 -
 svx/source/gallery2/galbrws2.cxx                                       |   52 +-
 svx/source/gallery2/galctrl.cxx                                        |   51 +-
 svx/source/gallery2/galexpl.cxx                                        |   37 -
 svx/source/gallery2/gallery.src                                        |   37 -
 svx/source/gallery2/gallery1.cxx                                       |   44 -
 svx/source/gallery2/galmisc.cxx                                        |   45 -
 svx/source/gallery2/galobj.cxx                                         |   47 +-
 svx/source/gallery2/galtheme.cxx                                       |   42 -
 svx/source/gallery2/galtheme.src                                       |   45 -
 svx/source/inc/GraphCtlAccessibleContext.hxx                           |   37 -
 svx/source/inc/clonelist.hxx                                           |   43 -
 svx/source/inc/datanavi.hxx                                            |   37 -
 svx/source/inc/docrecovery.hxx                                         |   37 -
 svx/source/inc/filtnav.hxx                                             |   37 -
 svx/source/inc/fmexpl.hxx                                              |   37 -
 svx/source/inc/fmitems.hxx                                             |   43 -
 svx/source/inc/fmobj.hxx                                               |   37 -
 svx/source/inc/fmpgeimp.hxx                                            |   37 -
 svx/source/inc/fmshimp.hxx                                             |   37 -
 svx/source/inc/fmslotinvalidator.hxx                                   |   43 -
 svx/source/inc/fmtextcontrolshell.hxx                                  |   37 -
 svx/source/inc/fmundo.hxx                                              |   37 -
 svx/source/inc/fmvwimp.hxx                                             |   37 -
 svx/source/inc/formcontroller.hxx                                      |   37 -
 svx/source/inc/formcontrolling.hxx                                     |   37 -
 svx/source/inc/formdispatchinterceptor.hxx                             |   36 -
 svx/source/inc/formfeaturedispatcher.hxx                               |   37 -
 svx/source/inc/frmselimpl.hxx                                          |   37 -
 svx/source/inc/gridcell.hxx                                            |   37 -
 svx/source/inc/sqlparserclient.hxx                                     |   37 -
 svx/source/inc/svxrectctaccessiblecontext.hxx                          |   37 -
 svx/source/inc/trace.hxx                                               |   43 -
 svx/source/inc/xmlxtexp.hxx                                            |   37 -
 svx/source/inc/xmlxtimp.hxx                                            |   43 -
 svx/source/items/SmartTagItem.cxx                                      |   37 -
 svx/source/items/algitem.cxx                                           |   37 -
 svx/source/items/chrtitem.cxx                                          |   37 -
 svx/source/items/clipfmtitem.cxx                                       |   37 -
 svx/source/items/customshapeitem.cxx                                   |   37 -
 svx/source/items/drawitem.cxx                                          |   37 -
 svx/source/items/e3ditem.cxx                                           |   37 -
 svx/source/items/grfitem.cxx                                           |   37 -
 svx/source/items/hlnkitem.cxx                                          |   37 -
 svx/source/items/numfmtsh.cxx                                          |   37 -
 svx/source/items/numinf.cxx                                            |   37 -
 svx/source/items/ofaitem.cxx                                           |   43 -
 svx/source/items/pageitem.cxx                                          |   37 -
 svx/source/items/postattr.cxx                                          |   37 -
 svx/source/items/rotmodit.cxx                                          |   37 -
 svx/source/items/svxerr.cxx                                            |   43 -
 svx/source/items/svxerr.src                                            |   37 -
 svx/source/items/svxitems.src                                          |   39 -
 svx/source/items/viewlayoutitem.cxx                                    |   37 -
 svx/source/items/zoomslideritem.cxx                                    |   37 -
 svx/source/mnuctrls/SmartTagCtl.cxx                                    |   37 -
 svx/source/sdr/animation/scheduler.cxx                                 |   37 -
 svx/source/sdr/attribute/sdrfilltextattribute.cxx                      |   37 -
 svx/source/sdr/attribute/sdrtextattribute.cxx                          |   37 -
 svx/source/sdr/contact/objectcontact.cxx                               |   37 -
 svx/source/sdr/contact/viewcontact.cxx                                 |   37 -
 svx/source/sdr/contact/viewcontactofe3d.cxx                            |   37 -
 svx/source/sdr/contact/viewcontactofe3dscene.cxx                       |   37 -
 svx/source/sdr/contact/viewcontactofpageobj.cxx                        |   37 -
 svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx                    |   37 -
 svx/source/sdr/contact/viewcontactofsdrobj.cxx                         |   37 -
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx              |   37 -
 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx                     |   37 -
 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx                  |   37 -
 svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx              |   37 -
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx               |   37 -
 svx/source/sdr/event/eventhandler.cxx                                  |   37 -
 svx/source/sdr/overlay/overlayanimatedbitmapex.cxx                     |   37 -
 svx/source/sdr/overlay/overlaybitmapex.cxx                             |   37 -
 svx/source/sdr/overlay/overlayhatchrect.cxx                            |   37 -
 svx/source/sdr/overlay/overlayline.cxx                                 |   37 -
 svx/source/sdr/overlay/overlaymanager.cxx                              |   37 -
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx                      |   37 -
 svx/source/sdr/overlay/overlayobject.cxx                               |   37 -
 svx/source/sdr/overlay/overlayobjectlist.cxx                           |   37 -
 svx/source/sdr/overlay/overlaypolypolygon.cxx                          |   37 -
 svx/source/sdr/overlay/overlayrollingrectangle.cxx                     |   37 -
 svx/source/sdr/overlay/overlaytools.cxx                                |   37 -
 svx/source/sdr/overlay/overlaytriangle.cxx                             |   37 -
 svx/source/sdr/primitive2d/sdrole2primitive2d.cxx                      |   39 -
 svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx                |   37 -
 svx/source/sdr/primitive2d/sdrprimitivetools.cxx                       |   37 -
 svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx                      |   37 -
 svx/source/sdr/properties/attributeproperties.cxx                      |   39 -
 svx/source/sdr/properties/defaultproperties.cxx                        |   37 -
 svx/source/sdr/properties/pageproperties.cxx                           |   37 -
 svx/source/sdr/properties/properties.cxx                               |   37 -
 svx/source/sdr/properties/textproperties.cxx                           |   37 -
 svx/source/src/app.hrc                                                 |   39 -
 svx/source/src/app.src                                                 |   37 -
 svx/source/src/errtxt.src                                              |   37 -
 svx/source/stbctrls/insctrl.cxx                                        |   37 -
 svx/source/stbctrls/modctrl.cxx                                        |   37 -
 svx/source/stbctrls/pszctrl.cxx                                        |   37 -
 svx/source/stbctrls/selctrl.cxx                                        |   37 -
 svx/source/stbctrls/stbctrls.src                                       |   37 -
 svx/source/stbctrls/xmlsecctrl.cxx                                     |   37 -
 svx/source/stbctrls/zoomctrl.cxx                                       |   37 -
 svx/source/stbctrls/zoomsliderctrl.cxx                                 |   37 -
 svx/source/svdraw/clonelist.cxx                                        |   37 -
 svx/source/svdraw/polypolygoneditor.cxx                                |   37 -
 svx/source/svdraw/sdrpagewindow.cxx                                    |   37 -
 svx/source/svdraw/sdrpaintwindow.cxx                                   |   37 -
 svx/source/svdraw/svdattr.cxx                                          |   37 -
 svx/source/svdraw/svdcrtv.cxx                                          |   37 -
 svx/source/svdraw/svddrag.cxx                                          |   37 -
 svx/source/svdraw/svddrgm1.hxx                                         |   37 -
 svx/source/svdraw/svddrgv.cxx                                          |   37 -
 svx/source/svdraw/svdedtv1.cxx                                         |   37 -
 svx/source/svdraw/svdedxv.cxx                                          |   37 -
 svx/source/svdraw/svdetc.cxx                                           |   37 -
 svx/source/svdraw/svdglev.cxx                                          |   37 -
 svx/source/svdraw/svdglue.cxx                                          |   37 -
 svx/source/svdraw/svdhdl.cxx                                           |   37 -
 svx/source/svdraw/svdhlpln.cxx                                         |   37 -
 svx/source/svdraw/svdibrow.cxx                                         |   37 -
 svx/source/svdraw/svditer.cxx                                          |   37 -
 svx/source/svdraw/svdlayer.cxx                                         |   37 -
 svx/source/svdraw/svdmark.cxx                                          |   37 -
 svx/source/svdraw/svdmodel.cxx                                         |   37 -
 svx/source/svdraw/svdmrkv.cxx                                          |   49 +-
 svx/source/svdraw/svdmrkv1.cxx                                         |   37 -
 svx/source/svdraw/svdoashp.cxx                                         |   43 -
 svx/source/svdraw/svdoattr.cxx                                         |   37 -
 svx/source/svdraw/svdobj.cxx                                           |    5 
 svx/source/svdraw/svdocapt.cxx                                         |   41 -
 svx/source/svdraw/svdocirc.cxx                                         |   45 -
 svx/source/svdraw/svdoedge.cxx                                         |   45 -
 svx/source/svdraw/svdograf.cxx                                         |   13 
 svx/source/svdraw/svdogrp.cxx                                          |   41 -
 svx/source/svdraw/svdomeas.cxx                                         |   48 +-
 svx/source/svdraw/svdomedia.cxx                                        |   37 -
 svx/source/svdraw/svdoole2.cxx                                         |  220 ++++++---
 svx/source/svdraw/svdopage.cxx                                         |   37 -
 svx/source/svdraw/svdopath.cxx                                         |   44 -
 svx/source/svdraw/svdorect.cxx                                         |    6 
 svx/source/svdraw/svdotext.cxx                                         |   37 -
 svx/source/svdraw/svdotextdecomposition.cxx                            |   37 -
 svx/source/svdraw/svdotextpathdecomposition.cxx                        |   37 -
 svx/source/svdraw/svdotxat.cxx                                         |   37 -
 svx/source/svdraw/svdotxdr.cxx                                         |   37 -
 svx/source/svdraw/svdotxed.cxx                                         |   37 -
 svx/source/svdraw/svdotxfl.cxx                                         |   43 -
 svx/source/svdraw/svdotxln.cxx                                         |   37 -
 svx/source/svdraw/svdotxtr.cxx                                         |   46 --
 svx/source/svdraw/svdouno.cxx                                          |   37 -
 svx/source/svdraw/svdoutl.cxx                                          |   37 -
 svx/source/svdraw/svdoutlinercache.cxx                                 |   37 -
 svx/source/svdraw/svdovirt.cxx                                         |   37 -
 svx/source/svdraw/svdpage.cxx                                          |   37 -
 svx/source/svdraw/svdpagv.cxx                                          |   37 -
 svx/source/svdraw/svdpntv.cxx                                          |   37 -
 svx/source/svdraw/svdpoev.cxx                                          |   37 -
 svx/source/svdraw/svdsnpv.cxx                                          |   37 -
 svx/source/svdraw/svdtext.cxx                                          |   37 -
 svx/source/svdraw/svdtrans.cxx                                         |   37 -
 svx/source/svdraw/svdundo.cxx                                          |   37 -
 svx/source/svdraw/svdview.cxx                                          |   37 -
 svx/source/svdraw/svdviter.cxx                                         |   37 -
 svx/source/table/accessiblecell.cxx                                    |   37 -
 svx/source/table/accessiblecell.hxx                                    |   37 -
 svx/source/table/accessibletableshape.cxx                              |   37 -
 svx/source/table/cell.cxx                                              |   37 -
 svx/source/table/cell.hxx                                              |   37 -
 svx/source/table/cellcursor.cxx                                        |   37 -
 svx/source/table/celltypes.hxx                                         |   37 -
 svx/source/table/propertyset.cxx                                       |   37 -
 svx/source/table/propertyset.hxx                                       |   37 -
 svx/source/table/svdotable.cxx                                         |   37 -
 svx/source/table/tablecolumn.cxx                                       |   37 -
 svx/source/table/tablecontroller.cxx                                   |   37 -
 svx/source/table/tablecontroller.hxx                                   |   37 -
 svx/source/table/tabledesign.cxx                                       |   37 -
 svx/source/table/tablehandles.cxx                                      |   37 -
 svx/source/table/tablelayouter.cxx                                     |   37 -
 svx/source/table/tablelayouter.hxx                                     |   37 -
 svx/source/table/tablemodel.cxx                                        |   43 -
 svx/source/table/tablemodel.hxx                                        |   37 -
 svx/source/table/tablerow.cxx                                          |   37 -
 svx/source/table/tablertfexporter.cxx                                  |   37 -
 svx/source/table/tablertfimporter.cxx                                  |   37 -
 svx/source/table/tableundo.hxx                                         |   37 -
 svx/source/table/viewcontactoftableobj.cxx                             |   37 -
 svx/source/tbxctrls/colorwindow.hxx                                    |   18 
 svx/source/tbxctrls/colrctrl.cxx                                       |   37 -
 svx/source/tbxctrls/extrusioncontrols.cxx                              |   37 -
 svx/source/tbxctrls/extrusioncontrols.hxx                              |   37 -
 svx/source/tbxctrls/extrusioncontrols.src                              |   37 -
 svx/source/tbxctrls/fillctrl.cxx                                       |   37 -
 svx/source/tbxctrls/fontworkgallery.cxx                                |   37 -
 svx/source/tbxctrls/fontworkgallery.src                                |   37 -
 svx/source/tbxctrls/formatpaintbrushctrl.cxx                           |   37 -
 svx/source/tbxctrls/itemwin.cxx                                        |   37 -
 svx/source/tbxctrls/layctrl.cxx                                        |   37 -
 svx/source/tbxctrls/lboxctrl.cxx                                       |   37 -
 svx/source/tbxctrls/lboxctrl.src                                       |   43 -
 svx/source/tbxctrls/linectrl.cxx                                       |   37 -
 svx/source/tbxctrls/tbcontrl.cxx                                       |   37 -
 svx/source/tbxctrls/tbcontrl.src                                       |   37 -
 svx/source/tbxctrls/tbunocontroller.cxx                                |   37 -
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                         |   37 -
 svx/source/tbxctrls/tbxalign.cxx                                       |   37 -
 svx/source/tbxctrls/tbxcolor.cxx                                       |   37 -
 svx/source/tbxctrls/tbxcolorupdate.cxx                                 |   37 -
 svx/source/tbxctrls/verttexttbxctrl.cxx                                |   37 -
 svx/source/toolbars/extrusionbar.cxx                                   |   37 -
 svx/source/toolbars/fontworkbar.cxx                                    |   37 -
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx  |   37 -
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx  |   37 -
 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx |   37 -
 svx/source/unodialogs/textconversiondlgs/services.cxx                  |   43 -
 svx/source/unodraw/UnoGraphicExporter.cxx                              |   44 -
 svx/source/unodraw/UnoNameItemTable.cxx                                |   37 -
 svx/source/unodraw/UnoNamespaceMap.cxx                                 |   37 -
 svx/source/unodraw/XPropertyTable.cxx                                  |   37 -
 svx/source/unodraw/recoveryui.cxx                                      |   37 -
 svx/source/unodraw/shapeimpl.hxx                                       |   37 -
 svx/source/unodraw/shapepropertynotifier.cxx                           |   36 -
 svx/source/unodraw/tableshape.cxx                                      |   37 -
 svx/source/unodraw/unoctabl.cxx                                        |   37 -
 svx/source/unodraw/unomod.cxx                                          |   37 -
 svx/source/unodraw/unomtabl.cxx                                        |   37 -
 svx/source/unodraw/unopage.cxx                                         |   37 -
 svx/source/unodraw/unopool.cxx                                         |   37 -
 svx/source/unodraw/unoshap3.cxx                                        |   37 -
 svx/source/unodraw/unoshcol.cxx                                        |   37 -
 svx/source/unodraw/unoshtxt.cxx                                        |   37 -
 svx/source/unogallery/unogalitem.cxx                                   |   37 -
 svx/source/unogallery/unogaltheme.cxx                                  |   47 --
 svx/source/unogallery/unogalthemeprovider.cxx                          |   37 -
 svx/source/xml/xmleohlp.cxx                                            |   37 -
 svx/source/xml/xmlexport.cxx                                           |   37 -
 svx/source/xml/xmlxtexp.cxx                                            |   37 -
 svx/source/xml/xmlxtimp.cxx                                            |   37 -
 svx/source/xoutdev/_xoutbmp.cxx                                        |   37 -
 svx/source/xoutdev/_xpoly.cxx                                          |   37 -
 svx/source/xoutdev/xattr.cxx                                           |   39 -
 svx/source/xoutdev/xattrbmp.cxx                                        |   37 -
 svx/source/xoutdev/xexch.cxx                                           |   37 -
 svx/source/xoutdev/xtabbtmp.cxx                                        |   37 -
 svx/source/xoutdev/xtabcolr.cxx                                        |   37 -
 svx/source/xoutdev/xtabdash.cxx                                        |   37 -
 svx/source/xoutdev/xtabgrdt.cxx                                        |   37 -
 svx/source/xoutdev/xtabhtch.cxx                                        |   37 -
 svx/source/xoutdev/xtable.cxx                                          |   37 -
 svx/source/xoutdev/xtablend.cxx                                        |   37 -
 svx/util/svx.component                                                 |   43 -
 svx/util/svxcore.component                                             |   43 -
 svx/util/textconversiondlgs.component                                  |   43 -
 svx/workben/edittest.cxx                                               |   37 -
 svx/workben/msview/makefile.mk                                         |   33 -
 svx/workben/msview/msview.cxx                                          |   37 -
 svx/workben/msview/msview.xml                                          |   17 
 svx/workben/msview/xmlconfig.cxx                                       |   37 -
 svx/xml/AccessibleControlShape.xml                                     |   17 
 svx/xml/AccessibleEditableTextPara.xml                                 |   17 
 svx/xml/AccessibleGraphicShape.xml                                     |   17 
 svx/xml/AccessibleImageBullet.xml                                      |   17 
 svx/xml/AccessibleOLEShape.xml                                         |   17 
 svx/xml/AccessibleShape.xml                                            |   17 
 svx/xml/SvxDrawPage.xml                                                |   17 
 svx/xml/SvxGraphCtrlAccessibleContext.xml                              |   17 
 svx/xml/SvxGraphicExporter.xml                                         |   17 
 svx/xml/SvxGraphicObject.xml                                           |   17 
 svx/xml/SvxShape.xml                                                   |   17 
 svx/xml/SvxShapeCircle.xml                                             |   17 
 svx/xml/SvxShapeCollection.xml                                         |   17 
 svx/xml/SvxShapeConnector.xml                                          |   17 
 svx/xml/SvxShapeControl.xml                                            |   17 
 svx/xml/SvxShapeDimensioning.xml                                       |   17 
 svx/xml/SvxShapeGroup.xml                                              |   17 
 svx/xml/SvxShapePolyPolygon.xml                                        |   17 
 svx/xml/SvxShapePolyPolygonBezier.xml                                  |   17 
 svx/xml/SvxUnoNumberingRules.xml                                       |   17 
 svx/xml/SvxUnoText.xml                                                 |   17 
 svx/xml/SvxUnoTextContent.xml                                          |   17 
 svx/xml/SvxUnoTextContentEnum.xml                                      |   17 
 svx/xml/SvxUnoTextCursor.xml                                           |   17 
 svx/xml/SvxUnoTextField.xml                                            |   17 
 svx/xml/SvxUnoTextRange.xml                                            |   17 
 svx/xml/SvxUnoTextRangeEnumeration.xml                                 |   17 
 874 files changed, 13038 insertions(+), 19717 deletions(-)

New commits:
commit e5e8136c6a7f1c30ec733b7bd0992c5d8007b260
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Nov 21 20:10:24 2012 +0000

    re-factor lifecycle issues in FormattedFieldWrapper.
    
    XAggregation.idl has some rather helpful comments on how this
    should work.

diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index b82ebfd..9672f3c 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 780367a..74221d2 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -45,97 +45,98 @@ using namespace ::com::sun::star::util;
 // OFormattedFieldWrapper
 //==================================================================
 DBG_NAME(OFormattedFieldWrapper)
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance_ForceFormatted(const Reference<XMultiServiceFactory>& _rxFactory)
 {
-    return *(new OFormattedFieldWrapper(_rxFactory, sal_True));
+    return OFormattedFieldWrapper::createFormattedFieldWrapper(_rxFactory, true);
 }
 
-//------------------------------------------------------------------
 InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
-    return *(new OFormattedFieldWrapper(_rxFactory, sal_False));
+    return OFormattedFieldWrapper::createFormattedFieldWrapper(_rxFactory, false);
 }
 
-//------------------------------------------------------------------
-OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XMultiServiceFactory>& _rxFactory, sal_Bool _bActAsFormatted)
+OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XMultiServiceFactory>& _rxFactory)
     :m_xServiceFactory(_rxFactory)
-    ,m_pEditPart(NULL)
 {
     DBG_CTOR(OFormattedFieldWrapper, NULL);
+}
+
+InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, bool bActAsFormatted)
+{
+    OFormattedFieldWrapper *pRef = new OFormattedFieldWrapper(_rxFactory);
 
-    if (_bActAsFormatted)
+    if (bActAsFormatted)
     {
-        increment(m_refCount);
-        {
-            // instantiate an FormattedModel
-            InterfaceRef  xFormattedModel;
-            // (instantiate it directly ..., as the OFormattedModel isn't registered for any service names anymore)
-            OFormattedModel* pModel = new OFormattedModel(m_xServiceFactory);
-            query_interface(static_cast<XWeak*>(pModel), xFormattedModel);
-
-            m_xAggregate = Reference<XAggregation> (xFormattedModel, UNO_QUERY);
-            DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::OFormattedFieldWrapper : the OFormattedModel didn't have an XAggregation interface !");
-
-            // _before_ setting the delegator, give it to the member references
-            query_interface(xFormattedModel, m_xFormattedPart);
-            m_pEditPart = new OEditModel(m_xServiceFactory);
-            m_pEditPart->acquire();
-        }
-        if (m_xAggregate.is())
-        {   // has to be in it's own block because of the temporary variable created by *this
-            m_xAggregate->setDelegator(static_cast<XWeak*>(this));
-        }
-        decrement(m_refCount);
+        // instantiate an FormattedModel
+        InterfaceRef  xFormattedModel;
+        // (instantiate it directly ..., as the OFormattedModel isn't
+        // registered for any service names anymore)
+        OFormattedModel* pModel = new OFormattedModel(pRef->m_xServiceFactory);
+        query_interface(static_cast<XWeak*>(pModel), xFormattedModel);
+
+        pRef->m_xAggregate = Reference<XAggregation> (xFormattedModel, UNO_QUERY);
+        OSL_ENSURE(m_xAggregate.is(), "the OFormattedModel didn't have an XAggregation interface !");
+
+        // _before_ setting the delegator, give it to the member references
+        query_interface(xFormattedModel, pRef->m_xFormattedPart);
+        pRef->m_pEditPart = rtl::Reference< OEditModel >(new OEditModel(pRef->m_xServiceFactory));
+    }
+
+    increment(pRef->m_refCount);
+
+    if (pRef->m_xAggregate.is())
+    {   // has to be in it's own block because of the temporary variable created by *this
+        pRef->m_xAggregate->setDelegator(static_cast<XWeak*>(pRef));
     }
+
+    InterfaceRef xRef(*pRef);
+    decrement(pRef->m_refCount);
+
+    return xRef;
 }
 
-//------------------------------------------------------------------
-OFormattedFieldWrapper::OFormattedFieldWrapper( const OFormattedFieldWrapper* _pCloneSource )
-    :m_xServiceFactory( _pCloneSource->m_xServiceFactory )
-    ,m_pEditPart( NULL )
+Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw (RuntimeException)
 {
+    ensureAggregate();
+
+    rtl::Reference< OFormattedFieldWrapper > xRef(new OFormattedFieldWrapper(m_xServiceFactory));
+
     Reference< XCloneable > xCloneAccess;
-    query_aggregation( _pCloneSource->m_xAggregate, xCloneAccess );
+    query_aggregation( m_xAggregate, xCloneAccess );
 
     // clone the aggregate
     if ( xCloneAccess.is() )
     {
-        increment( m_refCount );
-        {
-            Reference< XCloneable > xClone = xCloneAccess->createClone();
-            m_xAggregate = Reference< XAggregation >( xClone, UNO_QUERY );
-            DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::OFormattedFieldWrapper : invalid aggregate clone!");
+        Reference< XCloneable > xClone = xCloneAccess->createClone();
+        xRef->m_xAggregate = Reference< XAggregation >(xClone, UNO_QUERY);
+        OSL_ENSURE(xRef->m_xAggregate.is(), "invalid aggregate cloned !");
 
-            query_interface( Reference< XInterface >( xClone.get() ), m_xFormattedPart );
+        query_interface( Reference< XInterface >(xClone.get() ), xRef->m_xFormattedPart);
 
-            if ( _pCloneSource->m_pEditPart )
-            {
-                m_pEditPart = new OEditModel( _pCloneSource->m_pEditPart, _pCloneSource->m_xServiceFactory );
-                m_pEditPart->acquire();
-            }
-        }
-        if ( m_xAggregate.is() )
-        {   // has to be in it's own block because of the temporary variable created by *this
-            m_xAggregate->setDelegator( static_cast< XWeak* >( this ) );
+        if ( m_pEditPart.is() )
+        {
+            xRef->m_pEditPart = rtl::Reference< OEditModel >( new OEditModel(m_pEditPart.get(), m_xServiceFactory));
         }
-        decrement( m_refCount );
     }
     else
     {   // the clone source does not yet have an aggregate -> we don't yet need one, too
     }
+
+    if ( xRef->m_xAggregate.is() )
+    {   // has to be in it's own block because of the temporary variable created by *this
+        xRef->m_xAggregate->setDelegator(static_cast< XWeak* >(xRef.get()));
+    }
+
+    return xRef.get();
 }
 
-//------------------------------------------------------------------
 OFormattedFieldWrapper::~OFormattedFieldWrapper()
 {
     // release the aggregated object (if any)
     if (m_xAggregate.is())
         m_xAggregate->setDelegator(InterfaceRef ());
 
-    if (m_pEditPart)
-        m_pEditPart->release();
-
     DBG_DTOR(OFormattedFieldWrapper, NULL);
 }
 
@@ -234,14 +235,14 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>
     }
 
     // else we have to write an edit part first
-    DBG_ASSERT(m_pEditPart, "OFormattedFieldWrapper::write : formatted part without edit part ?");
-    if ( !m_pEditPart )
+    OSL_ENSURE(m_pEditPart.is(), "OFormattedFieldWrapper::write : formatted part without edit part ?");
+    if ( !m_pEditPart.is() )
         throw RuntimeException( ::rtl::OUString(), *this );
 
     // for this we transfer the current props of the formatted part to the edit part
     Reference<XPropertySet>  xFormatProps(m_xFormattedPart, UNO_QUERY);
     Reference<XPropertySet>  xEditProps;
-    query_interface(static_cast<XWeak*>(m_pEditPart), xEditProps);
+    query_interface(static_cast<XWeak*>(m_pEditPart.get()), xEditProps);
 
     Locale aAppLanguage = Application::GetSettings().GetUILanguageTag().getLocale();
     dbtools::TransferFormComponentProperties(xFormatProps, xEditProps, aAppLanguage);
@@ -275,8 +276,8 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>&
             sal_Int32 nBeforeEditPart = xInMarkable->createMark();
 
             m_pEditPart->read(_rxInStream);
-                // this only works because an edit model can read the stuff written by a formatted model (maybe with
-                // some assertions) , but not vice versa
+            // this only works because an edit model can read the stuff written by a formatted model
+            // (maybe with some assertions) , but not vice versa
             if (!m_pEditPart->lastReadWasFormattedFake())
             {   // case a), written with a version without the edit part fake, so seek to the start position, again
                 xInMarkable->jumpToMark(nBeforeEditPart);
@@ -294,41 +295,32 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>&
         return;
     }
 
-    // we have to decide from the data within the stream whether we should be an EditModel or a FormattedModel
-    OEditBaseModel* pNewAggregate = NULL;
-
-    // let an OEditModel do the reading
-    OEditModel* pBasicReader = new OEditModel(m_xServiceFactory);
-    Reference< XInterface > xHoldBasicReaderAlive( *pBasicReader );
-    pBasicReader->read(_rxInStream);
+    // we have to decide from the data within the stream whether we should
+    // be an EditModel or a FormattedModel
 
-    // was it really an edit model ?
-    if (!pBasicReader->lastReadWasFormattedFake())
-        // yes -> all fine
-        pNewAggregate = pBasicReader;
-    else
-    {   // no -> substitute it with a formatted model
-
-        // let the formmatted model do the reading
-        OFormattedModel* pFormattedReader = new OFormattedModel(m_xServiceFactory);
-        Reference< XInterface > xHoldAliveWhileRead( *pFormattedReader );
-        pFormattedReader->read(_rxInStream);
-
-        // for the next write (if any) : the FormattedModel and the EditModel parts
-        query_interface(static_cast<XWeak*>(pFormattedReader), m_xFormattedPart);
-        m_pEditPart = pBasicReader;
-        m_pEditPart->acquire();
+    {
+        // let an OEditModel do the reading
+        rtl::Reference< OEditModel > pBasicReader(new OEditModel(m_xServiceFactory));
+        pBasicReader->read(_rxInStream);
 
-        // aggregate the formatted part below
-        pNewAggregate = pFormattedReader;
+        // was it really an edit model ?
+        if (!pBasicReader->lastReadWasFormattedFake())
+        {
+            // yes -> all fine
+            m_xAggregate = Reference< XAggregation >( pBasicReader.get() );
+        }
+        else
+        {   // no -> substitute it with a formatted model
+            // let the formmatted model do the reading
+            m_xFormattedPart = Reference< XPersistObject >(new OFormattedModel(m_xServiceFactory));
+            m_xFormattedPart->read(_rxInStream);
+            m_pEditPart = pBasicReader;
+            m_xAggregate = Reference< XAggregation >( m_xFormattedPart, UNO_QUERY );
+        }
     }
 
     // do the aggregation
     increment(m_refCount);
-    {
-        query_interface(static_cast<XWeak*>(pNewAggregate), m_xAggregate);
-        DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::read : the OEditModel didn't have an XAggregation interface !");
-    }
     if (m_xAggregate.is())
     {   // has to be in it's own block because of the temporary variable created by *this
         m_xAggregate->setDelegator(static_cast<XWeak*>(this));
@@ -337,20 +329,11 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>&
 }
 
 //------------------------------------------------------------------
-Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone(  ) throw (RuntimeException)
-{
-    ensureAggregate();
-
-    return new OFormattedFieldWrapper( this );
-}
-
-//------------------------------------------------------------------
 void OFormattedFieldWrapper::ensureAggregate()
 {
     if (m_xAggregate.is())
         return;
 
-    increment(m_refCount);
     {
         // instantiate an EditModel (the only place where we are allowed to decide that we're an FormattedModel
         // is in ::read)
@@ -374,6 +357,8 @@ void OFormattedFieldWrapper::ensureAggregate()
             }
         }
     }
+
+    increment(m_refCount);
     if (m_xAggregate.is())
     {   // has to be in it's own block because of the temporary variable created by *this
         m_xAggregate->setDelegator(static_cast<XWeak*>(this));
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index 3e657a7..957c6a7 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -45,16 +45,19 @@ class OFormattedFieldWrapper : public OFormattedFieldWrapper_Base
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>      m_xAggregate;
 
-    OEditModel*     m_pEditPart;
+    rtl::Reference< OEditModel > m_pEditPart;
         // if we act as formatted this is used to write the EditModel part
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>     m_xFormattedPart;
-        // if we act as formatted, this is the PersistObject interface of our aggregate, used
-        // to read and write the FormattedModel part
+    // if we act as formatted, this is the PersistObject interface of our aggregate, used
+    // to read and write the FormattedModel part
+    // if bActAsFormatted is false, the state is undetermined until somebody calls
+    // ::read or does anything which requires a living aggregate
+    static InterfaceRef createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, bool bActAsFormatted);
 
-    OFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, sal_Bool _bActAsFormatted);
-        // if _bActAsFormatted is sal_False, the state is undetermined until somebody calls ::read or does
-        // anything which requires a living aggregate
-    OFormattedFieldWrapper( const OFormattedFieldWrapper* _pCloneSource );
+private:
+    OFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
+
+protected:
     virtual ~OFormattedFieldWrapper();
 
     friend InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance_ForceFormatted(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
commit 0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Nov 21 22:06:52 2012 +0000

    re-base on ALv2 code. Includes:
    
        Patch contributed by Christian Lippka
        impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx
        http://svn.apache.org/viewvc?view=revision&revision=1167619
    
        Patches contributed by Mathias Bauer
        gnumake4 work variously
        http://svn.apache.org/viewvc?view=revision&revision=1394707
        http://svn.apache.org/viewvc?view=revision&revision=1394326
        cws mba34issues01: #i117712#: fix several resource errors introduced by
        IAccessible2 implementation
        http://svn.apache.org/viewvc?view=revision&revision=1172343
        cws mba34issues01: #i117719#: use correct resource ID
        http://svn.apache.org/viewvc?view=revision&revision=1172351
    
        Patch contributed by Andre Fischer
        Do not add targets for junit tests when junit is disabled.
        http://svn.apache.org/viewvc?view=revision&revision=1241508
    
        Patches contributed by Armin Le-Grand
        #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested
        http://svn.apache.org/viewvc?view=revision&revision=1240195
        fix for #118525#: Using primitives for chart sub-geometry visualisation
        http://svn.apache.org/viewvc?view=revision&revision=1226879
        #118485# - Styles for OLEs are not saved.
        http://svn.apache.org/viewvc?view=revision&revision=1182166
        #118524: apply patch, followup fixes to 118485
        http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68
    
        Patch contributed by Regina Henschel
        linecap: Reintegrating finished LineCap feature
        http://svn.apache.org/viewvc?view=revision&revision=1232507
    
        Patch contributed by Wang Lei (leiw)
        #i118760# split the first table cell vertically, then undo&redo,
        the Presentation app will crash
        http://svn.apache.org/viewvc?view=revision&revision=1301361
    
    cleanup globlmn hacks, undo dependent fixmes.

diff --git a/dictionaries b/dictionaries
index 8486186..e295c6f 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 84861864e2555282a23235225dd15dc1c6d30249
+Subproject commit e295c6f831f0435fc5a68ea0fd1a50bcba76ea16
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 33314f4..5bf85dd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4112,8 +4112,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
                 }
                 else if ( nGluePointType == com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS )
                 {
-                    // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
-                    SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( sal_True /*, true */ );
+                    SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( sal_True, true );
                     if ( pPoly && pPoly->ISA( SdrPathObj ) )
                     {
                         sal_Int16 a, b, nIndex = 0;
diff --git a/forms/qa/integration/forms/XMLFormSettings.java b/forms/qa/integration/forms/XMLFormSettings.java
index fd54b08..70f9d27 100644
--- a/forms/qa/integration/forms/XMLFormSettings.java
+++ b/forms/qa/integration/forms/XMLFormSettings.java
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 package integration.forms;
 
diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java
index 40bf149..67cadcd 100644
--- a/forms/qa/org/openoffice/xforms/Instance.java
+++ b/forms/qa/org/openoffice/xforms/Instance.java
@@ -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 .
+ */
+
 package org.openoffice.xforms;
 
 import com.sun.star.xml.dom.DOMException;
diff --git a/forms/qa/unoapi/forms.sce b/forms/qa/unoapi/forms.sce
index 8ac840e..a0264ba 100644
--- a/forms/qa/unoapi/forms.sce
+++ b/forms/qa/unoapi/forms.sce
@@ -1,3 +1,20 @@
+#
+# 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 .
+#
 -o forms.OButtonControl
 #i111285 -o forms.OButtonModel
 -o forms.OCheckBoxControl
diff --git a/forms/qa/unoapi/knownissues.xcl b/forms/qa/unoapi/knownissues.xcl
index 66e02dc..2e8f013 100644
--- a/forms/qa/unoapi/knownissues.xcl
+++ b/forms/qa/unoapi/knownissues.xcl
@@ -1,11 +1,29 @@
+#
+# 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 .
+#
+
 ### i45204 ###
 forms.OCurrencyModel::com::sun::star::form::XUpdateBroadcaster
 
 ### i84235 ###
-forms.ODatabaseForm::com::sun::star::sdbc::XWarningsSupplier 	
+forms.ODatabaseForm::com::sun::star::sdbc::XWarningsSupplier
 
 ### i45204 ###
-forms.OCurrencyModel::com::sun::star::form::XUpdateBroadcaster 	
+forms.OCurrencyModel::com::sun::star::form::XUpdateBroadcaster
 
 ### i79098 ###
 forms.OScrollBarModel::com::sun::star::awt::UnoControlScrollBarModel
@@ -100,7 +118,7 @@ forms.OListBoxControl::com::sun::star::form::XChangeBroadcaster
 ### i87861 ###
 forms.OEditModel::com::sun::star::form::XUpdateBroadcaster
 
-### i89421 ### 
+### i89421 ###
 forms.OGroupBoxModel::com::sun::star::lang::XComponent
 
 ### i89422 ###
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 8203be0..df76b7a 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.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 "Button.hxx"
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index 0fe5505..1a13136 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.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 _FRM_BUTTON_HXX_
 #define _FRM_BUTTON_HXX_
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index 15042a7..cff783f 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.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 "CheckBox.hxx"
 #include "property.hxx"
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 77372ae..0b8f7f1 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.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 <string.h>
 
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index ec69103..c5463a9 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.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 _FRM_COLUMNS_HXX
 #define _FRM_COLUMNS_HXX
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index a8a3717..fb19bcc 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.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 "ComboBox.hxx"
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 8adbfeb..5481635 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.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 _FORMS_COMBOBOX_HXX_
 #define _FORMS_COMBOBOX_HXX_
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 08df529..4536b20 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.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 "Currency.hxx"
 #include <tools/debug.hxx>
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 7938066..434b4ef 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.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 "componenttools.hxx"
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 1746076..5355b11 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.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 "Date.hxx"
 #include <tools/debug.hxx>
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 43fda3e..c69a23e 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.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 "Edit.hxx"
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index c716541..a9c6b43 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.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 "EditBase.hxx"
 #include "property.hxx"
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index 04752f9..174812e 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.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 "EventThread.hxx"
 #include <comphelper/guarding.hxx>
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 440d845..ee0e71e 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.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 _FRM_EVENT_THREAD_HXX_
 #define _FRM_EVENT_THREAD_HXX_
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 3fdb25d..3b3cb12 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.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 "File.hxx"
 
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index ba3f208..1b257a5 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.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 "Filter.hxx"
 #include "FormComponent.hxx"
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 97b291d..1c13c10 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.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 FORMS_COMPONENT_FILTER_HXX
 #define FORMS_COMPONENT_FILTER_HXX
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 588e369..e7170d3 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.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 "componenttools.hxx"
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index e6d598a..dc33b2c 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.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 "FormattedField.hxx"
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index a5b3c9b..780367a 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.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 "FormattedFieldWrapper.hxx"
 #include "Edit.hxx"
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index d7726ee..3e657a7 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.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 _FRM_FORMATTED_FIELD_WRAPPER_HXX_
 #define _FRM_FORMATTED_FIELD_WRAPPER_HXX_
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index f7bbcdb..a31e15c 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.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 "FormsCollection.hxx"
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 1ea66a7..005c719 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.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 "Columns.hxx"
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index beb93ce..81a9275 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.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 "GroupBox.hxx"
 #include "property.hxx"
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 873a770..48179ce 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.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 "GroupManager.hxx"
 #include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 7f6e99b..3fda7f1 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.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 _FRM_GROUPMANAGER_HXX_
 #define _FRM_GROUPMANAGER_HXX_
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 713df53..a2abcc2 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.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 "Hidden.hxx"
 #include "property.hxx"
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index a8fffbf..025f693 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.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 "ImageButton.hxx"
 #include <tools/debug.hxx>
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 083a3df..a466a9d 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.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 "ImageControl.hxx"
 
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 21a54fd..5864d9e 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.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.
+/*
+ * This file is part of the LibreOffice project.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * This file incorporates work covered by the following license notice:
  *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 
 #include "ListBox.hxx"
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 2c696c3..1b2ad65 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.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 _FORMS_LISTBOX_HXX_
 #define _FORMS_LISTBOX_HXX_
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 7fa0bf8..3874137 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.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 "Numeric.hxx"
 #include <tools/debug.hxx>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list