[Libreoffice-commits] .: 16 commits - registry/Module_registry.mk registry/tools Repository.mk sd/inc sd/Library_sd.mk sd/Makefile sd/prj sd/qa sd/res sd/sdi sd/source sd/uiconfig sd/util sd/workben sd/xml sd/xsl

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 28 04:48:10 PST 2012


 Repository.mk                                                                   |    1 
 registry/Module_registry.mk                                                     |    1 
 registry/tools/rdbedit.cxx                                                      |  307 ++++++++++
 sd/Library_sd.mk                                                                |    2 
 sd/Makefile                                                                     |    7 
 sd/inc/CustomAnimationEffect.hxx                                                |   37 -
 sd/inc/CustomAnimationPreset.hxx                                                |   37 -
 sd/inc/EffectMigration.hxx                                                      |   37 -
 sd/inc/Outliner.hxx                                                             |   37 -
 sd/inc/SdShapeTypes.hxx                                                         |   37 -
 sd/inc/TransitionPreset.hxx                                                     |   37 -
 sd/inc/cusshow.hxx                                                              |   37 -
 sd/inc/customshowlist.hxx                                                       |   37 -
 sd/inc/drawdoc.hxx                                                              |   37 -
 sd/inc/helper/simplereferencecomponent.hxx                                      |   37 -
 sd/inc/pglink.hxx                                                               |   43 -
 sd/inc/sdabstdlg.hxx                                                            |   37 -
 sd/inc/sdattr.hxx                                                               |   37 -
 sd/inc/sddll.hxx                                                                |   43 -
 sd/inc/sdenumdef.hxx                                                            |   43 -
 sd/inc/sderror.hxx                                                              |   43 -
 sd/inc/sdpage.hxx                                                               |   37 -
 sd/inc/sdundo.hxx                                                               |   43 -
 sd/inc/stlpool.hxx                                                              |   37 -
 sd/inc/strmname.h                                                               |   43 -
 sd/inc/undoanim.hxx                                                             |   37 -
 sd/prj/struct.txt                                                               |   54 -
 sd/qa/unit/version.map                                                          |   34 -
 sd/res/webview/edit.asp                                                         |   17 
 sd/res/webview/edit.pl                                                          |    1 
 sd/res/webview/editpic.asp                                                      |   17 
 sd/res/webview/index.pl                                                         |    1 
 sd/res/webview/poll.asp                                                         |   17 
 sd/res/webview/savepic.asp                                                      |   17 
 sd/res/webview/show.asp                                                         |   17 
 sd/res/webview/webview.asp                                                      |   17 
 sd/sdi/SlideSorterController.sdi                                                |   37 -
 sd/sdi/_docsh.sdi                                                               |   37 -
 sd/sdi/_drvwsh.sdi                                                              |   37 -
 sd/sdi/outlnvsh.sdi                                                             |   37 -
 sd/sdi/sdraw.sdi                                                                |   19 
 sd/source/core/CustomAnimationCloner.cxx                                        |   37 -
 sd/source/core/CustomAnimationEffect.cxx                                        |   37 -
 sd/source/core/CustomAnimationPreset.cxx                                        |   37 -
 sd/source/core/EffectMigration.cxx                                              |   37 -
 sd/source/core/TransitionPreset.cxx                                             |   37 -
 sd/source/core/annotations/Annotation.cxx                                       |   37 -
 sd/source/core/cusshow.cxx                                                      |   37 -
 sd/source/core/drawdoc.cxx                                                      |   37 -
 sd/source/core/drawdoc2.cxx                                                     |   37 -
 sd/source/core/drawdoc3.cxx                                                     |   37 -
 sd/source/core/drawdoc4.cxx                                                     |   37 -
 sd/source/core/drawdoc_animations.cxx                                           |   43 -
 sd/source/core/glob.src                                                         |   37 -
 sd/source/core/pglink.cxx                                                       |   37 -
 sd/source/core/sdpage.cxx                                                       |   37 -
 sd/source/core/sdpage2.cxx                                                      |   37 -
 sd/source/core/sdpage_animations.cxx                                            |   37 -
 sd/source/core/shapelist.cxx                                                    |   37 -
 sd/source/core/stlfamily.cxx                                                    |   37 -
 sd/source/core/stlpool.cxx                                                      |   37 -
 sd/source/core/stlsheet.cxx                                                     |   37 -
 sd/source/core/undoanim.cxx                                                     |   37 -
 sd/source/filter/cgm/sdcgmfilter.cxx                                            |   37 -
 sd/source/filter/eppt/eppt.cxx                                                  |   40 -
 sd/source/filter/eppt/eppt.hxx                                                  |   37 -
 sd/source/filter/eppt/epptbase.hxx                                              |   37 -
 sd/source/filter/eppt/epptooxml.hxx                                             |   37 -
 sd/source/filter/eppt/epptso.cxx                                                |   37 -
 sd/source/filter/eppt/escherex.cxx                                              |   37 -
 sd/source/filter/eppt/escherex.hxx                                              |   37 -
 sd/source/filter/eppt/grouptable.hxx                                            |   37 -
 sd/source/filter/eppt/pptexanimations.cxx                                       |   37 -
 sd/source/filter/eppt/pptexanimations.hxx                                       |   37 -
 sd/source/filter/eppt/pptexsoundcollection.cxx                                  |   37 -
 sd/source/filter/eppt/pptexsoundcollection.hxx                                  |   37 -
 sd/source/filter/eppt/pptx-epptbase.cxx                                         |   37 -
 sd/source/filter/eppt/pptx-epptooxml.cxx                                        |   37 -
 sd/source/filter/eppt/pptx-grouptable.cxx                                       |   37 -
 sd/source/filter/eppt/pptx-stylesheet.cxx                                       |   37 -
 sd/source/filter/eppt/pptx-text.cxx                                             |   37 -
 sd/source/filter/eppt/text.hxx                                                  |   37 -
 sd/source/filter/grf/sdgrffilter.cxx                                            |   37 -
 sd/source/filter/html/HtmlOptionsDialog.cxx                                     |   37 -
 sd/source/filter/html/buttonset.cxx                                             |   37 -
 sd/source/filter/html/buttonset.hxx                                             |   43 -
 sd/source/filter/html/htmlex.cxx                                                |   37 -
 sd/source/filter/html/htmlex.hxx                                                |   37 -
 sd/source/filter/html/pubdlg.cxx                                                |   37 -
 sd/source/filter/ppt/ppt97animations.cxx                                        |   37 -
 sd/source/filter/ppt/ppt97animations.hxx                                        |   37 -
 sd/source/filter/ppt/pptatom.cxx                                                |   37 -
 sd/source/filter/ppt/pptin.cxx                                                  |   37 -
 sd/source/filter/ppt/pptin.hxx                                                  |   37 -
 sd/source/filter/ppt/pptinanimations.cxx                                        |   37 -
 sd/source/filter/ppt/propread.cxx                                               |   37 -
 sd/source/filter/ppt/propread.hxx                                               |   37 -
 sd/source/filter/sdfilter.cxx                                                   |   37 -
 sd/source/filter/sdpptwrp.cxx                                                   |   39 -
 sd/source/filter/xml/sdtransform.cxx                                            |   37 -
 sd/source/filter/xml/sdxmlwrp.cxx                                               |   37 -
 sd/source/helper/simplereferencecomponent.cxx                                   |   37 -
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx                       |   37 -
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx                       |   37 -
 sd/source/ui/accessibility/AccessibleOutlineView.cxx                            |   37 -
 sd/source/ui/accessibility/AccessiblePageShape.cxx                              |   37 -
 sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx               |   37 -
 sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx                   |   37 -
 sd/source/ui/accessibility/AccessiblePresentationShape.cxx                      |   37 -
 sd/source/ui/accessibility/AccessibleScrollPanel.cxx                            |   37 -
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx                      |   37 -
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx                        |   37 -
 sd/source/ui/accessibility/AccessibleTreeNode.cxx                               |   56 -
 sd/source/ui/accessibility/SdShapeTypes.cxx                                     |   37 -
 sd/source/ui/animations/CustomAnimation.src                                     |   37 -
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx                         |   37 -
 sd/source/ui/animations/CustomAnimationCreateDialog.hxx                         |   37 -
 sd/source/ui/animations/CustomAnimationCreateDialog.src                         |   37 -
 sd/source/ui/animations/CustomAnimationDialog.cxx                               |   37 -
 sd/source/ui/animations/CustomAnimationList.cxx                                 |   37 -
 sd/source/ui/animations/CustomAnimationList.hxx                                 |   37 -
 sd/source/ui/animations/CustomAnimationPane.cxx                                 |   37 -
 sd/source/ui/animations/CustomAnimationPane.hxx                                 |   37 -
 sd/source/ui/animations/DialogListBox.cxx                                       |   37 -
 sd/source/ui/animations/STLPropertySet.cxx                                      |   37 -
 sd/source/ui/animations/SlideTransitionPane.cxx                                 |   37 -
 sd/source/ui/animations/SlideTransitionPane.hxx                                 |   37 -
 sd/source/ui/animations/motionpathtag.cxx                                       |   37 -
 sd/source/ui/annotations/annotationmanager.cxx                                  |   37 -
 sd/source/ui/annotations/annotationmanagerimpl.hxx                              |   37 -
 sd/source/ui/annotations/annotationtag.cxx                                      |   37 -
 sd/source/ui/annotations/annotationwindow.cxx                                   |   37 -
 sd/source/ui/annotations/annotationwindow.hxx                                   |   37 -
 sd/source/ui/app/menuids3_tmpl.src                                              |   37 -
 sd/source/ui/app/menuids_tmpl.src                                               |   45 -
 sd/source/ui/app/optsitem.cxx                                                   |   37 -
 sd/source/ui/app/popup.src                                                      |   37 -
 sd/source/ui/app/popup2_tmpl.src                                                |   54 -
 sd/source/ui/app/res_bmp.src                                                    |   37 -
 sd/source/ui/app/sddll.cxx                                                      |   37 -
 sd/source/ui/app/sddll1.cxx                                                     |   37 -
 sd/source/ui/app/sddll2.cxx                                                     |   37 -
 sd/source/ui/app/sdmod.cxx                                                      |   37 -
 sd/source/ui/app/sdmod1.cxx                                                     |   37 -
 sd/source/ui/app/sdmod2.cxx                                                     |   37 -
 sd/source/ui/app/sdpopup.cxx                                                    |   37 -
 sd/source/ui/app/sdxfer.cxx                                                     |   69 +-
 sd/source/ui/app/strings.src                                                    |   37 -
 sd/source/ui/app/tbxids_tmpl.src                                                |   37 -
 sd/source/ui/app/tbxww.cxx                                                      |   37 -
 sd/source/ui/app/toolbox2_tmpl.src                                              |   37 -
 sd/source/ui/controller/slidelayoutcontroller.cxx                               |   37 -
 sd/source/ui/dlg/AnimationChildWindow.cxx                                       |   43 -
 sd/source/ui/dlg/LayerTabBar.cxx                                                |   37 -
 sd/source/ui/dlg/PaneShells.cxx                                                 |   37 -
 sd/source/ui/dlg/RemoteDialogClientBox.cxx                                      |   37 -
 sd/source/ui/dlg/RemoteDialogClientBox.hxx                                      |   37 -
 sd/source/ui/dlg/SpellDialogChildWindow.cxx                                     |   37 -
 sd/source/ui/dlg/TemplateScanner.cxx                                            |   37 -
 sd/source/ui/dlg/animobjs.cxx                                                   |   37 -
 sd/source/ui/dlg/animobjs.src                                                   |   37 -
 sd/source/ui/dlg/assclass.cxx                                                   |   37 -
 sd/source/ui/dlg/brkdlg.cxx                                                     |   37 -
 sd/source/ui/dlg/copydlg.cxx                                                    |   37 -
 sd/source/ui/dlg/custsdlg.cxx                                                   |   37 -
 sd/source/ui/dlg/diactrl.cxx                                                    |   37 -
 sd/source/ui/dlg/dlg_char.src                                                   |   37 -
 sd/source/ui/dlg/dlgass.cxx                                                     |   37 -
 sd/source/ui/dlg/dlgass.src                                                     |   37 -
 sd/source/ui/dlg/dlgassim.cxx                                                   |   37 -
 sd/source/ui/dlg/dlgassim.hxx                                                   |   43 -
 sd/source/ui/dlg/dlgctrls.cxx                                                   |   37 -
 sd/source/ui/dlg/dlgfield.cxx                                                   |   37 -
 sd/source/ui/dlg/dlgolbul.cxx                                                   |   37 -
 sd/source/ui/dlg/dlgpage.cxx                                                    |   37 -
 sd/source/ui/dlg/dlgpage.src                                                    |   37 -
 sd/source/ui/dlg/dlgsnap.cxx                                                    |   37 -
 sd/source/ui/dlg/dlgsnap.src                                                    |   37 -
 sd/source/ui/dlg/docprev.cxx                                                    |   37 -
 sd/source/ui/dlg/filedlg.cxx                                                    |   37 -
 sd/source/ui/dlg/gluectrl.cxx                                                   |   37 -
 sd/source/ui/dlg/headerfooterdlg.cxx                                            |   37 -
 sd/source/ui/dlg/inspagob.cxx                                                   |   37 -
 sd/source/ui/dlg/inspagob.src                                                   |   37 -
 sd/source/ui/dlg/masterlayoutdlg.cxx                                            |   37 -
 sd/source/ui/dlg/morphdlg.cxx                                                   |   37 -
 sd/source/ui/dlg/morphdlg.src                                                   |   37 -
 sd/source/ui/dlg/navigatr.cxx                                                   |   37 -
 sd/source/ui/dlg/navigatr.src                                                   |   37 -
 sd/source/ui/dlg/paragr.cxx                                                     |   37 -
 sd/source/ui/dlg/paragr.src                                                     |   37 -
 sd/source/ui/dlg/present.cxx                                                    |   75 +-
 sd/source/ui/dlg/present.src                                                    |   37 -
 sd/source/ui/dlg/prltempl.cxx                                                   |   37 -
 sd/source/ui/dlg/prntopts.cxx                                                   |   37 -
 sd/source/ui/dlg/prntopts.src                                                   |   37 -
 sd/source/ui/dlg/sdabstdlg.cxx                                                  |   43 -
 sd/source/ui/dlg/sddlgfact.cxx                                                  |   37 -
 sd/source/ui/dlg/sddlgfact.hxx                                                  |   37 -
 sd/source/ui/dlg/sdpreslt.cxx                                                   |   37 -
 sd/source/ui/dlg/sdpreslt.src                                                   |   37 -
 sd/source/ui/dlg/sdtreelb.cxx                                                   |  165 +++--
 sd/source/ui/dlg/sduiexp.cxx                                                    |   43 -
 sd/source/ui/dlg/tabtempl.cxx                                                   |   37 -
 sd/source/ui/dlg/tabtempl.src                                                   |   37 -
 sd/source/ui/dlg/tpaction.cxx                                                   |   37 -
 sd/source/ui/dlg/tpoption.cxx                                                   |   37 -
 sd/source/ui/dlg/tpoption.src                                                   |   37 -
 sd/source/ui/dlg/unchss.cxx                                                     |   37 -
 sd/source/ui/dlg/vectdlg.cxx                                                    |   37 -
 sd/source/ui/dlg/vectdlg.src                                                    |   37 -
 sd/source/ui/docshell/docshel2.cxx                                              |   37 -
 sd/source/ui/docshell/docshel3.cxx                                              |   37 -
 sd/source/ui/docshell/docshel4.cxx                                              |   37 -
 sd/source/ui/docshell/docshell.cxx                                              |   37 -
 sd/source/ui/docshell/grdocsh.cxx                                               |   37 -
 sd/source/ui/docshell/sdclient.cxx                                              |   62 +-
 sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx            |   37 -
 sd/source/ui/framework/configuration/Configuration.cxx                          |   37 -
 sd/source/ui/framework/configuration/ConfigurationClassifier.cxx                |   37 -
 sd/source/ui/framework/configuration/ConfigurationController.cxx                |   37 -
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx     |   37 -
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx     |   37 -
 sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx |   37 -
 sd/source/ui/framework/configuration/ConfigurationTracer.cxx                    |   37 -
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx                   |   37 -
 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx                   |   37 -
 sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx      |   37 -
 sd/source/ui/framework/configuration/ResourceFactoryManager.cxx                 |   37 -
 sd/source/ui/framework/configuration/ResourceFactoryManager.hxx                 |   37 -
 sd/source/ui/framework/configuration/ResourceId.cxx                             |   37 -
 sd/source/ui/framework/configuration/UpdateRequest.cxx                          |   37 -
 sd/source/ui/framework/factories/BasicPaneFactory.cxx                           |   37 -
 sd/source/ui/framework/factories/BasicPaneFactory.hxx                           |   37 -
 sd/source/ui/framework/factories/BasicToolBarFactory.cxx                        |   37 -
 sd/source/ui/framework/factories/BasicViewFactory.cxx                           |   37 -
 sd/source/ui/framework/factories/ChildWindowPane.cxx                            |   37 -
 sd/source/ui/framework/factories/FullScreenPane.cxx                             |   37 -
 sd/source/ui/framework/factories/Pane.cxx                                       |   37 -
 sd/source/ui/framework/factories/PresentationFactory.cxx                        |   37 -
 sd/source/ui/framework/factories/TaskPanelFactory.cxx                           |   37 -
 sd/source/ui/framework/factories/ViewShellWrapper.cxx                           |   37 -
 sd/source/ui/framework/module/ModuleController.cxx                              |   37 -
 sd/source/ui/framework/tools/FrameworkHelper.cxx                                |   37 -
 sd/source/ui/func/bulmaper.cxx                                                  |   37 -
 sd/source/ui/func/fucon3d.cxx                                                   |   37 -
 sd/source/ui/func/fuconarc.cxx                                                  |   37 -
 sd/source/ui/func/fuconbez.cxx                                                  |   37 -
 sd/source/ui/func/fuconrec.cxx                                                  |   37 -
 sd/source/ui/func/fuconstr.cxx                                                  |   37 -
 sd/source/ui/func/fuconuno.cxx                                                  |   37 -
 sd/source/ui/func/fucopy.cxx                                                    |   37 -
 sd/source/ui/func/fudraw.cxx                                                    |   37 -
 sd/source/ui/func/fudspord.cxx                                                  |   37 -
 sd/source/ui/func/fuformatpaintbrush.cxx                                        |   37 -
 sd/source/ui/func/fuhhconv.cxx                                                  |   37 -
 sd/source/ui/func/fuinsert.cxx                                                  |   37 -
 sd/source/ui/func/fuinsfil.cxx                                                  |   37 -
 sd/source/ui/func/fulinend.cxx                                                  |   37 -
 sd/source/ui/func/fumorph.cxx                                                   |   37 -
 sd/source/ui/func/fuoaprms.cxx                                                  |   37 -
 sd/source/ui/func/fuolbull.cxx                                                  |   37 -
 sd/source/ui/func/fuoltext.cxx                                                  |   37 -
 sd/source/ui/func/fupage.cxx                                                    |   37 -
 sd/source/ui/func/fupoor.cxx                                                    |   40 -
 sd/source/ui/func/fuprobjs.cxx                                                  |   37 -
 sd/source/ui/func/fusel.cxx                                                     |   37 -
 sd/source/ui/func/fusldlg.cxx                                                   |   37 -
 sd/source/ui/func/fusnapln.cxx                                                  |   37 -
 sd/source/ui/func/fusumry.cxx                                                   |   45 -
 sd/source/ui/func/futempl.cxx                                                   |   37 -
 sd/source/ui/func/futext.cxx                                                    |   52 -
 sd/source/ui/func/futransf.cxx                                                  |   37 -
 sd/source/ui/func/fuvect.cxx                                                    |   37 -
 sd/source/ui/func/fuzoom.cxx                                                    |   37 -
 sd/source/ui/func/undoback.cxx                                                  |   37 -
 sd/source/ui/func/unmovss.cxx                                                   |   37 -
 sd/source/ui/func/unoaprms.cxx                                                  |   37 -
 sd/source/ui/func/unprlout.cxx                                                  |   37 -
 sd/source/ui/inc/AccessibleSlideSorterObject.hxx                                |   37 -
 sd/source/ui/inc/AccessibleSlideSorterView.hxx                                  |   37 -
 sd/source/ui/inc/AccessibleTreeNode.hxx                                         |   37 -
 sd/source/ui/inc/BreakDlg.hxx                                                   |   37 -
 sd/source/ui/inc/DialogListBox.hxx                                              |   37 -
 sd/source/ui/inc/DrawController.hxx                                             |   37 -
 sd/source/ui/inc/DrawDocShell.hxx                                               |   37 -
 sd/source/ui/inc/DrawViewShell.hxx                                              |   37 -
 sd/source/ui/inc/FormShellManager.hxx                                           |   37 -
 sd/source/ui/inc/FrameView.hxx                                                  |   37 -
 sd/source/ui/inc/GraphicDocShell.hxx                                            |   37 -
 sd/source/ui/inc/OutlineView.hxx                                                |   37 -
 sd/source/ui/inc/OutlinerIteratorImpl.hxx                                       |   37 -
 sd/source/ui/inc/Ruler.hxx                                                      |   37 -
 sd/source/ui/inc/SdUnoSlideView.hxx                                             |   37 -
 sd/source/ui/inc/TemplateScanner.hxx                                            |   37 -
 sd/source/ui/inc/View.hxx                                                       |   37 -
 sd/source/ui/inc/ViewShell.hxx                                                  |   37 -
 sd/source/ui/inc/ViewShellBase.hxx                                              |   37 -
 sd/source/ui/inc/ViewShellImplementation.hxx                                    |   37 -
 sd/source/ui/inc/Window.hxx                                                     |   37 -
 sd/source/ui/inc/assclass.hxx                                                   |   37 -
 sd/source/ui/inc/bulmaper.hxx                                                   |   43 -
 sd/source/ui/inc/celltempl.hxx                                                  |   43 -
 sd/source/ui/inc/copydlg.hxx                                                    |   37 -
 sd/source/ui/inc/custsdlg.hxx                                                   |   37 -
 sd/source/ui/inc/dlgass.hxx                                                     |   43 -
 sd/source/ui/inc/dlgpage.hxx                                                    |   43 -
 sd/source/ui/inc/fucon3d.hxx                                                    |   37 -
 sd/source/ui/inc/fuconarc.hxx                                                   |   43 -
 sd/source/ui/inc/fuconbez.hxx                                                   |   37 -
 sd/source/ui/inc/fuconcs.hxx                                                    |   37 -
 sd/source/ui/inc/fuconrec.hxx                                                   |   37 -
 sd/source/ui/inc/fuconuno.hxx                                                   |   37 -
 sd/source/ui/inc/fuinsfil.hxx                                                   |   37 -
 sd/source/ui/inc/fumorph.hxx                                                    |   37 -
 sd/source/ui/inc/fupoor.hxx                                                     |   37 -
 sd/source/ui/inc/futext.hxx                                                     |   37 -
 sd/source/ui/inc/headerfooterdlg.hxx                                            |   37 -
 sd/source/ui/inc/ins_paste.hxx                                                  |   43 -
 sd/source/ui/inc/inspagob.hxx                                                   |   37 -
 sd/source/ui/inc/layeroptionsdlg.hxx                                            |   43 -
 sd/source/ui/inc/morphdlg.hxx                                                   |   37 -
 sd/source/ui/inc/navigatr.hxx                                                   |   37 -
 sd/source/ui/inc/optsitem.hxx                                                   |   37 -
 sd/source/ui/inc/paragr.hxx                                                     |   43 -
 sd/source/ui/inc/present.hxx                                                    |   37 -
 sd/source/ui/inc/prltempl.hxx                                                   |   37 -
 sd/source/ui/inc/prntopts.hxx                                                   |   37 -
 sd/source/ui/inc/pubdlg.hxx                                                     |   37 -
 sd/source/ui/inc/res_bmp.hrc                                                    |   37 -
 sd/source/ui/inc/sdpreslt.hxx                                                   |   37 -
 sd/source/ui/inc/sdtreelb.hxx                                                   |   53 -
 sd/source/ui/inc/sdxfer.hxx                                                     |   69 +-
 sd/source/ui/inc/slideshow.hxx                                                  |   37 -
 sd/source/ui/inc/tabtempl.hxx                                                   |   37 -
 sd/source/ui/inc/taskpane/ILayoutableWindow.hxx                                 |   37 -
 sd/source/ui/inc/taskpane/ScrollPanel.hxx                                       |   37 -
 sd/source/ui/inc/taskpane/TitleBar.hxx                                          |   37 -
 sd/source/ui/inc/tools/AsynchronousTask.hxx                                     |   43 -
 sd/source/ui/inc/tools/IconCache.hxx                                            |   37 -
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx                              |   37 -
 sd/source/ui/inc/tpaction.hxx                                                   |   37 -
 sd/source/ui/inc/tpoption.hxx                                                   |   37 -
 sd/source/ui/inc/unchss.hxx                                                     |   43 -
 sd/source/ui/inc/unmodpg.hxx                                                    |   37 -
 sd/source/ui/inc/unmovss.hxx                                                    |   43 -
 sd/source/ui/inc/unokywds.hxx                                                   |   37 -
 sd/source/ui/inc/unomodel.hxx                                                   |   37 -
 sd/source/ui/inc/unprlout.hxx                                                   |   43 -
 sd/source/ui/inc/vectdlg.hxx                                                    |   37 -
 sd/source/ui/inc/zoomlist.hxx                                                   |   43 -
 sd/source/ui/presenter/CanvasUpdateRequester.cxx                                |   37 -
 sd/source/ui/presenter/PresenterCanvas.cxx                                      |   37 -
 sd/source/ui/presenter/PresenterHelper.cxx                                      |   37 -
 sd/source/ui/presenter/PresenterPreviewCache.cxx                                |   37 -
 sd/source/ui/presenter/PresenterTextView.cxx                                    |   37 -
 sd/source/ui/presenter/SlideRenderer.cxx                                        |   37 -
 sd/source/ui/remotecontrol/ImagePreparer.cxx                                    |   38 -
 sd/source/ui/slideshow/SlideShowRestarter.cxx                                   |   37 -
 sd/source/ui/slideshow/SlideShowRestarter.hxx                                   |   37 -
 sd/source/ui/slideshow/showwin.cxx                                              |   37 -
 sd/source/ui/slideshow/showwindow.hxx                                           |   37 -
 sd/source/ui/slideshow/slideshow.cxx                                            |   93 +--
 sd/source/ui/slideshow/slideshow.src                                            |   37 -
 sd/source/ui/slideshow/slideshowimpl.cxx                                        |   38 -
 sd/source/ui/slideshow/slideshowimpl.hxx                                        |   37 -
 sd/source/ui/slideshow/slideshowviewimpl.cxx                                    |   37 -
 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx                               |   37 -
 sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx                          |   37 -
 sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx                             |   37 -
 sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx                            |   37 -
 sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx                            |   37 -
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx                        |   37 -
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx                        |   37 -
 sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx                          |   37 -
 sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx                          |   37 -
 sd/source/ui/slidesorter/cache/SlsPageCache.cxx                                 |   37 -
 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx                          |   37 -
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx                            |   37 -
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx                            |   37 -
 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx                              |   37 -
 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx                              |   37 -
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx                   |   42 -
 sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx                    |   37 -
 sd/source/ui/slidesorter/controller/SlsAnimator.cxx                             |   37 -
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx                            |  216 +++++--
 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx                  |   37 -
 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx                   |   56 -
 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx                   |   37 -
 sd/source/ui/slidesorter/controller/SlsFocusManager.cxx                         |   37 -
 sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx            |   39 -
 sd/source/ui/slidesorter/controller/SlsListener.cxx                             |   37 -
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx                         |   37 -
 sd/source/ui/slidesorter/controller/SlsProperties.cxx                           |   37 -
 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx                     |   39 -
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx                    |   39 -
 sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx                     |   37 -
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx                          |   37 -
 sd/source/ui/slidesorter/controller/SlsTransferable.cxx                         |  102 ---
 sd/source/ui/slidesorter/controller/SlsTransferableData.cxx                     |  137 ++++
 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx                   |   37 -
 sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx                          |   37 -
 sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx                             |   37 -
 sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx               |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx                |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx                         |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx                        |   64 +-
 sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx                     |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx        |   41 -
 sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx                     |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx                       |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx                 |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx                |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx                      |   37 -
 sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx                     |   90 --
 sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx                 |   92 ++
 sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx               |   37 -
 sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx                           |   43 -
 sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx                        |   37 -
 sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx                       |   37 -
 sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx                           |   37 -
 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx                           |   39 -
 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx                           |   37 -
 sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx                          |   43 -
 sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx                         |   37 -
 sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx              |   46 -
 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx                               |   37 -
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx                     |   37 -
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx                      |   37 -
 sd/source/ui/slidesorter/inc/view/SlsTheme.hxx                                  |   37 -
 sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx                                |   37 -
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx                             |   37 -
 sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx                            |   37 -
 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx                           |   37 -
 sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx                   |   37 -
 sd/source/ui/slidesorter/model/SlsVisualState.cxx                               |   37 -
 sd/source/ui/slidesorter/shell/SlideSorterService.cxx                           |   37 -
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx                         |   37 -
 sd/source/ui/slidesorter/view/SlideSorterView.cxx                               |   49 -
 sd/source/ui/slidesorter/view/SlsFontProvider.cxx                               |   37 -
 sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx                             |   37 -
 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx                  |   49 -
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx                              |   37 -
 sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx                              |   37 -
 sd/source/ui/slidesorter/view/SlsLayouter.cxx                                   |   37 -
 sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx                         |   37 -
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx                          |   37 -
 sd/source/ui/slidesorter/view/SlsResource.src                                   |   43 -
 sd/source/ui/slidesorter/view/SlsTheme.cxx                                      |   37 -
 sd/source/ui/slidesorter/view/SlsToolTip.cxx                                    |   37 -
 sd/source/ui/table/TableDesignPane.cxx                                          |   37 -
 sd/source/ui/table/TableDesignPane.hxx                                          |   37 -
 sd/source/ui/table/tablefunction.cxx                                            |   37 -
 sd/source/ui/toolpanel/LayoutMenu.cxx                                           |   37 -
 sd/source/ui/toolpanel/LayoutMenu.hxx                                           |   37 -
 sd/source/ui/toolpanel/ScrollPanel.cxx                                          |   37 -
 sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx                              |   37 -
 sd/source/ui/toolpanel/SubToolPanel.cxx                                         |   37 -
 sd/source/ui/toolpanel/TaskPaneFocusManager.cxx                                 |   37 -
 sd/source/ui/toolpanel/TaskPaneFocusManager.hxx                                 |   37 -
 sd/source/ui/toolpanel/TaskPaneTreeNode.cxx                                     |   37 -
 sd/source/ui/toolpanel/TitleBar.cxx                                             |   37 -
 sd/source/ui/toolpanel/ToolPanel.cxx                                            |   36 -
 sd/source/ui/toolpanel/ToolPanelFactory.cxx                                     |   36 -
 sd/source/ui/toolpanel/ToolPanelViewShell.cxx                                   |   36 -
 sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx                      |   37 -
 sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx                  |   37 -
 sd/source/ui/toolpanel/controls/DocumentHelper.cxx                              |   37 -
 sd/source/ui/toolpanel/controls/MasterPageContainer.cxx                         |   37 -
 sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx                   |   37 -
 sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx                |   37 -
 sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx                |   37 -
 sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx                    |   37 -
 sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx                    |   37 -
 sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx                        |   37 -
 sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx                        |   37 -
 sd/source/ui/toolpanel/controls/MasterPageObserver.cxx                          |   37 -
 sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx                            |   37 -
 sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx                         |   37 -
 sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx                         |   37 -
 sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx                   |   37 -
 sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx                     |   37 -
 sd/source/ui/tools/AsynchronousCall.cxx                                         |   37 -
 sd/source/ui/tools/ConfigurationAccess.cxx                                      |   37 -
 sd/source/ui/tools/EventMultiplexer.cxx                                         |   37 -
 sd/source/ui/tools/IconCache.cxx                                                |   37 -
 sd/source/ui/tools/IdleDetection.cxx                                            |   37 -
 sd/source/ui/tools/PreviewRenderer.cxx                                          |   37 -
 sd/source/ui/tools/PropertySet.cxx                                              |   37 -
 sd/source/ui/tools/SlotStateListener.cxx                                        |   37 -
 sd/source/ui/tools/TimerBasedTaskExecution.cxx                                  |   37 -
 sd/source/ui/unoidl/DrawController.cxx                                          |   37 -
 sd/source/ui/unoidl/SdUnoDrawView.cxx                                           |   37 -
 sd/source/ui/unoidl/SdUnoOutlineView.cxx                                        |   37 -
 sd/source/ui/unoidl/SdUnoSlideView.cxx                                          |   37 -
 sd/source/ui/unoidl/UnoDocumentSettings.cxx                                     |   37 -
 sd/source/ui/unoidl/detreg.cxx                                                  |   37 -
 sd/source/ui/unoidl/facreg.cxx                                                  |   37 -
 sd/source/ui/unoidl/randomnode.cxx                                              |   37 -
 sd/source/ui/unoidl/sddetect.cxx                                                |   37 -
 sd/source/ui/unoidl/sddetect.hxx                                                |   37 -
 sd/source/ui/unoidl/unocpres.cxx                                                |   37 -
 sd/source/ui/unoidl/unodoc.cxx                                                  |   37 -
 sd/source/ui/unoidl/unolayer.cxx                                                |   37 -
 sd/source/ui/unoidl/unomodel.cxx                                                |   44 -
 sd/source/ui/unoidl/unomodule.cxx                                               |   37 -
 sd/source/ui/unoidl/unomodule.hxx                                               |   37 -
 sd/source/ui/unoidl/unoobj.cxx                                                  |   37 -
 sd/source/ui/unoidl/unoobj.hxx                                                  |   37 -
 sd/source/ui/unoidl/unopage.cxx                                                 |   37 -
 sd/source/ui/unoidl/unopback.cxx                                                |   37 -
 sd/source/ui/unoidl/unosrch.cxx                                                 |   37 -
 sd/source/ui/unoidl/unowcntr.cxx                                                |   37 -
 sd/source/ui/unoidl/unowcntr.hxx                                                |   43 -
 sd/source/ui/view/DocumentRenderer.cxx                                          |   40 -
 sd/source/ui/view/FormShellManager.cxx                                          |   37 -
 sd/source/ui/view/GraphicObjectBar.cxx                                          |   37 -
 sd/source/ui/view/GraphicViewShellBase.cxx                                      |   37 -
 sd/source/ui/view/ImpressViewShellBase.cxx                                      |   37 -
 sd/source/ui/view/MediaObjectBar.cxx                                            |   37 -
 sd/source/ui/view/OutlineViewShellBase.cxx                                      |   37 -
 sd/source/ui/view/Outliner.cxx                                                  |   42 -
 sd/source/ui/view/OutlinerIterator.cxx                                          |   37 -
 sd/source/ui/view/PresentationViewShellBase.cxx                                 |   37 -
 sd/source/ui/view/SlideSorterViewShellBase.cxx                                  |   37 -
 sd/source/ui/view/ToolBarManager.cxx                                            |   37 -
 sd/source/ui/view/ViewClipboard.cxx                                             |   37 -
 sd/source/ui/view/ViewShellBase.cxx                                             |   37 -
 sd/source/ui/view/ViewShellImplementation.cxx                                   |   37 -
 sd/source/ui/view/ViewShellManager.cxx                                          |   37 -
 sd/source/ui/view/ViewTabBar.cxx                                                |   37 -
 sd/source/ui/view/WindowUpdater.cxx                                             |   37 -
 sd/source/ui/view/clview.cxx                                                    |   37 -
 sd/source/ui/view/drawview.cxx                                                  |   37 -
 sd/source/ui/view/drbezob.cxx                                                   |   37 -
 sd/source/ui/view/drtxtob.cxx                                                   |   37 -
 sd/source/ui/view/drtxtob1.cxx                                                  |   37 -
 sd/source/ui/view/drviews1.cxx                                                  |   37 -
 sd/source/ui/view/drviews3.cxx                                                  |   37 -
 sd/source/ui/view/drviews4.cxx                                                  |   37 -
 sd/source/ui/view/drviews5.cxx                                                  |   37 -
 sd/source/ui/view/drviews8.cxx                                                  |   37 -
 sd/source/ui/view/drviews9.cxx                                                  |   37 -
 sd/source/ui/view/drviewsa.cxx                                                  |   37 -
 sd/source/ui/view/drviewsb.cxx                                                  |   37 -
 sd/source/ui/view/drviewse.cxx                                                  |   37 -
 sd/source/ui/view/drviewsf.cxx                                                  |   37 -
 sd/source/ui/view/drviewsg.cxx                                                  |   37 -
 sd/source/ui/view/drviewsh.cxx                                                  |   37 -
 sd/source/ui/view/drvwshrg.cxx                                                  |   37 -
 sd/source/ui/view/frmview.cxx                                                   |   37 -
 sd/source/ui/view/outlnvs2.cxx                                                  |   37 -
 sd/source/ui/view/outlnvsh.cxx                                                  |   37 -
 sd/source/ui/view/outlview.cxx                                                  |   37 -
 sd/source/ui/view/presvish.cxx                                                  |   37 -
 sd/source/ui/view/sdruler.cxx                                                   |   37 -
 sd/source/ui/view/sdview5.cxx                                                   |   37 -
 sd/source/ui/view/sdwindow.cxx                                                  |   39 -
 sd/source/ui/view/tabcontr.cxx                                                  |   37 -
 sd/source/ui/view/unmodpg.cxx                                                   |   37 -
 sd/source/ui/view/viewoverlaymanager.cxx                                        |   37 -
 sd/source/ui/view/viewshe2.cxx                                                  |   46 -
 sd/source/ui/view/viewshe3.cxx                                                  |   37 -
 sd/source/ui/view/viewshel.cxx                                                  |   37 -
 sd/source/ui/view/zoomlist.cxx                                                  |   37 -
 sd/uiconfig/sdraw/menubar/menubar.xml                                           |   17 
 sd/uiconfig/sdraw/statusbar/statusbar.xml                                       |   17 
 sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml                                      |   17 
 sd/uiconfig/sdraw/toolbar/alignmentbar.xml                                      |   17 
 sd/uiconfig/sdraw/toolbar/arrowsbar.xml                                         |   17 
 sd/uiconfig/sdraw/toolbar/arrowshapes.xml                                       |   17 
 sd/uiconfig/sdraw/toolbar/basicshapes.xml                                       |   17 
 sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml                                   |   17 
 sd/uiconfig/sdraw/toolbar/calloutshapes.xml                                     |   17 
 sd/uiconfig/sdraw/toolbar/choosemodebar.xml                                     |   17 
 sd/uiconfig/sdraw/toolbar/colorbar.xml                                          |   17 
 sd/uiconfig/sdraw/toolbar/commentsbar.xml                                       |   17 
 sd/uiconfig/sdraw/toolbar/connectorsbar.xml                                     |   17 
 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml                                  |   17 
 sd/uiconfig/sdraw/toolbar/ellipsesbar.xml                                       |   17 
 sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml                                |   17 
 sd/uiconfig/sdraw/toolbar/findbar.xml                                           |   17 
 sd/uiconfig/sdraw/toolbar/flowchartshapes.xml                                   |   17 
 sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml                                 |   17 
 sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml                                 |   17 
 sd/uiconfig/sdraw/toolbar/formcontrols.xml                                      |   17 
 sd/uiconfig/sdraw/toolbar/formdesign.xml                                        |   17 
 sd/uiconfig/sdraw/toolbar/formsfilterbar.xml                                    |   17 
 sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml                                |   17 
 sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml                                 |   17 
 sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml                               |   17 
 sd/uiconfig/sdraw/toolbar/graffilterbar.xml                                     |   17 
 sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml                                  |   17 
 sd/uiconfig/sdraw/toolbar/insertbar.xml                                         |   17 
 sd/uiconfig/sdraw/toolbar/linesbar.xml                                          |   17 
 sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml                                 |   17 
 sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml                                    |   17 
 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml                                  |   17 
 sd/uiconfig/sdraw/toolbar/optimizetablebar.xml                                  |   17 
 sd/uiconfig/sdraw/toolbar/optionsbar.xml                                        |   17 
 sd/uiconfig/sdraw/toolbar/positionbar.xml                                       |   17 
 sd/uiconfig/sdraw/toolbar/rectanglesbar.xml                                     |   17 
 sd/uiconfig/sdraw/toolbar/standardbar.xml                                       |   17 
 sd/uiconfig/sdraw/toolbar/starshapes.xml                                        |   17 
 sd/uiconfig/sdraw/toolbar/symbolshapes.xml                                      |   17 
 sd/uiconfig/sdraw/toolbar/tableobjectbar.xml                                    |   17 
 sd/uiconfig/sdraw/toolbar/textbar.xml                                           |   17 
 sd/uiconfig/sdraw/toolbar/textobjectbar.xml                                     |   17 
 sd/uiconfig/sdraw/toolbar/toolbar.xml                                           |   17 
 sd/uiconfig/sdraw/toolbar/viewerbar.xml                                         |   17 
 sd/uiconfig/sdraw/toolbar/zoombar.xml                                           |   17 
 sd/uiconfig/simpress/menubar/menubar.xml                                        |   17 
 sd/uiconfig/simpress/statusbar/statusbar.xml                                    |   17 
 sd/uiconfig/simpress/toolbar/3dobjectsbar.xml                                   |   17 
 sd/uiconfig/simpress/toolbar/alignmentbar.xml                                   |   17 
 sd/uiconfig/simpress/toolbar/arrowsbar.xml                                      |   17 
 sd/uiconfig/simpress/toolbar/arrowshapes.xml                                    |   17 
 sd/uiconfig/simpress/toolbar/basicshapes.xml                                    |   17 
 sd/uiconfig/simpress/toolbar/bezierobjectbar.xml                                |   17 
 sd/uiconfig/simpress/toolbar/calloutshapes.xml                                  |   17 
 sd/uiconfig/simpress/toolbar/choosemodebar.xml                                  |   17 
 sd/uiconfig/simpress/toolbar/colorbar.xml                                       |   17 
 sd/uiconfig/simpress/toolbar/commentsbar.xml                                    |   17 
 sd/uiconfig/simpress/toolbar/commontaskbar.xml                                  |   17 
 sd/uiconfig/simpress/toolbar/connectorsbar.xml                                  |   17 
 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml                               |   17 
 sd/uiconfig/simpress/toolbar/ellipsesbar.xml                                    |   17 
 sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml                             |   17 
 sd/uiconfig/simpress/toolbar/findbar.xml                                        |   17 
 sd/uiconfig/simpress/toolbar/flowchartshapes.xml                                |   17 
 sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml                              |   17 
 sd/uiconfig/simpress/toolbar/fontworkshapetype.xml                              |   17 
 sd/uiconfig/simpress/toolbar/formcontrols.xml                                   |   17 
 sd/uiconfig/simpress/toolbar/formdesign.xml                                     |   17 
 sd/uiconfig/simpress/toolbar/formsfilterbar.xml                                 |   17 
 sd/uiconfig/simpress/toolbar/formsnavigationbar.xml                             |   17 
 sd/uiconfig/simpress/toolbar/formtextobjectbar.xml                              |   17 
 sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml                            |   17 
 sd/uiconfig/simpress/toolbar/graffilterbar.xml                                  |   17 
 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml                               |   17 
 sd/uiconfig/simpress/toolbar/insertbar.xml                                      |   17 
 sd/uiconfig/simpress/toolbar/linesbar.xml                                       |   17 
 sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml                              |   17 
 sd/uiconfig/simpress/toolbar/mediaobjectbar.xml                                 |   17 
 sd/uiconfig/simpress/toolbar/moreformcontrols.xml                               |   17 
 sd/uiconfig/simpress/toolbar/optimizetablebar.xml                               |   17 
 sd/uiconfig/simpress/toolbar/optionsbar.xml                                     |   17 
 sd/uiconfig/simpress/toolbar/outlinetoolbar.xml                                 |   17 
 sd/uiconfig/simpress/toolbar/positionbar.xml                                    |   17 
 sd/uiconfig/simpress/toolbar/rectanglesbar.xml                                  |   17 
 sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml                             |   17 
 sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml                               |   17 
 sd/uiconfig/simpress/toolbar/standardbar.xml                                    |   17 
 sd/uiconfig/simpress/toolbar/starshapes.xml                                     |   17 
 sd/uiconfig/simpress/toolbar/symbolshapes.xml                                   |   17 
 sd/uiconfig/simpress/toolbar/tableobjectbar.xml                                 |   17 
 sd/uiconfig/simpress/toolbar/textbar.xml                                        |   17 
 sd/uiconfig/simpress/toolbar/textobjectbar.xml                                  |   17 
 sd/uiconfig/simpress/toolbar/toolbar.xml                                        |   17 
 sd/uiconfig/simpress/toolbar/viewerbar.xml                                      |   17 
 sd/uiconfig/simpress/toolbar/zoombar.xml                                        |   17 
 sd/util/sd.component                                                            |   43 -
 sd/util/sdd.component                                                           |   43 -
 sd/util/sdfilt.component                                                        |    8 
 sd/util/sdfilt.map                                                              |    9 
 sd/util/sdui.map                                                                |   24 
 sd/workben/testdll/makefile                                                     |   18 
 sd/xml/effects.xml                                                              |   17 
 sd/xml/transitions-ogl.xml                                                      |   17 
 sd/xml/transitions.xml                                                          |   17 
 sd/xsl/effect.xsl                                                               |   17 
 671 files changed, 10692 insertions(+), 13144 deletions(-)

New commits:
commit 5d533bb75efde6dbe6f2d402d20cf5466135f1a4
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Nov 27 23:26:47 2012 +0100

    Make all-screen presentation work again.
    
    Change-Id: I6b276690043c202f82d5bf7e955b0534a3f9f6b1

diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 4c82a07..5b94cb3 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -230,7 +230,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
                     nDefaultExternalIndex = nEntryIndex;
             }
 
-            if( !bUnifiedDisplay )
+            if( bUnifiedDisplay )
             {
                 maLBMonitor.InsertEntry( msAllMonitors );
                 const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
commit adf342ca1833a0a6bec3b1180ba73c5ae274397f
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Nov 27 23:26:33 2012 +0100

    Remove commented code.
    
    Change-Id: Ia09c147a084765072f5457d799fccad61adad017

diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 3a601c7..1e7e11a 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -621,8 +621,6 @@ void Clipboard::StartDrag (
 
 void Clipboard::DragFinished (sal_Int8 nDropAction)
 {
-    // SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
-
     if (mnDragFinishedUserEventId == 0)
     {
         if ( ! Application::PostUserEvent(
commit 4367079f509417132ab6726dd169e8b59730c2ae
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Nov 27 23:26:16 2012 +0100

    Fix a warning
    
    Change-Id: I4921c437a6a410e67ea937029b53a1df93e48674

diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index bbb6126..4c82a07 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -219,7 +219,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
 
                 // Store display index together with name.
                 const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
-                maLBMonitor.SetEntryData(nEntryIndex, (void*)nDisplay);
+                maLBMonitor.SetEntryData(nEntryIndex, (void*)(sal_IntPtr)nDisplay);
 
                 // Remember the index of the default selection.
                 if (nDefaultSelectedDisplay == nDisplay)
commit 837e2808f7ed0ef7e40f2596a7a1781b52b606a2
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 27 16:10:40 2012 +0000

    re-base on ALv2 code. Includes:
    
        Patches contributed by Armin Le-Grand
        #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles...
        http://svn.apache.org/viewvc?view=revision&revision=1293316
        #118485# - Styles for OLEs are not saved.
        http://svn.apache.org/viewvc?view=revision&revision=1182166
    
        Patches contributed by Andre Fischer
        http://svn.apache.org/viewvc?view=revision&revision=1172128
        http://svn.apache.org/viewvc?view=revision&revision=1172133
    
        Patch contributed by Ariel Constenla-Haile
        i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress
        contextmenu  - CWS contextmenu1
        http://svn.apache.org/viewvc?view=revision&revision=1182915
    
        Patch contributed by Zhang Jian Fang
        #118876#, Add check if the OutlinerParaObject is created successfully
        http://svn.apache.org/viewvc?view=revision&revision=1243381
    
    restore a re-based rdbedit.

diff --git a/Repository.mk b/Repository.mk
index dbc676c..61d3ce9 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     osl_process_child \
     pdf2xml \
     pdfunzip \
+    rdbedit \
     propex \
     regsingleton \
     regsvrex \
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index c62ece0..cec5ff1 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_targets,registry,\
     Executable_regview \
     Executable_regcompare \
     Executable_checksingleton \
+    Executable_rdbedit \
 ))
 
 endif
diff --git a/registry/tools/rdbedit.cxx b/registry/tools/rdbedit.cxx
new file mode 100644
index 0000000..6e8a99f
--- /dev/null
+++ b/registry/tools/rdbedit.cxx
@@ -0,0 +1,307 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "registry/registry.hxx"
+#include "registry/reflread.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/alloc.h>
+#include <osl/process.h>
+#include <osl/diagnose.h>
+#include <osl/thread.h>
+#include <osl/file.hxx>
+
+#ifdef SAL_UNX
+#define SEPARATOR '/'
+#else
+#define SEPARATOR '\\'
+#endif
+
+using namespace ::rtl;
+using namespace ::osl;
+
+sal_Bool isFileUrl(const OString& fileName)
+{
+    if (fileName.indexOf("file://") == 0 )
+        return sal_True;
+    return sal_False;
+}
+
+OUString convertToFileUrl(const OString& fileName)
+{
+    if ( isFileUrl(fileName) )
+    {
+        return OStringToOUString(fileName, osl_getThreadTextEncoding());
+    }
+
+    OUString uUrlFileName;
+    OUString uFileName(fileName.getStr(), fileName.getLength(), osl_getThreadTextEncoding());
+    if ( fileName.indexOf('.') == 0 || fileName.indexOf(SEPARATOR) < 0 )
+    {
+        OUString uWorkingDir;
+        if (osl_getProcessWorkingDir(&uWorkingDir.pData) != osl_Process_E_None)
+        {
+            OSL_ASSERT(false);
+        }
+        if (FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName)
+            != FileBase::E_None)
+        {
+            OSL_ASSERT(false);
+        }
+    } else
+    {
+        if (FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName)
+            != FileBase::E_None)
+        {
+            OSL_ASSERT(false);
+        }
+    }
+
+    return uUrlFileName;
+}
+
+#define U2S( s ) \
+    OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr()
+#define S2U( s ) \
+    OStringToOUString(s, RTL_TEXTENCODING_UTF8)
+
+struct LessString
+{
+    sal_Bool operator()(const OUString& str1, const OUString& str2) const
+    {
+        return (str1 < str2);
+    }
+};
+
+enum Command {
+       DELETEKEY
+};
+
+class Options
+{
+public:
+    Options()
+        : m_bVerbose(false)
+        {}
+    ~Options()
+        {}
+
+    bool initOptions(int ac, char* av[]);
+
+    OString prepareHelp();
+    OString prepareVersion();
+
+    const OString& getProgramName() const
+        { return m_program; }
+    const OString& getTypeReg() const
+        { return m_typeRegName; }
+    const OString& getKeyName() const
+        { return m_keyName; }
+    Command getCommand() const
+        { return m_command; }
+    bool verbose() const
+        { return m_bVerbose; }
+protected:
+    OString     m_program;
+    OString     m_typeRegName;
+    OString     m_keyName;
+    Command     m_command;
+    bool        m_bVerbose;
+};
+
+bool Options::initOptions(int ac, char* av[])
+{
+    bool bRet = true;
+    sal_uInt16  i=1;
+
+    if (ac < 2)
+    {
+        fprintf(stderr, "%s", prepareHelp().getStr());
+        bRet = sal_False;
+    }
+
+    m_program = av[0];
+    sal_Int32 index = -1;
+    if ((index=m_program.lastIndexOf(SEPARATOR)) > 0)
+        m_program = av[0]+index+1;
+
+    char    *s=NULL;
+    for (; i < ac; i++)
+    {
+        if (av[i][0] == '-')
+        {
+            switch (av[i][1])
+            {
+                case 'r':
+                case 'R':
+                    if (av[i][2] == '\0')
+                    {
+                        if (i < ac - 1 && av[i+1][0] != '-')
+                        {
+                            i++;
+                            s = av[i];
+                        } else
+                        {
+                            fprintf(stderr, "%s: invalid option '%s'\n", m_program.getStr(), av[i]);
+                            bRet = sal_False;
+                            break;
+                        }
+                    } else
+                    {
+                        s = av[i] + 2;
+                    }
+                    m_typeRegName = OString(s);
+                    break;
+                case 'd':
+                case 'D':
+                    if (av[i][2] == '\0')
+                    {
+                        if (i < ac - 1 && av[i+1][0] != '-')
+                        {
+                            i++;
+                            s = av[i];
+                        } else
+                        {
+                            fprintf(stderr, "%s: invalid option '%s'\n", m_program.getStr(), av[i]);
+                            bRet = sal_False;
+                            break;
+                        }
+                    } else
+                    {
+                        s = av[i] + 2;
+                    }
+                    m_keyName = OString(s);
+                    break;
+                case 'v':
+                case 'V':
+                    if (av[i][2] != '\0')
+                    {
+                        fprintf(stderr, "%s: invalid option '%s'\n", m_program.getStr(), av[i]);
+                        bRet = sal_False;
+                    }
+                    m_bVerbose = true;
+                    break;
+                case 'h':
+                case '?':
+                    if (av[i][2] != '\0')
+                    {
+                        fprintf(stderr, "%s: invalid option '%s'\n", m_program.getStr(), av[i]);
+                        bRet = false;
+                    } else
+                    {
+                        fprintf(stdout, "%s", prepareHelp().getStr());
+                        exit(0);
+                    }
+                    break;
+                default:
+                    fprintf(stderr, "%s: unknown option '%s'\n", m_program.getStr(), av[i]);
+                    bRet = false;
+                    break;
+            }
+        } else
+        {
+            fprintf(stderr, "%s: unknown option '%s'\n", m_program.getStr(), av[i]);
+            bRet = false;
+        }
+    }
+
+    return bRet;
+}
+
+OString Options::prepareHelp()
+{
+    OString help("\nusing: ");
+    help += m_program + " -r<filename> <command>\n";
+    help += "    -r<filename>  = filename specifies the name of the type registry.\n";
+    help += "Commands:\n";
+    help += "    -d <keyname>  = delete the specified key from the registry. Keyname\n";
+    help += "                    specifies the name of the key that get deleted.\n";
+    help += "    -v            = verbose output.\n";
+    help += "    -h|-?         = print this help message and exit.\n";
+    help += prepareVersion();
+
+    return help;
+}
+
+OString Options::prepareVersion()
+{
+    OString version(m_program);
+    version += " Version 1.0\n\n";
+    return version;
+}
+
+static Options options;
+
+
+#if (defined UNX) || (defined __MINGW32__)
+int main( int argc, char * argv[] )
+#else
+int _cdecl main( int argc, char * argv[] )
+#endif
+{
+    if ( !options.initOptions(argc, argv) )
+    {
+        exit(1);
+    }
+
+    OUString typeRegName( convertToFileUrl(options.getTypeReg()) );
+
+    Registry typeReg;
+
+    if ( typeReg.open(typeRegName, REG_READWRITE) )
+    {
+        fprintf(stderr, "%s: open registry \"%s\" failed\n",
+                options.getProgramName().getStr(), options.getTypeReg().getStr());
+        exit(2);
+    }
+
+    RegistryKey typeRoot;
+    if ( typeReg.openRootKey(typeRoot) )
+    {
+        fprintf(stderr, "%s: open root key of registry \"%s\" failed\n",
+                options.getProgramName().getStr(), options.getTypeReg().getStr());
+        exit(3);
+    }
+
+    if ( options.getCommand() == DELETEKEY )
+    {
+        if ( typeRoot.deleteKey(S2U(options.getKeyName())) )
+          {
+            fprintf(stderr, "%s: delete key \"%s\" of registry \"%s\" failed\n",
+                    options.getProgramName().getStr(), options.getKeyName().getStr(), options.getTypeReg().getStr());
+            exit(4);
+        } else {
+          if (options.verbose())
+            fprintf(stderr, "%s: delete key \"%s\" of registry \"%s\"\n",
+                    options.getProgramName().getStr(), options.getKeyName().getStr(), options.getTypeReg().getStr());
+        }
+    }
+
+    typeRoot.releaseKey();
+    if ( typeReg.close() )
+    {
+        fprintf(stderr, "%s: closing registry \"%s\" failed\n",
+                options.getProgramName().getStr(), options.getTypeReg().getStr());
+        exit(5);
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/Makefile b/sd/Makefile
index ccb1c85..0997e62 100644
--- a/sd/Makefile
+++ b/sd/Makefile
@@ -1,4 +1,11 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 458bba4..0cea04f 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.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 _SD_CUSTOMANIMATIONEFFECT_HXX
 #define _SD_CUSTOMANIMATIONEFFECT_HXX
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 4b8aed0..dd18363 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.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 _SD_CUSTOMANIMATIONPRESET_HXX
 #define _SD_CUSTOMANIMATIONPRESET_HXX
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 59e19da..511cec4 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.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 _SD_EFFECT_MIGRATION_HXX
 #define _SD_EFFECT_MIGRATION_HXX
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 8149787..7ce4028 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.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 SD_OUTLINER_HXX
 #define SD_OUTLINER_HXX
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index 5091678..f522aef 100644
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.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 _SD_SD_SHAPE_TYPES_HXX
 #define _SD_SD_SHAPE_TYPES_HXX
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index d28f700..ae5fe21 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.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 _SD_TRANSITIONPRESET_HXX
 #define _SD_TRANSITIONPRESET_HXX
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index 64593fa..cbf1e84 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
  *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _SD_CUSSHOW_HXX
 #define _SD_CUSSHOW_HXX
diff --git a/sd/inc/customshowlist.hxx b/sd/inc/customshowlist.hxx
index 7bfd988..5cafa44 100644
--- a/sd/inc/customshowlist.hxx
+++ b/sd/inc/customshowlist.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 _CUSTOMSHOWLIST_HXX
 #define _CUSTOMSHOWLIST_HXX
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 4f4b73f..2ab95ab 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.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 _DRAWDOC_HXX
 #define _DRAWDOC_HXX
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index c4b07fc..85b264e 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.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 _SD_SIMPLEREFERENCECOMPONENT_HXX_
 #define _SD_SIMPLEREFERENCECOMPONENT_HXX_
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 5210751..91ec17c 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _PGLINK_HXX
 #define _PGLINK_HXX
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index b332440..53dcf43 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.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 _SD_ABSTDLG_HXX
 #define _SD_ABSTDLG_HXX
 
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index f3f2a23..0baaca8 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.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 _SDATTR_HXX
 #define _SDATTR_HXX
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index 32e1889..5c7a544 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _SDDLL_HXX
 #define _SDDLL_HXX
diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx
index c1301b8..89e40d0 100644
--- a/sd/inc/sdenumdef.hxx
+++ b/sd/inc/sdenumdef.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _SD_ENUMDEF_HXX
 #define _SD_ENUMDEF_HXX
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index e98f419..b462316 100644
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _SDSWERROR_H
 #define _SDSWERROR_H
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 8089e9a..f62b2ae 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.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 _SDPAGE_HXX
 #define _SDPAGE_HXX
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 6356dd4..bc8f1d7 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _SD_SDUNDO_HXX
 #define _SD_SDUNDO_HXX
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 2a7f82a..9e76c2a 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.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 _SD_STLPOOL_HXX
 #define _SD_STLPOOL_HXX
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index bf2fabd..1122abe 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #ifndef _SD_STRMNAME_H
 #define _SD_STRMNAME_H
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 5bb678c..0fb1784 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.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 _SD_UNDO_ANIM_HXX
 #define _SD_UNDO_ANIM_HXX
diff --git a/sd/prj/struct.txt b/sd/prj/struct.txt
deleted file mode 100644
index 5e13a0e..0000000
--- a/sd/prj/struct.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-
-sd-
-   |-idl
-   |-inc ----
-   |         |-usr -----
-   |    		|-IFACEID.hxx	(IDs fuer Interfaces)
-   |-jobs
-   |-prj
-   |-res
-   |-source -
-   |         |-ui ------
-   |    		|-inc ---- (Deklaration der Klassen)
-   |                    |         |-UNOMODEL.hxx
-   |                    |         |-UNOPAGE.hxx
-   |                    |
-   |    		|-unoidl - (Implementation der Klassen)
-   |                    	  |-UNOMODEL.cxx
-   |                    	  |-UNOPAGE.cxx
-   |-unoidl -
-   |         |-sd ------
-   |         |          |-XIMODEL.idl
-   |         |          |-XIPAGE.idl	(der eigentliche IDL-Code)
-   |         |-smart ---
-   |                    |-XIMODEL.idl
-   |                    |-XIPAGE.idl	(import/mapping des IDL-Codes)
-   |-util
-   |-wntmsci-
-   |         |-idl------
-   |         |  	|-usr --
-   |         |                  |-MAP.idl
-   |         |                  |-SDMAP.idl
-   |         |-inc------
-   |         |  	|-sd --- (Deklaration der Interfaces)
-   |         |                  |-XIMODEL.hxx
-   |         |                  |-XIPAGE.hxx	...
-   |         |-misc ----
-   |                    |-XIMODEL.cxx
-   |    		(Impl., fast ausschliesslich pure virtual functions)
-   |-workben
-
-
-
-usr-
-   |-idl ----
-   |         |-cponent -
-   |    		|-smart -
-   |                    |        |-MAP.idl
-   |    		|-usr ---
-   |                             |-SFXMAP.idl
-   |
-   |-inc ----
-             |-usr -----
-        		|-IFACEID.hxx
-
diff --git a/sd/qa/unit/version.map b/sd/qa/unit/version.map
deleted file mode 100644
index 3308588..0000000
--- a/sd/qa/unit/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};
diff --git a/sd/res/webview/edit.asp b/sd/res/webview/edit.asp
index 654a441..6d5f729 100644
--- a/sd/res/webview/edit.asp
+++ b/sd/res/webview/edit.asp
@@ -1,4 +1,21 @@
 <HTML>
+<!--
+ * 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 .
+-->
 <HEAD>
   <TITLE>$$1</TITLE>
 </HEAD>
diff --git a/sd/res/webview/edit.pl b/sd/res/webview/edit.pl
index e1888f7..bdde80c 100644
--- a/sd/res/webview/edit.pl
+++ b/sd/res/webview/edit.pl
@@ -15,4 +15,4 @@
 <BODY BGCOLOR="white">
     <META HTTP-EQUIV="-REFRESH" CONTENT="1;URL=$$3show.pl">
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/sd/res/webview/editpic.asp b/sd/res/webview/editpic.asp
index 34a4a51..78599e0 100644
--- a/sd/res/webview/editpic.asp
+++ b/sd/res/webview/editpic.asp
@@ -3,6 +3,23 @@
     Response.Expires = 0
     Response.Buffer = True
 %>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
 <!-- #include file = "common.inc" -->
 
diff --git a/sd/res/webview/index.pl b/sd/res/webview/index.pl
index 1fb265f..e0198e6 100644
--- a/sd/res/webview/index.pl
+++ b/sd/res/webview/index.pl
@@ -14,4 +14,4 @@
     <META HTTP-EQUIV="-REFRESH" CONTENT="1;URL=$$3webcast.pl">
 </BODY>;
 
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/sd/res/webview/poll.asp b/sd/res/webview/poll.asp
index dd1a9bf..0bbce43 100644
--- a/sd/res/webview/poll.asp
+++ b/sd/res/webview/poll.asp
@@ -2,6 +2,23 @@
     Option Explicit
     Response.Expires = 0
 %>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
 <!-- #include file = "common.inc" -->
 
diff --git a/sd/res/webview/savepic.asp b/sd/res/webview/savepic.asp
index 71adefc..9a9f32c 100644
--- a/sd/res/webview/savepic.asp
+++ b/sd/res/webview/savepic.asp
@@ -3,6 +3,23 @@
     Response.Expires = 0
     Response.Buffer = True
 %>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
 <!-- #include file = "common.inc" -->
 
diff --git a/sd/res/webview/show.asp b/sd/res/webview/show.asp
index b66103c..c595167 100644
--- a/sd/res/webview/show.asp
+++ b/sd/res/webview/show.asp
@@ -2,6 +2,23 @@
     Option Explicit
     Response.Expires = 0
 %>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
 <!-- #include file = "common.inc" -->
 
diff --git a/sd/res/webview/webview.asp b/sd/res/webview/webview.asp
index f3c3af7..f084fc2 100644
--- a/sd/res/webview/webview.asp
+++ b/sd/res/webview/webview.asp
@@ -2,6 +2,23 @@
     Option Explicit
     Response.Expires = 0
 %>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
 <!-- #include file = "common.inc" -->
 
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index c3e14c6..53ea834 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -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 .
+ */
 
 enum FadeEffect
 {
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index 178d0dc..075b60a 100644
--- a/sd/sdi/_docsh.sdi
+++ b/sd/sdi/_docsh.sdi
@@ -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 .
+ */
 interface DrawDocument
 {
     SID_PACKNGO // ole : ?, status : ?
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index cc811d5..fc2f01e 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -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 .
+ */
 
 interface DrawView
 {
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 8a83d3b..ec06d37 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -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 .
+ */
 
 interface OutlineView
 [
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 0183a54..d59d62d 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1,4 +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 .
+ */
+
 TbxImageItem AdvancedMode SID_OBJECT_CHOOSE_MODE
 
 [
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 08a7ebc..aacdc1a 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <com/sun/star/animations/Event.hpp>
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 78fe9ad..8461219 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.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 <tools/debug.hxx>
 #include <com/sun/star/util/XCloneable.hpp>
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index cee595c..3e923eb 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index fc618bb..1800d90 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 49c0a58..53a09b8 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include <com/sun/star/animations/XTimeContainer.hpp>
 #include <com/sun/star/animations/XTransitionFilter.hpp>
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 6696c49..372194b 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.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 "osl/time.h"
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index 9cc9adc..a53e92b 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
  *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include <com/sun/star/lang/XComponent.hpp>
 
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 387d156..2653807 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list