[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source sw/AllLangResTarget_sw.mk sw/inc sw/JunitTest_sw_complex.mk sw/JunitTest_sw_unoapi.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/Module_sw.mk sw/Package_uiconfig.mk sw/qa sw/sdi sw/source sw/uiconfig sw/util

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 30 02:12:14 PST 2012


 sfx2/inc/sfx2/docfile.hxx                                           |    4 
 sfx2/source/doc/docfile.cxx                                         |   19 +
 sw/AllLangResTarget_sw.mk                                           |   33 -
 sw/JunitTest_sw_complex.mk                                          |   33 -
 sw/JunitTest_sw_unoapi.mk                                           |   33 -
 sw/Library_msword.mk                                                |   33 -
 sw/Library_sw.mk                                                    |   33 -
 sw/Library_swd.mk                                                   |   33 -
 sw/Library_swui.mk                                                  |   33 -
 sw/Library_vbaswobj.mk                                              |   33 -
 sw/Module_sw.mk                                                     |   35 -
 sw/Package_uiconfig.mk                                              |   33 -
 sw/inc/EnhancedPDFExportHelper.hxx                                  |   37 --
 sw/inc/IDocumentContentOperations.hxx                               |   37 --
 sw/inc/IDocumentDrawModelAccess.hxx                                 |   37 --
 sw/inc/IDocumentExternalData.hxx                                    |   43 --
 sw/inc/IDocumentFieldsAccess.hxx                                    |   37 --
 sw/inc/IDocumentLinksAdministration.hxx                             |   37 --
 sw/inc/IDocumentRedlineAccess.hxx                                   |   37 --
 sw/inc/IDocumentSettingAccess.hxx                                   |   37 --
 sw/inc/IDocumentState.hxx                                           |   37 --
 sw/inc/IDocumentStatistics.hxx                                      |   43 --
 sw/inc/IDocumentStylePoolAccess.hxx                                 |   37 --
 sw/inc/IMark.hxx                                                    |   37 --
 sw/inc/PostItMgr.hxx                                                |   37 --
 sw/inc/SidebarWin.hxx                                               |   37 --
 sw/inc/SwAppletImpl.hxx                                             |   37 --
 sw/inc/SwNodeNum.hxx                                                |   37 --
 sw/inc/SwNumberTree.hxx                                             |   37 --
 sw/inc/SwRewriter.hxx                                               |   43 --
 sw/inc/SwSmartTagMgr.hxx                                            |   43 --
 sw/inc/SwStyleNameMapper.hxx                                        |   43 --
 sw/inc/SwXMLSectionList.hxx                                         |   37 --
 sw/inc/TextCursorHelper.hxx                                         |   43 --
 sw/inc/accmap.hxx                                                   |   37 --
 sw/inc/acmplwrd.hxx                                                 |   37 --
 sw/inc/anchoreddrawobject.hxx                                       |   37 --
 sw/inc/anchoredobject.hxx                                           |   37 --
 sw/inc/authfld.hxx                                                  |   37 --
 sw/inc/bparr.hxx                                                    |   37 --
 sw/inc/breakit.hxx                                                  |   37 --
 sw/inc/calbck.hxx                                                   |   39 --
 sw/inc/calc.hxx                                                     |   37 --
 sw/inc/cellatr.hxx                                                  |   37 --
 sw/inc/cellfml.hxx                                                  |   37 --
 sw/inc/charfmt.hxx                                                  |   43 --
 sw/inc/chpfld.hxx                                                   |   37 --
 sw/inc/colwd.hxx                                                    |   43 --
 sw/inc/crsrsh.hxx                                                   |   37 --
 sw/inc/crstate.hxx                                                  |   37 --
 sw/inc/cshtyp.hxx                                                   |   37 --
 sw/inc/dbfld.hxx                                                    |   37 --
 sw/inc/dbgoutsw.hxx                                                 |   37 --
 sw/inc/dbmgr.hxx                                                    |   37 --
 sw/inc/dcontact.hxx                                                 |   37 --
 sw/inc/ddefld.hxx                                                   |   37 --
 sw/inc/doc.hxx                                                      |   47 +-
 sw/inc/docary.hxx                                                   |   37 --
 sw/inc/docfac.hxx                                                   |   43 --
 sw/inc/docsh.hxx                                                    |   37 --
 sw/inc/docstat.hxx                                                  |   43 --
 sw/inc/docstyle.hxx                                                 |   37 --
 sw/inc/docufld.hxx                                                  |   37 --
 sw/inc/drawdoc.hxx                                                  |   43 --
 sw/inc/edglbldc.hxx                                                 |   37 --
 sw/inc/edimp.hxx                                                    |   37 --
 sw/inc/editsh.hxx                                                   |   37 --
 sw/inc/expfld.hxx                                                   |   37 --
 sw/inc/extinput.hxx                                                 |   43 --
 sw/inc/fchrfmt.hxx                                                  |   37 --
 sw/inc/fesh.hxx                                                     |   37 --
 sw/inc/fldbas.hxx                                                   |   37 --
 sw/inc/flddat.hxx                                                   |   37 --
 sw/inc/flddropdown.hxx                                              |   37 --
 sw/inc/fldui.hrc                                                    |   37 --
 sw/inc/flyenum.hxx                                                  |   43 --
 sw/inc/flypos.hxx                                                   |   43 --
 sw/inc/fmtanchr.hxx                                                 |   37 --
 sw/inc/fmtautofmt.hxx                                               |   37 --
 sw/inc/fmtclbl.hxx                                                  |   43 --
 sw/inc/fmtclds.hxx                                                  |   37 --
 sw/inc/fmtcnct.hxx                                                  |   37 --
 sw/inc/fmtcntnt.hxx                                                 |   43 --
 sw/inc/fmtcol.hxx                                                   |   37 --
 sw/inc/fmtcolfunc.hxx                                               |   37 --
 sw/inc/fmteiro.hxx                                                  |   43 --
 sw/inc/fmtflcnt.hxx                                                 |   43 --
 sw/inc/fmtfld.hxx                                                   |   37 --
 sw/inc/fmtfollowtextflow.hxx                                        |   43 --
 sw/inc/fmtfordr.hxx                                                 |   37 --
 sw/inc/fmtfsize.hxx                                                 |   37 --
 sw/inc/fmtftn.hxx                                                   |   37 --
 sw/inc/fmtftntx.hxx                                                 |   37 --
 sw/inc/fmthdft.hxx                                                  |   37 --
 sw/inc/fmtinfmt.hxx                                                 |   37 --
 sw/inc/fmtline.hxx                                                  |   37 --
 sw/inc/fmtlsplt.hxx                                                 |   43 --
 sw/inc/fmtornt.hxx                                                  |   37 --
 sw/inc/fmtpdsc.hxx                                                  |   37 --
 sw/inc/fmtrfmrk.hxx                                                 |   43 --
 sw/inc/fmtrowsplt.hxx                                               |   43 --
 sw/inc/fmtruby.hxx                                                  |   37 --
 sw/inc/fmtsrnd.hxx                                                  |   37 --
 sw/inc/fmturl.hxx                                                   |   37 --
 sw/inc/fmtwrapinfluenceonobjpos.hxx                                 |   37 --
 sw/inc/format.hxx                                                   |   37 --
 sw/inc/frmfmt.hxx                                                   |   37 --
 sw/inc/ftnidx.hxx                                                   |   37 --
 sw/inc/ftninfo.hxx                                                  |   37 --
 sw/inc/grfatr.hxx                                                   |   37 --
 sw/inc/hfspacingitem.hxx                                            |   43 --
 sw/inc/hintids.hxx                                                  |   37 --
 sw/inc/hints.hxx                                                    |   37 --
 sw/inc/htmltbl.hxx                                                  |   37 --
 sw/inc/index.hxx                                                    |   37 --
 sw/inc/init.hxx                                                     |   43 --
 sw/inc/iodetect.hxx                                                 |   37 --
 sw/inc/mdiexp.hxx                                                   |   37 --
 sw/inc/modcfg.hxx                                                   |   37 --
 sw/inc/ndarr.hxx                                                    |   37 --
 sw/inc/ndhints.hxx                                                  |   37 --
 sw/inc/ndindex.hxx                                                  |   37 --
 sw/inc/ndnotxt.hxx                                                  |   37 --
 sw/inc/ndole.hxx                                                    |   37 --
 sw/inc/ndtxt.hxx                                                    |   37 --
 sw/inc/ndtyp.hxx                                                    |   37 --
 sw/inc/node.hxx                                                     |   37 --
 sw/inc/numrule.hxx                                                  |   37 --
 sw/inc/pagedesc.hxx                                                 |   37 --
 sw/inc/pagepreviewlayout.hxx                                        |   18 +
 sw/inc/pam.hxx                                                      |   37 --
 sw/inc/paratr.hxx                                                   |   37 --
 sw/inc/pausethreadstarting.hxx                                      |   43 --
 sw/inc/poolfmt.hxx                                                  |   37 --
 sw/inc/postithelper.hxx                                             |   37 --
 sw/inc/printdata.hxx                                                |   37 --
 sw/inc/redline.hxx                                                  |   37 --
 sw/inc/reffld.hxx                                                   |   37 --
 sw/inc/ring.hxx                                                     |   43 --
 sw/inc/rubylist.hxx                                                 |   43 --
 sw/inc/section.hxx                                                  |   41 --
 sw/inc/shellid.hxx                                                  |   37 --
 sw/inc/shellio.hxx                                                  |   37 --
 sw/inc/shellres.hxx                                                 |   37 --
 sw/inc/sortopt.hxx                                                  |   43 --
 sw/inc/swabstdlg.hxx                                                |   37 --
 sw/inc/swacorr.hxx                                                  |   43 --
 sw/inc/swatrset.hxx                                                 |   37 --
 sw/inc/swbaslnk.hxx                                                 |   37 --
 sw/inc/swcrsr.hxx                                                   |   37 --
 sw/inc/swdbtoolsclient.hxx                                          |   37 --
 sw/inc/swddetbl.hxx                                                 |   43 --
 sw/inc/swddllapi.h                                                  |   18 +
 sw/inc/swdll.hxx                                                    |   43 --
 sw/inc/swerror.h                                                    |   37 --
 sw/inc/swevent.hxx                                                  |   37 --
 sw/inc/switerator.hxx                                               |   43 --
 sw/inc/swmodule.hxx                                                 |   37 --
 sw/inc/swrect.hxx                                                   |   37 --
 sw/inc/swregion.hxx                                                 |   43 --
 sw/inc/swscanner.hxx                                                |   38 --
 sw/inc/swtable.hxx                                                  |   37 --
 sw/inc/swtblfmt.hxx                                                 |   37 --
 sw/inc/swtypes.hxx                                                  |   37 --
 sw/inc/swundo.hxx                                                   |   37 --
 sw/inc/swunohelper.hxx                                              |   37 --
 sw/inc/swurl.hxx                                                    |   43 --
 sw/inc/tabcol.hxx                                                   |   37 --
 sw/inc/tblafmt.hxx                                                  |   37 --
 sw/inc/tblenum.hxx                                                  |   37 --
 sw/inc/tblsel.hxx                                                   |   37 --
 sw/inc/tgrditem.hxx                                                 |   37 --
 sw/inc/tox.hxx                                                      |   37 --
 sw/inc/toxwrap.hxx                                                  |   37 --
 sw/inc/txatbase.hxx                                                 |   37 --
 sw/inc/txtatr.hxx                                                   |   37 --
 sw/inc/txtflcnt.hxx                                                 |   43 --
 sw/inc/txtfld.hxx                                                   |   37 --
 sw/inc/txtftn.hxx                                                   |   37 --
 sw/inc/txtinet.hxx                                                  |   37 --
 sw/inc/txtrfmrk.hxx                                                 |   43 --
 sw/inc/txttxmrk.hxx                                                 |   43 --
 sw/inc/undobj.hxx                                                   |   37 --
 sw/inc/unoatxt.hxx                                                  |   37 --
 sw/inc/unobaseclass.hxx                                             |   37 --
 sw/inc/unobookmark.hxx                                              |   37 --
 sw/inc/unocrsr.hxx                                                  |   37 --
 sw/inc/unocrsrhelper.hxx                                            |   37 --
 sw/inc/unodraw.hxx                                                  |   37 --
 sw/inc/unoevtlstnr.hxx                                              |   43 --
 sw/inc/unoframe.hxx                                                 |   37 --
 sw/inc/unoport.hxx                                                  |   37 --
 sw/inc/unoredline.hxx                                               |   37 --
 sw/inc/unoredlines.hxx                                              |   37 --
 sw/inc/unosett.hxx                                                  |   37 --
 sw/inc/unotbl.hxx                                                   |   37 --
 sw/inc/unotxdoc.hxx                                                 |   43 +-
 sw/inc/usrfld.hxx                                                   |   37 --
 sw/inc/viewopt.hxx                                                  |   37 --
 sw/inc/viewsh.hxx                                                   |   37 --
 sw/inc/viscrs.hxx                                                   |   37 --
 sw/inc/wdocsh.hxx                                                   |   43 --
 sw/qa/core/Test-BigPtrArray.cxx                                     |   45 +-
 sw/qa/unoapi/knownissues.xcl                                        |   18 +
 sw/sdi/_basesh.sdi                                                  |   37 --
 sw/sdi/_docsh.sdi                                                   |   37 --
 sw/sdi/_frmsh.sdi                                                   |   37 --
 sw/sdi/_grfsh.sdi                                                   |   37 --
 sw/sdi/_textsh.sdi                                                  |   37 --
 sw/sdi/_viewsh.sdi                                                  |   37 --
 sw/sdi/annotsh.sdi                                                  |   37 --
 sw/sdi/basesh.sdi                                                   |   43 --
 sw/sdi/docsh.sdi                                                    |   37 --
 sw/sdi/drwtxtsh.sdi                                                 |   37 --
 sw/sdi/swpatch.txt                                                  |   18 +
 sw/sdi/swriter.sdi                                                  |   18 +
 sw/sdi/swslots.sdi                                                  |   37 --
 sw/sdi/textsh.sdi                                                   |   37 --
 sw/sdi/viewsh.sdi                                                   |   37 --
 sw/source/core/SwNumberTree/SwNodeNum.cxx                           |   37 --
 sw/source/core/SwNumberTree/SwNumberTree.cxx                        |   37 --
 sw/source/core/access/acccell.cxx                                   |   37 --
 sw/source/core/access/acccontext.cxx                                |   37 --
 sw/source/core/access/acccontext.hxx                                |   37 --
 sw/source/core/access/accdoc.cxx                                    |   37 --
 sw/source/core/access/accembedded.cxx                               |   37 --
 sw/source/core/access/accfootnote.cxx                               |   37 --
 sw/source/core/access/accframe.cxx                                  |   37 --
 sw/source/core/access/accframebase.cxx                              |   37 --
 sw/source/core/access/accfrmobj.cxx                                 |   37 --
 sw/source/core/access/accfrmobj.hxx                                 |   37 --
 sw/source/core/access/accfrmobjmap.cxx                              |   37 --
 sw/source/core/access/accfrmobjslist.cxx                            |   37 --
 sw/source/core/access/accgraphic.cxx                                |   37 --
 sw/source/core/access/accheaderfooter.cxx                           |   37 --
 sw/source/core/access/acchyperlink.cxx                              |   37 --
 sw/source/core/access/acchyperlink.hxx                              |   37 --
 sw/source/core/access/accmap.cxx                                    |   37 --
 sw/source/core/access/accnotextframe.cxx                            |   37 --
 sw/source/core/access/accnotextframe.hxx                            |   37 --
 sw/source/core/access/accpage.cxx                                   |   37 --
 sw/source/core/access/accpara.cxx                                   |   37 --
 sw/source/core/access/accpara.hxx                                   |   37 --
 sw/source/core/access/accportions.cxx                               |   37 --
 sw/source/core/access/accpreview.cxx                                |   37 --
 sw/source/core/access/accselectionhelper.cxx                        |   37 --
 sw/source/core/access/acctable.cxx                                  |   37 --
 sw/source/core/access/acctable.hxx                                  |   37 --
 sw/source/core/access/acctextframe.cxx                              |   37 --
 sw/source/core/access/parachangetrackinginfo.cxx                    |   37 --
 sw/source/core/access/textmarkuphelper.cxx                          |   37 --
 sw/source/core/access/textmarkuphelper.hxx                          |   37 --
 sw/source/core/attr/calbck.cxx                                      |   45 +-
 sw/source/core/attr/cellatr.cxx                                     |   37 --
 sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx                    |   37 --
 sw/source/core/attr/format.cxx                                      |   37 --
 sw/source/core/attr/hints.cxx                                       |   37 --
 sw/source/core/attr/swatrset.cxx                                    |   37 --
 sw/source/core/bastyp/SwSmartTagMgr.cxx                             |   37 --
 sw/source/core/bastyp/bparr.cxx                                     |   37 --
 sw/source/core/bastyp/breakit.cxx                                   |   37 --
 sw/source/core/bastyp/calc.cxx                                      |   37 --
 sw/source/core/bastyp/checkit.cxx                                   |   43 --
 sw/source/core/bastyp/index.cxx                                     |   37 --
 sw/source/core/bastyp/init.cxx                                      |   37 --
 sw/source/core/bastyp/ring.cxx                                      |   37 --
 sw/source/core/bastyp/swcache.cxx                                   |   37 --
 sw/source/core/bastyp/swrect.cxx                                    |   37 --
 sw/source/core/bastyp/swregion.cxx                                  |   37 --
 sw/source/core/bastyp/swtypes.cxx                                   |   37 --
 sw/source/core/bastyp/tabcol.cxx                                    |   37 --
 sw/source/core/crsr/bookmrk.cxx                                     |   37 --
 sw/source/core/crsr/callnk.cxx                                      |   37 --
 sw/source/core/crsr/crbm.cxx                                        |   37 --
 sw/source/core/crsr/crossrefbookmark.cxx                            |   37 --
 sw/source/core/crsr/crsrsh.cxx                                      |   37 --
 sw/source/core/crsr/crstrvl.cxx                                     |   37 --
 sw/source/core/crsr/crstrvl1.cxx                                    |   37 --
 sw/source/core/crsr/findattr.cxx                                    |   37 --
 sw/source/core/crsr/findcoll.cxx                                    |   37 --
 sw/source/core/crsr/findfmt.cxx                                     |   37 --
 sw/source/core/crsr/findtxt.cxx                                     |   37 --
 sw/source/core/crsr/pam.cxx                                         |   37 --
 sw/source/core/crsr/swcrsr.cxx                                      |   37 --
 sw/source/core/crsr/trvltbl.cxx                                     |   37 --
 sw/source/core/crsr/unocrsr.cxx                                     |   37 --
 sw/source/core/crsr/viscrs.cxx                                      |   37 --
 sw/source/core/doc/SwStyleNameMapper.cxx                            |   37 --
 sw/source/core/doc/acmplwrd.cxx                                     |   37 --
 sw/source/core/doc/dbgoutsw.cxx                                     |   37 --
 sw/source/core/doc/doc.cxx                                          |   37 --
 sw/source/core/doc/docbasic.cxx                                     |   37 --
 sw/source/core/doc/docbm.cxx                                        |   37 --
 sw/source/core/doc/docchart.cxx                                     |   37 --
 sw/source/core/doc/doccomp.cxx                                      |   37 --
 sw/source/core/doc/doccorr.cxx                                      |   37 --
 sw/source/core/doc/docdde.cxx                                       |   37 --
 sw/source/core/doc/docdesc.cxx                                      |   37 --
 sw/source/core/doc/docdraw.cxx                                      |   37 --
 sw/source/core/doc/docedt.cxx                                       |   37 --
 sw/source/core/doc/docfld.cxx                                       |   37 --
 sw/source/core/doc/docfly.cxx                                       |   37 --
 sw/source/core/doc/docfmt.cxx                                       |   37 --
 sw/source/core/doc/docftn.cxx                                       |   37 --
 sw/source/core/doc/docglbl.cxx                                      |   37 --
 sw/source/core/doc/docglos.cxx                                      |   37 --
 sw/source/core/doc/doclay.cxx                                       |   44 +-
 sw/source/core/doc/docnew.cxx                                       |   53 +-
 sw/source/core/doc/docnum.cxx                                       |   59 +--
 sw/source/core/doc/docredln.cxx                                     |   37 --
 sw/source/core/doc/docruby.cxx                                      |   37 --
 sw/source/core/doc/docsort.cxx                                      |   37 --
 sw/source/core/doc/docstat.cxx                                      |   43 --
 sw/source/core/doc/doctxm.cxx                                       |   37 --
 sw/source/core/doc/docxforms.cxx                                    |   37 --
 sw/source/core/doc/extinput.cxx                                     |   37 --
 sw/source/core/doc/fmtcol.cxx                                       |   37 --
 sw/source/core/doc/ftnidx.cxx                                       |   37 --
 sw/source/core/doc/gctable.cxx                                      |   37 --
 sw/source/core/doc/htmltbl.cxx                                      |   37 --
 sw/source/core/doc/lineinfo.cxx                                     |   37 --
 sw/source/core/doc/number.cxx                                       |   37 --
 sw/source/core/doc/poolfmt.cxx                                      |   37 --
 sw/source/core/doc/sortopt.cxx                                      |   37 --
 sw/source/core/doc/swserv.cxx                                       |   37 --
 sw/source/core/doc/swstylemanager.cxx                               |   37 --
 sw/source/core/doc/tblafmt.cxx                                      |   37 --
 sw/source/core/doc/tblcpy.cxx                                       |   37 --
 sw/source/core/doc/tblrwcl.cxx                                      |   37 --
 sw/source/core/doc/visiturl.cxx                                     |   37 --
 sw/source/core/docnode/finalthreadmanager.cxx                       |   37 --
 sw/source/core/docnode/ndcopy.cxx                                   |   37 --
 sw/source/core/docnode/ndindex.cxx                                  |   37 --
 sw/source/core/docnode/ndnotxt.cxx                                  |   37 --
 sw/source/core/docnode/ndnum.cxx                                    |   37 --
 sw/source/core/docnode/ndsect.cxx                                   |   37 --
 sw/source/core/docnode/ndtbl.cxx                                    |   37 --
 sw/source/core/docnode/ndtbl1.cxx                                   |   49 --
 sw/source/core/docnode/node.cxx                                     |   37 --
 sw/source/core/docnode/node2lay.cxx                                 |   37 --
 sw/source/core/docnode/nodes.cxx                                    |   37 --
 sw/source/core/docnode/observablethread.cxx                         |   37 --
 sw/source/core/docnode/pausethreadstarting.cxx                      |   43 --
 sw/source/core/docnode/retrievedinputstreamdata.cxx                 |   37 --
 sw/source/core/docnode/retrieveinputstream.cxx                      |   37 --
 sw/source/core/docnode/retrieveinputstreamconsumer.cxx              |   37 --
 sw/source/core/docnode/section.cxx                                  |   41 --
 sw/source/core/docnode/swbaslnk.cxx                                 |   39 --
 sw/source/core/docnode/swthreadjoiner.cxx                           |   43 --
 sw/source/core/docnode/swthreadmanager.cxx                          |   37 --
 sw/source/core/docnode/threadlistener.cxx                           |   43 --
 sw/source/core/docnode/threadmanager.cxx                            |   37 --
 sw/source/core/draw/dcontact.cxx                                    |   37 --
 sw/source/core/draw/dflyobj.cxx                                     |   37 --
 sw/source/core/draw/dobjfac.cxx                                     |   43 --
 sw/source/core/draw/dpage.cxx                                       |   37 --
 sw/source/core/draw/drawdoc.cxx                                     |   37 --
 sw/source/core/draw/dview.cxx                                       |   37 --
 sw/source/core/edit/acorrect.cxx                                    |   37 --
 sw/source/core/edit/autofmt.cxx                                     |   37 --
 sw/source/core/edit/edatmisc.cxx                                    |   37 --
 sw/source/core/edit/edattr.cxx                                      |   37 --
 sw/source/core/edit/eddel.cxx                                       |   37 --
 sw/source/core/edit/edfcol.cxx                                      |   37 --
 sw/source/core/edit/edfld.cxx                                       |   39 --
 sw/source/core/edit/edfldexp.cxx                                    |   37 --
 sw/source/core/edit/edfmt.cxx                                       |   37 --
 sw/source/core/edit/edglbldc.cxx                                    |   37 --
 sw/source/core/edit/edglss.cxx                                      |   37 --
 sw/source/core/edit/editsh.cxx                                      |   37 --
 sw/source/core/edit/edlingu.cxx                                     |   37 --
 sw/source/core/edit/ednumber.cxx                                    |   37 --
 sw/source/core/edit/edsect.cxx                                      |   37 --
 sw/source/core/edit/edtox.cxx                                       |   37 --
 sw/source/core/edit/edundo.cxx                                      |   37 --
 sw/source/core/edit/edws.cxx                                        |   37 --
 sw/source/core/fields/authfld.cxx                                   |   37 --
 sw/source/core/fields/cellfml.cxx                                   |   37 --
 sw/source/core/fields/chpfld.cxx                                    |   37 --
 sw/source/core/fields/dbfld.cxx                                     |   37 --
 sw/source/core/fields/ddefld.cxx                                    |   43 --
 sw/source/core/fields/ddetbl.cxx                                    |   37 --
 sw/source/core/fields/docufld.cxx                                   |   37 --
 sw/source/core/fields/expfld.cxx                                    |   37 --
 sw/source/core/fields/fldbas.cxx                                    |   37 --
 sw/source/core/fields/flddat.cxx                                    |   37 --
 sw/source/core/fields/flddropdown.cxx                               |   37 --
 sw/source/core/fields/fldlst.cxx                                    |   37 --
 sw/source/core/fields/macrofld.cxx                                  |   37 --
 sw/source/core/fields/postithelper.cxx                              |   37 --
 sw/source/core/fields/reffld.cxx                                    |   37 --
 sw/source/core/fields/scrptfld.cxx                                  |   37 --
 sw/source/core/fields/tblcalc.cxx                                   |   37 --
 sw/source/core/fields/usrfld.cxx                                    |   37 --
 sw/source/core/frmedt/fedesc.cxx                                    |   37 --
 sw/source/core/frmedt/fefly1.cxx                                    |   37 --
 sw/source/core/frmedt/feflyole.cxx                                  |   37 --
 sw/source/core/frmedt/feshview.cxx                                  |   37 --
 sw/source/core/frmedt/fetab.cxx                                     |   37 --
 sw/source/core/frmedt/fews.cxx                                      |   37 --
 sw/source/core/frmedt/tblsel.cxx                                    |   37 --
 sw/source/core/graphic/grfatr.cxx                                   |   37 --
 sw/source/core/inc/MarkManager.hxx                                  |   37 --
 sw/source/core/inc/SwUndoPageDesc.hxx                               |   37 --
 sw/source/core/inc/SwXMLBlockExport.hxx                             |   37 --
 sw/source/core/inc/SwXMLBlockImport.hxx                             |   37 --
 sw/source/core/inc/SwXMLTextBlocks.hxx                              |   37 --
 sw/source/core/inc/UndoAttribute.hxx                                |   37 --
 sw/source/core/inc/UndoCore.hxx                                     |   37 --
 sw/source/core/inc/UndoDraw.hxx                                     |   37 --
 sw/source/core/inc/UndoInsert.hxx                                   |   37 --
 sw/source/core/inc/UndoNumbering.hxx                                |   37 --
 sw/source/core/inc/UndoSort.hxx                                     |   37 --
 sw/source/core/inc/UndoSplitMove.hxx                                |   37 --
 sw/source/core/inc/UndoTable.hxx                                    |   37 --
 sw/source/core/inc/acorrect.hxx                                     |   37 --
 sw/source/core/inc/anchoredobjectposition.hxx                       |   37 --
 sw/source/core/inc/ascharanchoredobjectposition.hxx                 |   37 --
 sw/source/core/inc/blink.hxx                                        |   37 --
 sw/source/core/inc/bodyfrm.hxx                                      |   43 --
 sw/source/core/inc/bookmrk.hxx                                      |   37 --
 sw/source/core/inc/cntfrm.hxx                                       |   37 --
 sw/source/core/inc/colfrm.hxx                                       |   43 --
 sw/source/core/inc/crossrefbookmark.hxx                             |   37 --
 sw/source/core/inc/dbg_lay.hxx                                      |   37 --
 sw/source/core/inc/dflyobj.hxx                                      |   37 --
 sw/source/core/inc/docfld.hxx                                       |   37 --
 sw/source/core/inc/docsort.hxx                                      |   37 --
 sw/source/core/inc/doctxm.hxx                                       |   37 --
 sw/source/core/inc/drawfont.hxx                                     |   37 --
 sw/source/core/inc/dview.hxx                                        |   37 --
 sw/source/core/inc/environmentofanchoredobject.hxx                  |   37 --
 sw/source/core/inc/flowfrm.hxx                                      |   37 --
 sw/source/core/inc/flyfrm.hxx                                       |   37 --
 sw/source/core/inc/flyfrms.hxx                                      |   37 --
 sw/source/core/inc/fntcache.hxx                                     |   37 --
 sw/source/core/inc/frame.hxx                                        |   37 --
 sw/source/core/inc/frminf.hxx                                       |   37 --
 sw/source/core/inc/frmtool.hxx                                      |   37 --
 sw/source/core/inc/ftnboss.hxx                                      |   37 --
 sw/source/core/inc/ftnfrm.hxx                                       |   37 --
 sw/source/core/inc/hffrm.hxx                                        |   43 --
 sw/source/core/inc/layact.hxx                                       |   37 --
 sw/source/core/inc/layfrm.hxx                                       |   37 --
 sw/source/core/inc/layouter.hxx                                     |   37 --
 sw/source/core/inc/mvsave.hxx                                       |   37 --
 sw/source/core/inc/noteurl.hxx                                      |   37 --
 sw/source/core/inc/notxtfrm.hxx                                     |   37 --
 sw/source/core/inc/objectformatter.hxx                              |   37 --
 sw/source/core/inc/pagefrm.hxx                                      |   37 --
 sw/source/core/inc/prevwpage.hxx                                    |   43 --
 sw/source/core/inc/retrievedinputstreamdata.hxx                     |   37 --
 sw/source/core/inc/retrieveinputstreamconsumer.hxx                  |   43 --
 sw/source/core/inc/rolbck.hxx                                       |   37 --
 sw/source/core/inc/rootfrm.hxx                                      |   37 --
 sw/source/core/inc/scriptinfo.hxx                                   |   37 --
 sw/source/core/inc/sectfrm.hxx                                      |   37 --
 sw/source/core/inc/sortedobjs.hxx                                   |   37 --
 sw/source/core/inc/swblocks.hxx                                     |   37 --
 sw/source/core/inc/swcache.hxx                                      |   37 --
 sw/source/core/inc/swfntcch.hxx                                     |   37 --
 sw/source/core/inc/swfont.hxx                                       |   37 --
 sw/source/core/inc/swthreadjoiner.hxx                               |   43 --
 sw/source/core/inc/swthreadmanager.hxx                              |   37 --
 sw/source/core/inc/tabfrm.hxx                                       |   37 --
 sw/source/core/inc/tblrwcl.hxx                                      |   37 --
 sw/source/core/inc/threadmanager.hxx                                |   37 --
 sw/source/core/inc/tocntntanchoredobjectposition.hxx                |   37 --
 sw/source/core/inc/tolayoutanchoredobjectposition.hxx               |   43 --
 sw/source/core/inc/txmsrt.hxx                                       |   37 --
 sw/source/core/inc/txtfrm.hxx                                       |   37 --
 sw/source/core/inc/unometa.hxx                                      |   37 --
 sw/source/core/inc/viewimp.hxx                                      |   37 --
 sw/source/core/inc/wrong.hxx                                        |   37 --
 sw/source/core/layout/anchoreddrawobject.cxx                        |   37 --
 sw/source/core/layout/anchoredobject.cxx                            |   37 --
 sw/source/core/layout/atrfrm.cxx                                    |   39 --
 sw/source/core/layout/calcmove.cxx                                  |   37 --
 sw/source/core/layout/colfrm.cxx                                    |   37 --
 sw/source/core/layout/dbg_lay.cxx                                   |   37 --
 sw/source/core/layout/findfrm.cxx                                   |   37 --
 sw/source/core/layout/flowfrm.cxx                                   |   37 --
 sw/source/core/layout/fly.cxx                                       |   37 --
 sw/source/core/layout/flycnt.cxx                                    |   37 --
 sw/source/core/layout/flyincnt.cxx                                  |   37 --
 sw/source/core/layout/flylay.cxx                                    |   37 --
 sw/source/core/layout/flypos.cxx                                    |   37 --
 sw/source/core/layout/frmtool.cxx                                   |   37 --
 sw/source/core/layout/ftnfrm.cxx                                    |   37 --
 sw/source/core/layout/hffrm.cxx                                     |   37 --
 sw/source/core/layout/layact.cxx                                    |   37 --
 sw/source/core/layout/laycache.cxx                                  |   37 --
 sw/source/core/layout/layhelp.hxx                                   |   37 --
 sw/source/core/layout/layouter.cxx                                  |   37 --
 sw/source/core/layout/newfrm.cxx                                    |   37 --
 sw/source/core/layout/objectformatter.cxx                           |   37 --
 sw/source/core/layout/objectformatterlayfrm.cxx                     |   37 --
 sw/source/core/layout/objectformattertxtfrm.cxx                     |   37 --
 sw/source/core/layout/objectformattertxtfrm.hxx                     |   37 --
 sw/source/core/layout/pagechg.cxx                                   |   37 --
 sw/source/core/layout/pagedesc.cxx                                  |   37 --
 sw/source/core/layout/pagefrm.src                                   |    8 
 sw/source/core/layout/sectfrm.cxx                                   |   40 --
 sw/source/core/layout/sortedobjs.cxx                                |   37 --
 sw/source/core/layout/ssfrm.cxx                                     |   37 --
 sw/source/core/layout/tabfrm.cxx                                    |   37 --
 sw/source/core/layout/trvlfrm.cxx                                   |   37 --
 sw/source/core/layout/unusedf.cxx                                   |   37 --
 sw/source/core/layout/virtoutp.cxx                                  |   37 --
 sw/source/core/layout/virtoutp.hxx                                  |   37 --
 sw/source/core/layout/wsfrm.cxx                                     |   37 --
 sw/source/core/objectpositioning/anchoredobjectposition.cxx         |   37 --
 sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx   |   37 --
 sw/source/core/objectpositioning/environmentofanchoredobject.cxx    |   37 --
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx  |   37 --
 sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx |   37 --
 sw/source/core/ole/ndole.cxx                                        |   37 --
 sw/source/core/para/paratr.cxx                                      |   37 --
 sw/source/core/sw3io/sw3convert.cxx                                 |   37 --
 sw/source/core/sw3io/swacorr.cxx                                    |   37 --
 sw/source/core/swg/SwXMLBlockExport.cxx                             |   37 --
 sw/source/core/swg/SwXMLBlockImport.cxx                             |   37 --
 sw/source/core/swg/SwXMLBlockListContext.cxx                        |   37 --
 sw/source/core/swg/SwXMLSectionList.cxx                             |   37 --
 sw/source/core/swg/SwXMLTextBlocks.cxx                              |   37 --
 sw/source/core/swg/SwXMLTextBlocks1.cxx                             |   41 --
 sw/source/core/swg/swblocks.cxx                                     |   37 --
 sw/source/core/table/swnewtable.cxx                                 |   37 --
 sw/source/core/table/swtable.cxx                                    |   37 --
 sw/source/core/text/EnhancedPDFExportHelper.cxx                     |   37 --
 sw/source/core/text/atrhndl.hxx                                     |   37 --
 sw/source/core/text/atrstck.cxx                                     |   37 --
 sw/source/core/text/blink.cxx                                       |   37 --
 sw/source/core/text/frmcrsr.cxx                                     |   37 --
 sw/source/core/text/frmform.cxx                                     |   37 --
 sw/source/core/text/frminf.cxx                                      |   37 --
 sw/source/core/text/frmpaint.cxx                                    |   37 --
 sw/source/core/text/guess.cxx                                       |   41 --
 sw/source/core/text/inftxt.cxx                                      |   37 --
 sw/source/core/text/inftxt.hxx                                      |   37 --
 sw/source/core/text/itradj.cxx                                      |   37 --
 sw/source/core/text/itratr.cxx                                      |   37 --
 sw/source/core/text/itratr.hxx                                      |   37 --
 sw/source/core/text/itrcrsr.cxx                                     |   37 --
 sw/source/core/text/itrform2.cxx                                    |   37 --
 sw/source/core/text/itrform2.hxx                                    |   37 --
 sw/source/core/text/itrpaint.cxx                                    |   37 --
 sw/source/core/text/itrtxt.cxx                                      |   37 --
 sw/source/core/text/itrtxt.hxx                                      |   37 --
 sw/source/core/text/noteurl.cxx                                     |   37 --
 sw/source/core/text/pordrop.hxx                                     |   37 --
 sw/source/core/text/porfld.cxx                                      |   37 --
 sw/source/core/text/porfld.hxx                                      |   37 --
 sw/source/core/text/porfly.cxx                                      |   37 --
 sw/source/core/text/porfly.hxx                                      |   37 --
 sw/source/core/text/porftn.hxx                                      |   37 --
 sw/source/core/text/porglue.cxx                                     |   37 --
 sw/source/core/text/porglue.hxx                                     |   37 --
 sw/source/core/text/porlay.cxx                                      |   37 --
 sw/source/core/text/porlay.hxx                                      |   37 --
 sw/source/core/text/porlin.cxx                                      |   37 --
 sw/source/core/text/porlin.hxx                                      |   37 --
 sw/source/core/text/pormulti.cxx                                    |   37 --
 sw/source/core/text/porref.cxx                                      |   37 --
 sw/source/core/text/porrst.cxx                                      |   37 --
 sw/source/core/text/porrst.hxx                                      |   37 --
 sw/source/core/text/portab.hxx                                      |   37 --
 sw/source/core/text/portox.cxx                                      |   37 --
 sw/source/core/text/portxt.cxx                                      |   37 --
 sw/source/core/text/portxt.hxx                                      |   37 --
 sw/source/core/text/redlnitr.cxx                                    |   37 --
 sw/source/core/text/redlnitr.hxx                                    |   37 --
 sw/source/core/text/txtcache.cxx                                    |   37 --
 sw/source/core/text/txtdrop.cxx                                     |   37 --
 sw/source/core/text/txtfld.cxx                                      |   37 --
 sw/source/core/text/txtfly.cxx                                      |   37 --
 sw/source/core/text/txtfly.hxx                                      |   37 --
 sw/source/core/text/txtfrm.cxx                                      |   37 --
 sw/source/core/text/txtftn.cxx                                      |   37 --
 sw/source/core/text/txthyph.cxx                                     |   37 --
 sw/source/core/text/txtinit.cxx                                     |   37 --
 sw/source/core/text/txtio.cxx                                       |   37 --
 sw/source/core/text/txtpaint.cxx                                    |   37 --
 sw/source/core/text/txttab.cxx                                      |   37 --
 sw/source/core/text/widorp.cxx                                      |   37 --
 sw/source/core/text/widorp.hxx                                      |   37 --
 sw/source/core/text/wrong.cxx                                       |   37 --
 sw/source/core/tox/tox.cxx                                          |   37 --
 sw/source/core/tox/toxhlp.cxx                                       |   37 --
 sw/source/core/tox/txmsrt.cxx                                       |   37 --
 sw/source/core/txtnode/atrfld.cxx                                   |   37 --
 sw/source/core/txtnode/atrflyin.cxx                                 |   37 --
 sw/source/core/txtnode/atrftn.cxx                                   |   37 --
 sw/source/core/txtnode/atrref.cxx                                   |   37 --
 sw/source/core/txtnode/fmtatr2.cxx                                  |   37 --
 sw/source/core/txtnode/fntcache.cxx                                 |   37 --
 sw/source/core/txtnode/fntcap.cxx                                   |   37 --
 sw/source/core/txtnode/ndhints.cxx                                  |   37 --
 sw/source/core/txtnode/ndtxt.cxx                                    |   37 --
 sw/source/core/txtnode/swfntcch.cxx                                 |   37 --
 sw/source/core/txtnode/swfont.cxx                                   |   37 --
 sw/source/core/txtnode/thints.cxx                                   |   37 --
 sw/source/core/txtnode/txtatr2.cxx                                  |   37 --
 sw/source/core/txtnode/txtedt.cxx                                   |   86 +++-
 sw/source/core/undo/SwRewriter.cxx                                  |   43 --
 sw/source/core/undo/SwUndoField.cxx                                 |   37 --
 sw/source/core/undo/SwUndoFmt.cxx                                   |   37 --
 sw/source/core/undo/SwUndoPageDesc.cxx                              |   37 --
 sw/source/core/undo/docundo.cxx                                     |   37 --
 sw/source/core/undo/rolbck.cxx                                      |   37 --
 sw/source/core/undo/unattr.cxx                                      |   37 --
 sw/source/core/undo/unbkmk.cxx                                      |   37 --
 sw/source/core/undo/undel.cxx                                       |   37 --
 sw/source/core/undo/undo.src                                        |   37 --
 sw/source/core/undo/undobj.cxx                                      |   37 --
 sw/source/core/undo/undobj1.cxx                                     |   37 --
 sw/source/core/undo/undoflystrattr.cxx                              |   37 --
 sw/source/core/undo/undraw.cxx                                      |   37 --
 sw/source/core/undo/unfmco.cxx                                      |   37 --
 sw/source/core/undo/unins.cxx                                       |   37 --
 sw/source/core/undo/unmove.cxx                                      |   37 --
 sw/source/core/undo/unnum.cxx                                       |   37 --
 sw/source/core/undo/unovwr.cxx                                      |   37 --
 sw/source/core/undo/unredln.cxx                                     |   37 --
 sw/source/core/undo/unsect.cxx                                      |   37 --
 sw/source/core/undo/unsort.cxx                                      |   37 --
 sw/source/core/undo/unspnd.cxx                                      |   37 --
 sw/source/core/undo/untbl.cxx                                       |   37 --
 sw/source/core/undo/untblk.cxx                                      |   37 --
 sw/source/core/unocore/SwXTextDefaults.cxx                          |   37 --
 sw/source/core/unocore/TextCursorHelper.cxx                         |   43 --
 sw/source/core/unocore/XMLRangeHelper.cxx                           |   37 --
 sw/source/core/unocore/swunohelper.cxx                              |   37 --
 sw/source/core/unocore/unobkm.cxx                                   |   37 --
 sw/source/core/unocore/unocoll.cxx                                  |   37 --
 sw/source/core/unocore/unocrsrhelper.cxx                            |   37 --
 sw/source/core/unocore/unodraw.cxx                                  |   37 --
 sw/source/core/unocore/unoevtlstnr.cxx                              |   37 --
 sw/source/core/unocore/unofield.cxx                                 |   37 --
 sw/source/core/unocore/unoflatpara.cxx                              |   37 --
 sw/source/core/unocore/unoftn.cxx                                   |   37 --
 sw/source/core/unocore/unoidx.cxx                                   |   37 --
 sw/source/core/unocore/unoobj.cxx                                   |   37 --
 sw/source/core/unocore/unoobj2.cxx                                  |   37 --
 sw/source/core/unocore/unoparagraph.cxx                             |   37 --
 sw/source/core/unocore/unoport.cxx                                  |   37 --
 sw/source/core/unocore/unoportenum.cxx                              |   37 --
 sw/source/core/unocore/unoredline.cxx                               |   37 --
 sw/source/core/unocore/unoredlines.cxx                              |   37 --
 sw/source/core/unocore/unorefmk.cxx                                 |   37 --
 sw/source/core/unocore/unosect.cxx                                  |   37 --
 sw/source/core/unocore/unosett.cxx                                  |   37 --
 sw/source/core/unocore/unosrch.cxx                                  |   37 --
 sw/source/core/unocore/unostyle.cxx                                 |   37 --
 sw/source/core/unocore/unotbl.cxx                                   |   55 ---
 sw/source/core/unocore/unotext.cxx                                  |   37 --
 sw/source/core/unocore/unotextmarkup.cxx                            |   37 --
 sw/source/core/view/pagepreviewlayout.cxx                           |   37 --
 sw/source/core/view/printdata.cxx                                   |   38 --
 sw/source/core/view/vdraw.cxx                                       |   37 --
 sw/source/core/view/viewimp.cxx                                     |   37 --
 sw/source/core/view/viewpg.cxx                                      |   37 --
 sw/source/core/view/viewsh.cxx                                      |   37 --
 sw/source/core/view/vnew.cxx                                        |   48 +-
 sw/source/core/view/vprint.cxx                                      |   37 --
 sw/source/filter/ascii/ascatr.cxx                                   |   37 --
 sw/source/filter/ascii/parasc.cxx                                   |   37 --
 sw/source/filter/ascii/wrtasc.cxx                                   |   37 --
 sw/source/filter/basflt/fltini.cxx                                  |   37 --
 sw/source/filter/basflt/iodetect.cxx                                |   37 --
 sw/source/filter/basflt/shellio.cxx                                 |   37 --
 sw/source/filter/html/SwAppletImpl.cxx                              |   37 --
 sw/source/filter/html/css1atr.cxx                                   |   37 --
 sw/source/filter/html/css1kywd.cxx                                  |   37 --
 sw/source/filter/html/css1kywd.hxx                                  |   37 --
 sw/source/filter/html/htmlatr.cxx                                   |   37 --
 sw/source/filter/html/htmlbas.cxx                                   |   37 --
 sw/source/filter/html/htmlcss1.cxx                                  |   37 --
 sw/source/filter/html/htmlctxt.cxx                                  |   37 --
 sw/source/filter/html/htmldraw.cxx                                  |   37 --
 sw/source/filter/html/htmlfld.cxx                                   |   37 --
 sw/source/filter/html/htmlfldw.cxx                                  |   37 --
 sw/source/filter/html/htmlfly.cxx                                   |   37 --
 sw/source/filter/html/htmlfly.hxx                                   |   37 --
 sw/source/filter/html/htmlform.cxx                                  |   37 --
 sw/source/filter/html/htmlform.hxx                                  |   43 --
 sw/source/filter/html/htmlforw.cxx                                  |   37 --
 sw/source/filter/html/htmlftn.cxx                                   |   37 --
 sw/source/filter/html/htmlgrin.cxx                                  |   37 --
 sw/source/filter/html/htmlnum.cxx                                   |   37 --
 sw/source/filter/html/htmlplug.cxx                                  |   37 --
 sw/source/filter/html/htmlsect.cxx                                  |   37 --
 sw/source/filter/html/htmltab.cxx                                   |   37 --
 sw/source/filter/html/htmltabw.cxx                                  |   37 --
 sw/source/filter/html/parcss1.cxx                                   |   37 --
 sw/source/filter/html/parcss1.hxx                                   |   37 --
 sw/source/filter/html/svxcss1.cxx                                   |   37 --
 sw/source/filter/html/svxcss1.hxx                                   |   37 --
 sw/source/filter/html/swhtml.cxx                                    |   37 --
 sw/source/filter/html/swhtml.hxx                                    |   37 --
 sw/source/filter/html/wrthtml.cxx                                   |   37 --
 sw/source/filter/html/wrthtml.hxx                                   |   37 --
 sw/source/filter/inc/fltini.hxx                                     |   37 --
 sw/source/filter/inc/fltshell.hxx                                   |   37 --
 sw/source/filter/inc/msfilter.hxx                                   |   37 --
 sw/source/filter/inc/wrtswtbl.hxx                                   |   37 --
 sw/source/filter/rtf/rtffld.cxx                                     |   37 --
 sw/source/filter/rtf/rtffly.cxx                                     |   37 --
 sw/source/filter/rtf/rtfnum.cxx                                     |   37 --
 sw/source/filter/rtf/rtftbl.cxx                                     |   37 --
 sw/source/filter/rtf/swparrtf.cxx                                   |   37 --
 sw/source/filter/rtf/swparrtf.hxx                                   |   37 --
 sw/source/filter/writer/writer.cxx                                  |   37 --
 sw/source/filter/writer/wrt_fn.cxx                                  |   37 --
 sw/source/filter/writer/wrtswtbl.cxx                                |   37 --
 sw/source/filter/ww1/fltshell.cxx                                   |   37 --
 sw/source/filter/ww1/w1class.cxx                                    |   37 --
 sw/source/filter/ww1/w1class.hxx                                    |   37 --
 sw/source/filter/ww1/w1filter.cxx                                   |   37 --
 sw/source/filter/ww1/w1par.cxx                                      |   37 --
 sw/source/filter/ww1/w1sprm.cxx                                     |   37 --
 sw/source/filter/ww1/w1struct.hxx                                   |   37 --
 sw/source/filter/ww8/README-rtf.txt                                 |   17 
 sw/source/filter/ww8/WW8FFData.cxx                                  |   37 --
 sw/source/filter/ww8/WW8Sttbf.cxx                                   |   37 --
 sw/source/filter/ww8/WW8TableInfo.cxx                               |   37 --
 sw/source/filter/ww8/WW8TableInfo.hxx                               |   37 --
 sw/source/filter/ww8/attributeoutputbase.hxx                        |   37 --
 sw/source/filter/ww8/escher.hxx                                     |   37 --
 sw/source/filter/ww8/fields.cxx                                     |   37 --
 sw/source/filter/ww8/hash_wrap.hxx                                  |   37 --
 sw/source/filter/ww8/needed_cast.hxx                                |   43 --
 sw/source/filter/ww8/rtfattributeoutput.cxx                         |   38 --
 sw/source/filter/ww8/rtfattributeoutput.hxx                         |   38 --
 sw/source/filter/ww8/rtfexport.cxx                                  |   53 +-
 sw/source/filter/ww8/rtfexport.hxx                                  |   38 --
 sw/source/filter/ww8/rtfexportfilter.cxx                            |   38 --
 sw/source/filter/ww8/rtfexportfilter.hxx                            |   38 --
 sw/source/filter/ww8/rtfimportfilter.cxx                            |   38 --
 sw/source/filter/ww8/rtfimportfilter.hxx                            |   38 --
 sw/source/filter/ww8/rtfsdrexport.cxx                               |   38 --
 sw/source/filter/ww8/rtfsdrexport.hxx                               |   38 --
 sw/source/filter/ww8/sortedarray.hxx                                |   37 --
 sw/source/filter/ww8/styles.cxx                                     |   37 --
 sw/source/filter/ww8/types.hxx                                      |   43 --
 sw/source/filter/ww8/writerhelper.cxx                               |   37 --
 sw/source/filter/ww8/writerhelper.hxx                               |   37 --
 sw/source/filter/ww8/writerwordglue.cxx                             |   37 --
 sw/source/filter/ww8/wrtw8esh.cxx                                   |   37 --
 sw/source/filter/ww8/wrtw8nds.cxx                                   |   37 --
 sw/source/filter/ww8/wrtw8num.cxx                                   |   37 --
 sw/source/filter/ww8/wrtw8sty.cxx                                   |  179 +++++-----
 sw/source/filter/ww8/wrtww8.cxx                                     |   37 --
 sw/source/filter/ww8/wrtww8.hxx                                     |   54 +--
 sw/source/filter/ww8/wrtww8gr.cxx                                   |   37 --
 sw/source/filter/ww8/ww8atr.cxx                                     |   37 --
 sw/source/filter/ww8/ww8attributeoutput.hxx                         |   37 --
 sw/source/filter/ww8/ww8glsy.cxx                                    |   37 --
 sw/source/filter/ww8/ww8graf.cxx                                    |   37 --
 sw/source/filter/ww8/ww8graf.hxx                                    |   37 --
 sw/source/filter/ww8/ww8graf2.cxx                                   |   37 --
 sw/source/filter/ww8/ww8par.cxx                                     |   37 --
 sw/source/filter/ww8/ww8par.hxx                                     |   37 --
 sw/source/filter/ww8/ww8par2.cxx                                    |   39 --
 sw/source/filter/ww8/ww8par2.hxx                                    |   37 --
 sw/source/filter/ww8/ww8par3.cxx                                    |   37 --
 sw/source/filter/ww8/ww8par4.cxx                                    |   37 --
 sw/source/filter/ww8/ww8par5.cxx                                    |   37 --
 sw/source/filter/ww8/ww8par6.cxx                                    |   37 --
 sw/source/filter/ww8/ww8scan.cxx                                    |   37 --
 sw/source/filter/ww8/ww8scan.hxx                                    |   37 --
 sw/source/filter/ww8/ww8struc.hxx                                   |   37 --
 sw/source/filter/xml/XMLRedlineImportHelper.cxx                     |   37 --
 sw/source/filter/xml/swxml.cxx                                      |   37 --
 sw/source/filter/xml/wrtxml.cxx                                     |   86 +---
 sw/source/filter/xml/wrtxml.hxx                                     |   39 --
 sw/source/filter/xml/xmlbrsh.cxx                                    |   37 --
 sw/source/filter/xml/xmlexp.cxx                                     |   37 --
 sw/source/filter/xml/xmlexp.hxx                                     |   37 --
 sw/source/filter/xml/xmlexpit.cxx                                   |   37 --
 sw/source/filter/xml/xmlexpit.hxx                                   |   37 --
 sw/source/filter/xml/xmlfmt.cxx                                     |   37 --
 sw/source/filter/xml/xmlfmte.cxx                                    |   37 --
 sw/source/filter/xml/xmlfonte.cxx                                   |   37 --
 sw/source/filter/xml/xmlimp.cxx                                     |   37 --
 sw/source/filter/xml/xmlimp.hxx                                     |   37 --
 sw/source/filter/xml/xmlimpit.cxx                                   |   37 --
 sw/source/filter/xml/xmlitem.cxx                                    |   37 --
 sw/source/filter/xml/xmliteme.cxx                                   |   37 --
 sw/source/filter/xml/xmlitemi.cxx                                   |   37 --
 sw/source/filter/xml/xmlitemm.cxx                                   |   39 --
 sw/source/filter/xml/xmlithlp.cxx                                   |   37 --
 sw/source/filter/xml/xmlithlp.hxx                                   |   37 --
 sw/source/filter/xml/xmlitmpr.cxx                                   |   37 --
 sw/source/filter/xml/xmlmeta.cxx                                    |   37 --
 sw/source/filter/xml/xmltble.cxx                                    |   37 --
 sw/source/filter/xml/xmltbli.cxx                                    |   37 --
 sw/source/filter/xml/xmltbli.hxx                                    |   37 --
 sw/source/filter/xml/xmltexte.cxx                                   |   37 --
 sw/source/filter/xml/xmltexti.cxx                                   |   37 --
 sw/source/ui/app/app.src                                            |   37 --
 sw/source/ui/app/appenv.cxx                                         |   37 --
 sw/source/ui/app/apphdl.cxx                                         |   37 --
 sw/source/ui/app/applab.cxx                                         |   37 --
 sw/source/ui/app/appopt.cxx                                         |   37 --
 sw/source/ui/app/docsh.cxx                                          |   37 --
 sw/source/ui/app/docsh2.cxx                                         |   37 --
 sw/source/ui/app/docshdrw.cxx                                       |   43 --
 sw/source/ui/app/docshini.cxx                                       |   37 --
 sw/source/ui/app/docst.cxx                                          |   37 --
 sw/source/ui/app/docstyle.cxx                                       |   37 --
 sw/source/ui/app/error.src                                          |   37 --
 sw/source/ui/app/mainwn.cxx                                         |   37 --
 sw/source/ui/app/mn.src                                             |   37 --
 sw/source/ui/app/swdll.cxx                                          |   37 --
 sw/source/ui/app/swmodule.cxx                                       |   37 --
 sw/source/ui/cctrl/actctrl.cxx                                      |   37 --
 sw/source/ui/cctrl/popbox.cxx                                       |   37 --
 sw/source/ui/cctrl/swlbox.cxx                                       |   37 --
 sw/source/ui/chrdlg/break.cxx                                       |   37 --
 sw/source/ui/chrdlg/ccoll.cxx                                       |   37 --
 sw/source/ui/chrdlg/ccoll.src                                       |   37 --
 sw/source/ui/chrdlg/chardlg.cxx                                     |   37 --
 sw/source/ui/chrdlg/chardlg.src                                     |   37 --
 sw/source/ui/chrdlg/chrdlg.src                                      |   43 --
 sw/source/ui/chrdlg/drpcps.cxx                                      |   37 --
 sw/source/ui/chrdlg/drpcps.src                                      |   37 --
 sw/source/ui/chrdlg/numpara.cxx                                     |   37 --
 sw/source/ui/chrdlg/numpara.src                                     |   37 --
 sw/source/ui/chrdlg/paradlg.src                                     |   37 --
 sw/source/ui/chrdlg/pardlg.cxx                                      |   37 --
 sw/source/ui/chrdlg/swuiccoll.cxx                                   |   37 --
 sw/source/ui/chrdlg/tblnumfm.cxx                                    |   43 --
 sw/source/ui/config/barcfg.cxx                                      |   37 --
 sw/source/ui/config/caption.cxx                                     |   37 --
 sw/source/ui/config/cfgitems.cxx                                    |   37 --
 sw/source/ui/config/dbconfig.cxx                                    |   37 --
 sw/source/ui/config/fontcfg.cxx                                     |   37 --
 sw/source/ui/config/mailconfigpage.cxx                              |   37 --
 sw/source/ui/config/mailconfigpage.src                              |   37 --
 sw/source/ui/config/modcfg.cxx                                      |   37 --
 sw/source/ui/config/optcomp.cxx                                     |   37 --
 sw/source/ui/config/optcomp.src                                     |   37 --
 sw/source/ui/config/optdlg.src                                      |   37 --
 sw/source/ui/config/optload.cxx                                     |   37 --
 sw/source/ui/config/optload.src                                     |   37 --
 sw/source/ui/config/optpage.cxx                                     |   37 --
 sw/source/ui/config/prtopt.cxx                                      |   37 --
 sw/source/ui/config/redlopt.src                                     |   37 --
 sw/source/ui/config/uinums.cxx                                      |   37 --
 sw/source/ui/config/usrpref.cxx                                     |   37 --
 sw/source/ui/config/viewopt.cxx                                     |   37 --
 sw/source/ui/dbui/addresslistdialog.cxx                             |   37 --
 sw/source/ui/dbui/addresslistdialog.hxx                             |   37 --
 sw/source/ui/dbui/createaddresslistdialog.cxx                       |   37 --
 sw/source/ui/dbui/createaddresslistdialog.hxx                       |   37 --
 sw/source/ui/dbui/createaddresslistdialog.src                       |   37 --
 sw/source/ui/dbui/customizeaddresslistdialog.cxx                    |   37 --
 sw/source/ui/dbui/customizeaddresslistdialog.hxx                    |   37 --
 sw/source/ui/dbui/customizeaddresslistdialog.src                    |   37 --
 sw/source/ui/dbui/dbinsdlg.cxx                                      |   37 --
 sw/source/ui/dbui/dbmgr.cxx                                         |   37 --
 sw/source/ui/dbui/dbtablepreviewdialog.cxx                          |   37 --
 sw/source/ui/dbui/dbtablepreviewdialog.hxx                          |   43 --
 sw/source/ui/dbui/dbtree.cxx                                        |   37 --
 sw/source/ui/dbui/dbui.cxx                                          |   37 --
 sw/source/ui/dbui/dbui.src                                          |   37 --
 sw/source/ui/dbui/maildispatcher.cxx                                |   37 --
 sw/source/ui/dbui/mailmergechildwindow.cxx                          |   37 --
 sw/source/ui/dbui/mailmergechildwindow.src                          |   37 --
 sw/source/ui/dbui/mailmergehelper.cxx                               |   37 --
 sw/source/ui/dbui/mailmergewizard.cxx                               |   37 --
 sw/source/ui/dbui/mmaddressblockpage.cxx                            |   37 --
 sw/source/ui/dbui/mmaddressblockpage.hxx                            |   37 --
 sw/source/ui/dbui/mmaddressblockpage.src                            |   37 --
 sw/source/ui/dbui/mmconfigitem.cxx                                  |   37 --
 sw/source/ui/dbui/mmdocselectpage.cxx                               |   37 --
 sw/source/ui/dbui/mmdocselectpage.hxx                               |   43 --
 sw/source/ui/dbui/mmgreetingspage.cxx                               |   37 --
 sw/source/ui/dbui/mmgreetingspage.hxx                               |   37 --
 sw/source/ui/dbui/mmlayoutpage.cxx                                  |   37 --
 sw/source/ui/dbui/mmlayoutpage.hxx                                  |   37 --
 sw/source/ui/dbui/mmmergepage.cxx                                   |   37 --
 sw/source/ui/dbui/mmmergepage.hxx                                   |   43 --
 sw/source/ui/dbui/mmmergepage.src                                   |   37 --
 sw/source/ui/dbui/mmoutputpage.cxx                                  |   37 --
 sw/source/ui/dbui/mmoutputpage.hxx                                  |   37 --
 sw/source/ui/dbui/mmoutputtypepage.cxx                              |   47 --
 sw/source/ui/dbui/mmoutputtypepage.hrc                              |   44 --
 sw/source/ui/dbui/mmoutputtypepage.hxx                              |   44 --
 sw/source/ui/dbui/mmoutputtypepage.src                              |   45 --
 sw/source/ui/dbui/mmpreparemergepage.cxx                            |   37 --
 sw/source/ui/dbui/mmpreparemergepage.hxx                            |   37 --
 sw/source/ui/dbui/selectdbtabledialog.cxx                           |   37 --
 sw/source/ui/dbui/selectdbtabledialog.hxx                           |   37 --
 sw/source/ui/dbui/swdbtoolsclient.cxx                               |   37 --
 sw/source/ui/dialog/SwSpellDialogChildWindow.cxx                    |   37 --
 sw/source/ui/dialog/abstract.src                                    |   37 --
 sw/source/ui/dialog/addrdlg.cxx                                     |   43 --
 sw/source/ui/dialog/ascfldlg.cxx                                    |   37 --
 sw/source/ui/dialog/dialog.src                                      |   43 --
 sw/source/ui/dialog/docstdlg.cxx                                    |   37 --
 sw/source/ui/dialog/docstdlg.src                                    |   37 --
 sw/source/ui/dialog/macassgn.cxx                                    |   37 --
 sw/source/ui/dialog/regionsw.cxx                                    |   37 --
 sw/source/ui/dialog/regionsw.src                                    |   37 --
 sw/source/ui/dialog/swabstdlg.cxx                                   |   43 --
 sw/source/ui/dialog/swdialmgr.cxx                                   |   43 --
 sw/source/ui/dialog/swdlgfact.cxx                                   |   37 --
 sw/source/ui/dialog/swdlgfact.hxx                                   |   37 --
 sw/source/ui/dialog/uiregionsw.cxx                                  |   37 --
 sw/source/ui/dialog/wordcountdialog.cxx                             |   37 --
 sw/source/ui/dochdl/gloshdl.cxx                                     |   37 --
 sw/source/ui/dochdl/selglos.cxx                                     |   43 --
 sw/source/ui/dochdl/selglos.src                                     |   37 --
 sw/source/ui/dochdl/swdtflvr.cxx                                    |   37 --
 sw/source/ui/docvw/AnchorOverlayObject.cxx                          |   37 --
 sw/source/ui/docvw/AnnotationMenuButton.cxx                         |   37 --
 sw/source/ui/docvw/AnnotationWin.cxx                                |   37 --
 sw/source/ui/docvw/PostItMgr.cxx                                    |   37 --
 sw/source/ui/docvw/ShadowOverlayObject.cxx                          |   37 --
 sw/source/ui/docvw/SidebarTxtControl.cxx                            |   37 --
 sw/source/ui/docvw/SidebarTxtControl.hxx                            |   37 --
 sw/source/ui/docvw/SidebarTxtControlAcc.cxx                         |   37 --
 sw/source/ui/docvw/SidebarWin.cxx                                   |   37 --
 sw/source/ui/docvw/SidebarWinAcc.cxx                                |   37 --
 sw/source/ui/docvw/docvw.src                                        |   37 --
 sw/source/ui/docvw/edtdd.cxx                                        |   37 --
 sw/source/ui/docvw/edtwin.cxx                                       |   37 --
 sw/source/ui/docvw/edtwin2.cxx                                      |   37 --
 sw/source/ui/docvw/edtwin3.cxx                                      |   37 --
 sw/source/ui/docvw/romenu.cxx                                       |   37 --
 sw/source/ui/docvw/romenu.hxx                                       |   37 --
 sw/source/ui/docvw/srcedtw.cxx                                      |   37 --
 sw/source/ui/envelp/envfmt.cxx                                      |   37 --
 sw/source/ui/envelp/envfmt.hxx                                      |   37 --
 sw/source/ui/envelp/envfmt.src                                      |   37 --
 sw/source/ui/envelp/envimg.cxx                                      |   37 --
 sw/source/ui/envelp/envlop.src                                      |   37 --
 sw/source/ui/envelp/envlop1.cxx                                     |   37 --
 sw/source/ui/envelp/envprt.cxx                                      |   37 --
 sw/source/ui/envelp/envprt.hxx                                      |   37 --
 sw/source/ui/envelp/envprt.src                                      |   37 --
 sw/source/ui/envelp/label.src                                       |   37 --
 sw/source/ui/envelp/label1.cxx                                      |   37 --
 sw/source/ui/envelp/labelcfg.cxx                                    |   37 --
 sw/source/ui/envelp/labelexp.cxx                                    |   37 --
 sw/source/ui/envelp/labfmt.cxx                                      |   37 --
 sw/source/ui/envelp/labfmt.hxx                                      |   37 --
 sw/source/ui/envelp/labfmt.src                                      |   37 --
 sw/source/ui/envelp/labimg.cxx                                      |   37 --
 sw/source/ui/envelp/labimp.hxx                                      |   37 --
 sw/source/ui/envelp/labprt.cxx                                      |   37 --
 sw/source/ui/envelp/labprt.hxx                                      |   37 --
 sw/source/ui/envelp/labprt.src                                      |   37 --
 sw/source/ui/envelp/mailmrge.cxx                                    |   37 --
 sw/source/ui/envelp/mailmrge.src                                    |   37 --
 sw/source/ui/envelp/swuilabimp.hxx                                  |   37 --
 sw/source/ui/envelp/syncbtn.cxx                                     |   37 --
 sw/source/ui/fldui/DropDownFieldDialog.cxx                          |   37 --
 sw/source/ui/fldui/changedb.cxx                                     |   37 --
 sw/source/ui/fldui/changedb.hrc                                     |   43 --
 sw/source/ui/fldui/flddb.cxx                                        |   37 --
 sw/source/ui/fldui/flddb.hxx                                        |   37 --
 sw/source/ui/fldui/flddb.src                                        |   37 --
 sw/source/ui/fldui/flddinf.cxx                                      |   37 --
 sw/source/ui/fldui/flddinf.hxx                                      |   37 --
 sw/source/ui/fldui/flddinf.src                                      |   37 --
 sw/source/ui/fldui/flddok.cxx                                       |   37 --
 sw/source/ui/fldui/flddok.hxx                                       |   37 --
 sw/source/ui/fldui/flddok.src                                       |   37 --
 sw/source/ui/fldui/fldedt.cxx                                       |   37 --
 sw/source/ui/fldui/fldfunc.cxx                                      |   37 --
 sw/source/ui/fldui/fldfunc.hxx                                      |   37 --
 sw/source/ui/fldui/fldfunc.src                                      |   37 --
 sw/source/ui/fldui/fldmgr.cxx                                       |   45 --
 sw/source/ui/fldui/fldpage.cxx                                      |   37 --
 sw/source/ui/fldui/fldpage.hxx                                      |   37 --
 sw/source/ui/fldui/fldref.cxx                                       |   37 --
 sw/source/ui/fldui/fldref.hxx                                       |   37 --
 sw/source/ui/fldui/fldref.src                                       |   37 --
 sw/source/ui/fldui/fldtdlg.cxx                                      |   37 --
 sw/source/ui/fldui/fldui.src                                        |   37 --
 sw/source/ui/fldui/fldvar.cxx                                       |   37 --
 sw/source/ui/fldui/fldvar.hxx                                       |   37 --
 sw/source/ui/fldui/fldvar.src                                       |   37 --
 sw/source/ui/fldui/fldwrap.cxx                                      |   37 --
 sw/source/ui/fldui/inpdlg.cxx                                       |   37 --
 sw/source/ui/fldui/javaedit.cxx                                     |   37 --
 sw/source/ui/fldui/xfldui.cxx                                       |   37 --
 sw/source/ui/fmtui/tmpdlg.cxx                                       |   37 --
 sw/source/ui/fmtui/tmpdlg.src                                       |   37 --
 sw/source/ui/frmdlg/colex.cxx                                       |   37 --
 sw/source/ui/frmdlg/colmgr.cxx                                      |   37 --
 sw/source/ui/frmdlg/column.cxx                                      |   37 --
 sw/source/ui/frmdlg/column.src                                      |   37 --
 sw/source/ui/frmdlg/cption.cxx                                      |   37 --
 sw/source/ui/frmdlg/frmdlg.cxx                                      |   37 --
 sw/source/ui/frmdlg/frmmgr.cxx                                      |   37 --
 sw/source/ui/frmdlg/frmpage.cxx                                     |   37 --
 sw/source/ui/frmdlg/frmpage.src                                     |   37 --
 sw/source/ui/frmdlg/frmui.src                                       |   37 --
 sw/source/ui/frmdlg/pattern.cxx                                     |   43 --
 sw/source/ui/frmdlg/uiborder.cxx                                    |   37 --
 sw/source/ui/frmdlg/wrap.cxx                                        |   37 --
 sw/source/ui/frmdlg/wrap.src                                        |   37 --
 sw/source/ui/globdoc/globdoc.cxx                                    |   37 --
 sw/source/ui/inc/SwXFilterOptions.hxx                               |   37 --
 sw/source/ui/inc/actctrl.hxx                                        |   37 --
 sw/source/ui/inc/annotsh.hxx                                        |   37 --
 sw/source/ui/inc/basesh.hxx                                         |   37 --
 sw/source/ui/inc/bmpwin.hxx                                         |   43 --
 sw/source/ui/inc/bookmark.hxx                                       |   37 --
 sw/source/ui/inc/break.hxx                                          |   37 --
 sw/source/ui/inc/caption.hxx                                        |   37 --
 sw/source/ui/inc/cfgitems.hxx                                       |   37 --
 sw/source/ui/inc/changedb.hxx                                       |   37 --
 sw/source/ui/inc/chrdlg.hxx                                         |   37 --
 sw/source/ui/inc/colex.hxx                                          |   37 --
 sw/source/ui/inc/colmgr.hxx                                         |   37 --
 sw/source/ui/inc/column.hxx                                         |   37 --
 sw/source/ui/inc/conarc.hxx                                         |   43 --
 sw/source/ui/inc/concustomshape.hxx                                 |   37 --
 sw/source/ui/inc/condedit.hxx                                       |   43 --
 sw/source/ui/inc/conform.hxx                                        |   43 --
 sw/source/ui/inc/conpoly.hxx                                        |   43 --
 sw/source/ui/inc/conrect.hxx                                        |   43 --
 sw/source/ui/inc/content.hxx                                        |   37 --
 sw/source/ui/inc/conttree.hxx                                       |   37 --
 sw/source/ui/inc/convert.hxx                                        |   37 --
 sw/source/ui/inc/cption.hxx                                         |   37 --
 sw/source/ui/inc/dbinsdlg.hxx                                       |   37 --
 sw/source/ui/inc/dbtree.hxx                                         |   37 --
 sw/source/ui/inc/dialmgr.hxx                                        |   43 --
 sw/source/ui/inc/docstdlg.hxx                                       |   37 --
 sw/source/ui/inc/drawbase.hxx                                       |   37 --
 sw/source/ui/inc/drpcps.hxx                                         |   37 --
 sw/source/ui/inc/drwtxtsh.hxx                                       |   37 --
 sw/source/ui/inc/dselect.hxx                                        |   43 --
 sw/source/ui/inc/edtwin.hxx                                         |   37 --
 sw/source/ui/inc/envimg.hxx                                         |   37 --
 sw/source/ui/inc/envlop.hxx                                         |   37 --
 sw/source/ui/inc/fldedt.hxx                                         |   43 --
 sw/source/ui/inc/fldmgr.hxx                                         |   37 --
 sw/source/ui/inc/fldtdlg.hxx                                        |   43 --
 sw/source/ui/inc/formatclipboard.hxx                                |   37 --
 sw/source/ui/inc/formedt.hxx                                        |   37 --
 sw/source/ui/inc/frmdlg.hxx                                         |   43 --
 sw/source/ui/inc/frmmgr.hxx                                         |   37 --
 sw/source/ui/inc/frmpage.hxx                                        |   37 --
 sw/source/ui/inc/glosbib.hxx                                        |   37 --
 sw/source/ui/inc/glosdoc.hxx                                        |   37 --
 sw/source/ui/inc/gloshdl.hxx                                        |   37 --
 sw/source/ui/inc/gloslst.hxx                                        |   37 --
 sw/source/ui/inc/glossary.hxx                                       |   37 --
 sw/source/ui/inc/hyp.hxx                                            |   43 --
 sw/source/ui/inc/idxmrk.hxx                                         |   43 --
 sw/source/ui/inc/initui.hxx                                         |   37 --
 sw/source/ui/inc/inpdlg.hxx                                         |   37 --
 sw/source/ui/inc/inputwin.hxx                                       |   37 --
 sw/source/ui/inc/insfnote.hxx                                       |   37 --
 sw/source/ui/inc/instable.hxx                                       |   37 --
 sw/source/ui/inc/javaedit.hxx                                       |   37 --
 sw/source/ui/inc/label.hxx                                          |   37 --
 sw/source/ui/inc/labimg.hxx                                         |   37 --
 sw/source/ui/inc/linenum.hxx                                        |   37 --
 sw/source/ui/inc/macassgn.hxx                                       |   43 --
 sw/source/ui/inc/mailconfigpage.hxx                                 |   37 --
 sw/source/ui/inc/maildispatcher.hxx                                 |   37 --
 sw/source/ui/inc/mailmergechildwindow.hxx                           |   43 --
 sw/source/ui/inc/mailmergehelper.hxx                                |   37 --
 sw/source/ui/inc/mailmrge.hxx                                       |   37 --
 sw/source/ui/inc/mmconfigitem.hxx                                   |   37 --
 sw/source/ui/inc/multmrk.hxx                                        |   43 --
 sw/source/ui/inc/navicfg.hxx                                        |   37 --
 sw/source/ui/inc/navicont.hxx                                       |   43 --
 sw/source/ui/inc/navipi.hxx                                         |   37 --
 sw/source/ui/inc/numpara.hxx                                        |   37 --
 sw/source/ui/inc/olmenu.hxx                                         |   37 --
 sw/source/ui/inc/optcomp.hxx                                        |   37 --
 sw/source/ui/inc/optpage.hxx                                        |   37 --
 sw/source/ui/inc/outline.hxx                                        |   37 --
 sw/source/ui/inc/pgfnote.hxx                                        |   37 --
 sw/source/ui/inc/pggrid.hxx                                         |   37 --
 sw/source/ui/inc/popbox.hxx                                         |   43 --
 sw/source/ui/inc/prcntfld.hxx                                       |   37 --
 sw/source/ui/inc/pview.hxx                                          |   37 --
 sw/source/ui/inc/redlndlg.hxx                                       |   37 --
 sw/source/ui/inc/regionsw.hxx                                       |   37 --
 sw/source/ui/inc/scroll.hxx                                         |   43 --
 sw/source/ui/inc/srcedtw.hxx                                        |   37 --
 sw/source/ui/inc/srcview.hxx                                        |   37 --
 sw/source/ui/inc/srtdlg.hxx                                         |   37 --
 sw/source/ui/inc/swcont.hxx                                         |   37 --
 sw/source/ui/inc/swdtflvr.hxx                                       |   37 --
 sw/source/ui/inc/swlbox.hxx                                         |   37 --
 sw/source/ui/inc/swrenamexnameddlg.hxx                              |   37 --
 sw/source/ui/inc/swuicnttab.hxx                                     |   37 --
 sw/source/ui/inc/swuiidxmrk.hxx                                     |   37 --
 sw/source/ui/inc/syncbtn.hxx                                        |   43 --
 sw/source/ui/inc/tabledlg.hxx                                       |   43 --
 sw/source/ui/inc/tabsh.hxx                                          |   43 --
 sw/source/ui/inc/tautofmt.hxx                                       |   37 --
 sw/source/ui/inc/textsh.hxx                                         |   37 --
 sw/source/ui/inc/tmpdlg.hxx                                         |   43 --
 sw/source/ui/inc/toolbox.hrc                                        |   37 --
 sw/source/ui/inc/toxmgr.hxx                                         |   37 --
 sw/source/ui/inc/uiitems.hxx                                        |   37 --
 sw/source/ui/inc/uinums.hxx                                         |   37 --
 sw/source/ui/inc/uitool.hxx                                         |   37 --
 sw/source/ui/inc/uivwimp.hxx                                        |   37 --
 sw/source/ui/inc/unotools.hxx                                       |   37 --
 sw/source/ui/inc/unotxvw.hxx                                        |   37 --
 sw/source/ui/inc/usrpref.hxx                                        |   37 --
 sw/source/ui/inc/view.hxx                                           |   37 --
 sw/source/ui/inc/wordcountctrl.hxx                                  |    1 
 sw/source/ui/inc/wordcountdialog.hxx                                |   37 --
 sw/source/ui/inc/workctrl.hxx                                       |   37 --
 sw/source/ui/inc/wrap.hxx                                           |   37 --
 sw/source/ui/inc/wrtsh.hxx                                          |   37 --
 sw/source/ui/inc/wview.hxx                                          |   43 --
 sw/source/ui/index/cntex.cxx                                        |   37 --
 sw/source/ui/index/cnttab.cxx                                       |   37 --
 sw/source/ui/index/cnttab.src                                       |   37 --
 sw/source/ui/index/idxmrk.cxx                                       |   37 --
 sw/source/ui/index/idxmrk.src                                       |   37 --
 sw/source/ui/index/multmrk.cxx                                      |   37 --
 sw/source/ui/index/swuiidxmrk.cxx                                   |   37 --
 sw/source/ui/index/toxmgr.cxx                                       |   37 --
 sw/source/ui/lingu/hhcwrp.cxx                                       |   37 --
 sw/source/ui/lingu/hyp.cxx                                          |   37 --
 sw/source/ui/lingu/olmenu.src                                       |   37 --
 sw/source/ui/lingu/sdrhhcwrap.cxx                                   |   37 --
 sw/source/ui/misc/bookmark.cxx                                      |   37 --
 sw/source/ui/misc/bookmark.src                                      |   37 --
 sw/source/ui/misc/docfnote.cxx                                      |   37 --
 sw/source/ui/misc/docfnote.src                                      |   43 --
 sw/source/ui/misc/glosbib.src                                       |   37 --
 sw/source/ui/misc/glosdoc.cxx                                       |   37 --
 sw/source/ui/misc/glossary.cxx                                      |   37 --
 sw/source/ui/misc/glossary.src                                      |   37 --
 sw/source/ui/misc/glshell.cxx                                       |   37 --
 sw/source/ui/misc/impfnote.hxx                                      |   37 --
 sw/source/ui/misc/insfnote.cxx                                      |   37 --
 sw/source/ui/misc/insfnote.src                                      |   37 --
 sw/source/ui/misc/linenum.cxx                                       |   37 --
 sw/source/ui/misc/num.src                                           |   37 --
 sw/source/ui/misc/numberingtypelistbox.cxx                          |   37 --
 sw/source/ui/misc/numberingtypelistbox.src                          |   43 --
 sw/source/ui/misc/outline.cxx                                       |   37 --
 sw/source/ui/misc/outline.src                                       |   37 --
 sw/source/ui/misc/pgfnote.cxx                                       |   37 --
 sw/source/ui/misc/pgfnote.src                                       |   37 --
 sw/source/ui/misc/pggrid.cxx                                        |   37 --
 sw/source/ui/misc/pggrid.src                                        |   37 --
 sw/source/ui/misc/redlndlg.cxx                                      |   37 --
 sw/source/ui/misc/redlndlg.src                                      |   37 --
 sw/source/ui/misc/srtdlg.cxx                                        |   37 --
 sw/source/ui/misc/srtdlg.src                                        |   43 --
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx                       |   37 --
 sw/source/ui/ribbar/conarc.cxx                                      |   37 --
 sw/source/ui/ribbar/concustomshape.cxx                              |   37 --
 sw/source/ui/ribbar/conform.cxx                                     |   37 --
 sw/source/ui/ribbar/conpoly.cxx                                     |   37 --
 sw/source/ui/ribbar/conrect.cxx                                     |   37 --
 sw/source/ui/ribbar/drawbase.cxx                                    |   37 --
 sw/source/ui/ribbar/inputwin.cxx                                    |   37 --
 sw/source/ui/ribbar/inputwin.src                                    |   37 --
 sw/source/ui/ribbar/tbxanchr.cxx                                    |   37 --
 sw/source/ui/ribbar/tbxanchr.src                                    |   43 --
 sw/source/ui/ribbar/workctrl.cxx                                    |   37 --
 sw/source/ui/ribbar/workctrl.src                                    |   37 --
 sw/source/ui/shells/annotsh.cxx                                     |   37 --
 sw/source/ui/shells/basesh.cxx                                      |   37 --
 sw/source/ui/shells/beziersh.cxx                                    |   37 --
 sw/source/ui/shells/drawdlg.cxx                                     |   37 --
 sw/source/ui/shells/drawsh.cxx                                      |   37 --
 sw/source/ui/shells/drformsh.cxx                                    |   37 --
 sw/source/ui/shells/drwbassh.cxx                                    |   37 --
 sw/source/ui/shells/drwtxtex.cxx                                    |   37 --
 sw/source/ui/shells/drwtxtsh.cxx                                    |   37 --
 sw/source/ui/shells/frmsh.cxx                                       |   37 --
 sw/source/ui/shells/grfshex.cxx                                     |   37 --
 sw/source/ui/shells/langhelper.cxx                                  |   37 --
 sw/source/ui/shells/listsh.cxx                                      |   37 --
 sw/source/ui/shells/mediash.cxx                                     |   37 --
 sw/source/ui/shells/shells.src                                      |   37 --
 sw/source/ui/shells/tabsh.cxx                                       |   37 --
 sw/source/ui/shells/textdrw.cxx                                     |   37 --
 sw/source/ui/shells/textfld.cxx                                     |   37 --
 sw/source/ui/shells/textglos.cxx                                    |   37 --
 sw/source/ui/shells/textidx.cxx                                     |   37 --
 sw/source/ui/shells/textsh.cxx                                      |   37 --
 sw/source/ui/shells/textsh1.cxx                                     |   37 --
 sw/source/ui/shells/textsh2.cxx                                     |   37 --
 sw/source/ui/shells/txtattr.cxx                                     |   37 --
 sw/source/ui/shells/txtcrsr.cxx                                     |   37 --
 sw/source/ui/shells/txtnum.cxx                                      |   37 --
 sw/source/ui/table/chartins.cxx                                     |   37 --
 sw/source/ui/table/chartins.src                                     |   37 --
 sw/source/ui/table/colwd.cxx                                        |   37 --
 sw/source/ui/table/convert.cxx                                      |   37 --
 sw/source/ui/table/instable.cxx                                     |   37 --
 sw/source/ui/table/rowht.src                                        |   37 --
 sw/source/ui/table/swtablerep.cxx                                   |   37 --
 sw/source/ui/table/tabledlg.cxx                                     |   37 --
 sw/source/ui/table/tabledlg.src                                     |   37 --
 sw/source/ui/table/tablemgr.cxx                                     |   37 --
 sw/source/ui/table/tablepg.hxx                                      |   37 --
 sw/source/ui/table/tautofmt.cxx                                     |   37 --
 sw/source/ui/uiview/formatclipboard.cxx                             |   37 --
 sw/source/ui/uiview/pview.cxx                                       |   37 --
 sw/source/ui/uiview/scroll.cxx                                      |   37 --
 sw/source/ui/uiview/swcli.cxx                                       |   37 --
 sw/source/ui/uiview/view.cxx                                        |   37 --
 sw/source/ui/uiview/view1.cxx                                       |   37 --
 sw/source/ui/uiview/view2.cxx                                       |   37 --
 sw/source/ui/uiview/viewcoll.cxx                                    |   37 --
 sw/source/ui/uiview/viewdlg.cxx                                     |   37 --
 sw/source/ui/uiview/viewdlg2.cxx                                    |   37 --
 sw/source/ui/uiview/viewdraw.cxx                                    |   37 --
 sw/source/ui/uiview/viewling.cxx                                    |   37 --
 sw/source/ui/uiview/viewmdi.cxx                                     |   37 --
 sw/source/ui/uiview/viewport.cxx                                    |   37 --
 sw/source/ui/uiview/viewprt.cxx                                     |   37 --
 sw/source/ui/uiview/viewsrch.cxx                                    |   37 --
 sw/source/ui/uiview/viewstat.cxx                                    |   37 --
 sw/source/ui/uiview/viewtab.cxx                                     |   37 --
 sw/source/ui/uno/RefreshListenerContainer.cxx                       |   43 --
 sw/source/ui/uno/SwXDocumentSettings.cxx                            |   37 --
 sw/source/ui/uno/SwXFilterOptions.cxx                               |   37 --
 sw/source/ui/uno/detreg.cxx                                         |   37 --
 sw/source/ui/uno/dlelstnr.cxx                                       |   37 --
 sw/source/ui/uno/swdet2.cxx                                         |   37 --
 sw/source/ui/uno/swdetect.cxx                                       |   37 --
 sw/source/ui/uno/swdetect.hxx                                       |   37 --
 sw/source/ui/uno/unoatxt.cxx                                        |   37 --
 sw/source/ui/uno/unodefaults.cxx                                    |   43 --
 sw/source/ui/uno/unodispatch.cxx                                    |   37 --
 sw/source/ui/uno/unodoc.cxx                                         |   37 --
 sw/source/ui/uno/unofreg.cxx                                        |   37 --
 sw/source/ui/uno/unomailmerge.cxx                                   |   37 --
 sw/source/ui/uno/unomod.cxx                                         |   37 --
 sw/source/ui/uno/unomodule.cxx                                      |   37 --
 sw/source/ui/uno/unomodule.hxx                                      |   37 --
 sw/source/ui/uno/unotxdoc.cxx                                       |  103 ++++-
 sw/source/ui/uno/unotxvw.cxx                                        |   37 --
 sw/source/ui/utlui/attrdesc.cxx                                     |   37 --
 sw/source/ui/utlui/attrdesc.src                                     |   37 --
 sw/source/ui/utlui/condedit.cxx                                     |   37 --
 sw/source/ui/utlui/content.cxx                                      |   37 --
 sw/source/ui/utlui/glbltree.cxx                                     |   37 --
 sw/source/ui/utlui/gloslst.cxx                                      |   37 --
 sw/source/ui/utlui/initui.cxx                                       |   37 --
 sw/source/ui/utlui/initui.src                                       |   37 --
 sw/source/ui/utlui/navicfg.cxx                                      |   37 --
 sw/source/ui/utlui/navipi.cxx                                       |   37 --
 sw/source/ui/utlui/navipi.src                                       |   37 --
 sw/source/ui/utlui/numfmtlb.cxx                                     |   37 --
 sw/source/ui/utlui/prcntfld.cxx                                     |   37 --
 sw/source/ui/utlui/swrenamexnameddlg.cxx                            |   37 --
 sw/source/ui/utlui/textcontrolcombo.cxx                             |   37 --
 sw/source/ui/utlui/uiitems.cxx                                      |   37 --
 sw/source/ui/utlui/uitool.cxx                                       |   37 --
 sw/source/ui/utlui/unotools.cxx                                     |   37 --
 sw/source/ui/utlui/utlui.src                                        |   37 --
 sw/source/ui/utlui/viewlayoutctrl.cxx                               |   37 --
 sw/source/ui/utlui/wordcountctrl.cxx                                |    1 
 sw/source/ui/vba/service.cxx                                        |   37 --
 sw/source/ui/vba/vbaaddin.cxx                                       |   37 --
 sw/source/ui/vba/vbaaddin.hxx                                       |   43 --
 sw/source/ui/vba/vbaaddins.cxx                                      |   37 --
 sw/source/ui/vba/vbaaddins.hxx                                      |   43 --
 sw/source/ui/vba/vbaapplication.cxx                                 |   37 --
 sw/source/ui/vba/vbaapplication.hxx                                 |   37 --
 sw/source/ui/vba/vbaautotextentry.cxx                               |   37 --
 sw/source/ui/vba/vbaautotextentry.hxx                               |   37 --
 sw/source/ui/vba/vbabookmark.cxx                                    |   37 --
 sw/source/ui/vba/vbabookmark.hxx                                    |   43 --
 sw/source/ui/vba/vbabookmarks.cxx                                   |   37 --
 sw/source/ui/vba/vbabookmarks.hxx                                   |   37 --
 sw/source/ui/vba/vbaborders.cxx                                     |   37 --
 sw/source/ui/vba/vbaborders.hxx                                     |   43 --
 sw/source/ui/vba/vbacell.cxx                                        |   37 --
 sw/source/ui/vba/vbacell.hxx                                        |   43 --
 sw/source/ui/vba/vbacells.cxx                                       |   37 --
 sw/source/ui/vba/vbacells.hxx                                       |   37 --
 sw/source/ui/vba/vbacheckbox.cxx                                    |   37 --
 sw/source/ui/vba/vbacheckbox.hxx                                    |   43 --
 sw/source/ui/vba/vbacolumn.cxx                                      |   37 --
 sw/source/ui/vba/vbacolumn.hxx                                      |   43 --
 sw/source/ui/vba/vbacolumns.cxx                                     |   37 --
 sw/source/ui/vba/vbacolumns.hxx                                     |   37 --
 sw/source/ui/vba/vbadialog.cxx                                      |   37 --
 sw/source/ui/vba/vbadialog.hxx                                      |   43 --
 sw/source/ui/vba/vbadialogs.cxx                                     |   43 --
 sw/source/ui/vba/vbadialogs.hxx                                     |   43 --
 sw/source/ui/vba/vbadocument.cxx                                    |   37 --
 sw/source/ui/vba/vbadocument.hxx                                    |   37 --
 sw/source/ui/vba/vbadocumentproperties.cxx                          |   37 --
 sw/source/ui/vba/vbadocumentproperties.hxx                          |   43 --
 sw/source/ui/vba/vbadocuments.cxx                                   |   37 --
 sw/source/ui/vba/vbadocuments.hxx                                   |   43 --
 sw/source/ui/vba/vbafield.cxx                                       |   37 --
 sw/source/ui/vba/vbafield.hxx                                       |   37 --
 sw/source/ui/vba/vbafind.cxx                                        |   37 --
 sw/source/ui/vba/vbafind.hxx                                        |   37 --
 sw/source/ui/vba/vbafont.cxx                                        |   18 +
 sw/source/ui/vba/vbafont.hxx                                        |   18 +
 sw/source/ui/vba/vbaformfield.cxx                                   |   37 --
 sw/source/ui/vba/vbaformfield.hxx                                   |   43 --
 sw/source/ui/vba/vbaformfields.cxx                                  |   37 --
 sw/source/ui/vba/vbaformfields.hxx                                  |   43 --
 sw/source/ui/vba/vbaframe.cxx                                       |   37 --
 sw/source/ui/vba/vbaframe.hxx                                       |   43 --
 sw/source/ui/vba/vbaframes.cxx                                      |   37 --
 sw/source/ui/vba/vbaframes.hxx                                      |   43 --
 sw/source/ui/vba/vbaglobals.cxx                                     |   37 --
 sw/source/ui/vba/vbaglobals.hxx                                     |   37 --
 sw/source/ui/vba/vbaheaderfooter.cxx                                |   37 --
 sw/source/ui/vba/vbaheaderfooter.hxx                                |   43 --
 sw/source/ui/vba/vbaheaderfooterhelper.cxx                          |   37 --
 sw/source/ui/vba/vbaheaderfooterhelper.hxx                          |   43 --
 sw/source/ui/vba/vbaheadersfooters.cxx                              |   37 --
 sw/source/ui/vba/vbaheadersfooters.hxx                              |   43 --
 sw/source/ui/vba/vbalistformat.cxx                                  |   37 --
 sw/source/ui/vba/vbalistformat.hxx                                  |   43 --
 sw/source/ui/vba/vbalistgalleries.cxx                               |   37 --
 sw/source/ui/vba/vbalistgalleries.hxx                               |   43 --
 sw/source/ui/vba/vbalistgallery.cxx                                 |   43 --
 sw/source/ui/vba/vbalistgallery.hxx                                 |   43 --
 sw/source/ui/vba/vbalisthelper.cxx                                  |   37 --
 sw/source/ui/vba/vbalistlevel.cxx                                   |   37 --
 sw/source/ui/vba/vbalistlevel.hxx                                   |   37 --
 sw/source/ui/vba/vbalistlevels.cxx                                  |   37 --
 sw/source/ui/vba/vbalistlevels.hxx                                  |   43 --
 sw/source/ui/vba/vbalisttemplate.cxx                                |   37 --
 sw/source/ui/vba/vbalisttemplate.hxx                                |   43 --
 sw/source/ui/vba/vbalisttemplates.cxx                               |   37 --
 sw/source/ui/vba/vbalisttemplates.hxx                               |   43 --
 sw/source/ui/vba/vbaoptions.cxx                                     |   37 --
 sw/source/ui/vba/vbaoptions.hxx                                     |   37 --
 sw/source/ui/vba/vbapagesetup.cxx                                   |   37 --
 sw/source/ui/vba/vbapagesetup.hxx                                   |   43 --
 sw/source/ui/vba/vbapalette.cxx                                     |   18 +
 sw/source/ui/vba/vbapane.cxx                                        |   37 --
 sw/source/ui/vba/vbapane.hxx                                        |   43 --
 sw/source/ui/vba/vbapanes.cxx                                       |   37 --
 sw/source/ui/vba/vbapanes.hxx                                       |   43 --
 sw/source/ui/vba/vbaparagraph.cxx                                   |   37 --
 sw/source/ui/vba/vbaparagraph.hxx                                   |   37 --
 sw/source/ui/vba/vbaparagraphformat.cxx                             |   37 --
 sw/source/ui/vba/vbaparagraphformat.hxx                             |   37 --
 sw/source/ui/vba/vbarange.cxx                                       |   37 --
 sw/source/ui/vba/vbarange.hxx                                       |   37 --
 sw/source/ui/vba/vbarangehelper.cxx                                 |   37 --
 sw/source/ui/vba/vbarangehelper.hxx                                 |   43 --
 sw/source/ui/vba/vbareplacement.cxx                                 |   37 --
 sw/source/ui/vba/vbareplacement.hxx                                 |   43 --
 sw/source/ui/vba/vbarevision.cxx                                    |   37 --
 sw/source/ui/vba/vbarevision.hxx                                    |   43 --
 sw/source/ui/vba/vbarevisions.cxx                                   |   37 --
 sw/source/ui/vba/vbarevisions.hxx                                   |   43 --
 sw/source/ui/vba/vbarow.cxx                                         |   37 --
 sw/source/ui/vba/vbarow.hxx                                         |   43 --
 sw/source/ui/vba/vbarows.cxx                                        |   37 --
 sw/source/ui/vba/vbarows.hxx                                        |   37 --
 sw/source/ui/vba/vbasection.cxx                                     |   37 --
 sw/source/ui/vba/vbasection.hxx                                     |   43 --
 sw/source/ui/vba/vbasections.cxx                                    |   37 --
 sw/source/ui/vba/vbasections.hxx                                    |   43 --
 sw/source/ui/vba/vbaselection.cxx                                   |   37 --
 sw/source/ui/vba/vbaselection.hxx                                   |   37 --
 sw/source/ui/vba/vbastyle.cxx                                       |   37 --
 sw/source/ui/vba/vbastyle.hxx                                       |   37 --
 sw/source/ui/vba/vbastyles.cxx                                      |   37 --
 sw/source/ui/vba/vbastyles.hxx                                      |   43 --
 sw/source/ui/vba/vbasystem.cxx                                      |   37 --
 sw/source/ui/vba/vbasystem.hxx                                      |   37 --
 sw/source/ui/vba/vbatable.cxx                                       |   18 +
 sw/source/ui/vba/vbatable.hxx                                       |   18 +
 sw/source/ui/vba/vbatablehelper.cxx                                 |   37 --
 sw/source/ui/vba/vbatablehelper.hxx                                 |   43 --
 sw/source/ui/vba/vbatableofcontents.cxx                             |   37 --
 sw/source/ui/vba/vbatableofcontents.hxx                             |   43 --
 sw/source/ui/vba/vbatables.cxx                                      |   18 +
 sw/source/ui/vba/vbatables.hxx                                      |   18 +
 sw/source/ui/vba/vbatablesofcontents.cxx                            |   37 --
 sw/source/ui/vba/vbatablesofcontents.hxx                            |   43 --
 sw/source/ui/vba/vbatabstop.cxx                                     |   43 --
 sw/source/ui/vba/vbatabstop.hxx                                     |   43 --
 sw/source/ui/vba/vbatabstops.cxx                                    |   37 --
 sw/source/ui/vba/vbatabstops.hxx                                    |   43 --
 sw/source/ui/vba/vbatemplate.cxx                                    |   37 --
 sw/source/ui/vba/vbatemplate.hxx                                    |   43 --
 sw/source/ui/vba/vbavariable.cxx                                    |   37 --
 sw/source/ui/vba/vbavariable.hxx                                    |   43 --
 sw/source/ui/vba/vbavariables.cxx                                   |   37 --
 sw/source/ui/vba/vbavariables.hxx                                   |   43 --
 sw/source/ui/vba/vbaview.cxx                                        |   37 --
 sw/source/ui/vba/vbaview.hxx                                        |   43 --
 sw/source/ui/vba/vbawindow.cxx                                      |   37 --
 sw/source/ui/vba/vbawindow.hxx                                      |   43 --
 sw/source/ui/vba/vbawrapformat.cxx                                  |   37 --
 sw/source/ui/vba/vbawrapformat.hxx                                  |   43 --
 sw/source/ui/vba/wordvbahelper.cxx                                  |   37 --
 sw/source/ui/vba/wordvbahelper.hxx                                  |   43 --
 sw/source/ui/web/wformsh.cxx                                        |   43 --
 sw/source/ui/web/wfrmsh.cxx                                         |   37 --
 sw/source/ui/web/wlistsh.cxx                                        |   43 --
 sw/source/ui/web/wolesh.cxx                                         |   43 --
 sw/source/ui/web/wtabsh.cxx                                         |   37 --
 sw/source/ui/web/wtextsh.cxx                                        |   37 --
 sw/source/ui/wrtsh/delete.cxx                                       |   37 --
 sw/source/ui/wrtsh/move.cxx                                         |   37 --
 sw/source/ui/wrtsh/select.cxx                                       |   37 --
 sw/source/ui/wrtsh/wrtsh1.cxx                                       |   37 --
 sw/source/ui/wrtsh/wrtsh2.cxx                                       |   37 --
 sw/source/ui/wrtsh/wrtsh3.cxx                                       |   37 --
 sw/source/ui/wrtsh/wrtsh4.cxx                                       |   37 --
 sw/source/ui/wrtsh/wrtundo.cxx                                      |   37 --
 sw/uiconfig/sglobal/menubar/menubar.xml                             |   17 
 sw/uiconfig/sglobal/statusbar/statusbar.xml                         |   17 
 sw/uiconfig/sglobal/toolbar/alignmentbar.xml                        |   17 
 sw/uiconfig/sglobal/toolbar/arrowshapes.xml                         |   17 
 sw/uiconfig/sglobal/toolbar/basicshapes.xml                         |   17 
 sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml                     |   17 
 sw/uiconfig/sglobal/toolbar/calloutshapes.xml                       |   17 
 sw/uiconfig/sglobal/toolbar/colorbar.xml                            |   17 
 sw/uiconfig/sglobal/toolbar/drawbar.xml                             |   17 
 sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml                    |   17 
 sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml                   |   17 
 sw/uiconfig/sglobal/toolbar/extrusionobjectbar.xml                  |   17 
 sw/uiconfig/sglobal/toolbar/findbar.xml                             |   17 
 sw/uiconfig/sglobal/toolbar/flowchartshapes.xml                     |   17 
 sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml                   |   17 
 sw/uiconfig/sglobal/toolbar/fontworkshapetype.xml                   |   17 
 sw/uiconfig/sglobal/toolbar/formcontrols.xml                        |   17 
 sw/uiconfig/sglobal/toolbar/formdesign.xml                          |   17 
 sw/uiconfig/sglobal/toolbar/formsfilterbar.xml                      |   17 
 sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml                  |   17 
 sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml                   |   17 
 sw/uiconfig/sglobal/toolbar/frameobjectbar.xml                      |   17 
 sw/uiconfig/sglobal/toolbar/graffilterbar.xml                       |   17 
 sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml                    |   17 
 sw/uiconfig/sglobal/toolbar/insertbar.xml                           |   17 
 sw/uiconfig/sglobal/toolbar/insertobjectbar.xml                     |   17 
 sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml                      |   17 
 sw/uiconfig/sglobal/toolbar/moreformcontrols.xml                    |   17 
 sw/uiconfig/sglobal/toolbar/numobjectbar.xml                        |   17 
 sw/uiconfig/sglobal/toolbar/oleobjectbar.xml                        |   17 
 sw/uiconfig/sglobal/toolbar/optimizetablebar.xml                    |   17 
 sw/uiconfig/sglobal/toolbar/previewobjectbar.xml                    |   17 
 sw/uiconfig/sglobal/toolbar/standardbar.xml                         |   17 
 sw/uiconfig/sglobal/toolbar/starshapes.xml                          |   17 
 sw/uiconfig/sglobal/toolbar/symbolshapes.xml                        |   17 
 sw/uiconfig/sglobal/toolbar/tableobjectbar.xml                      |   17 
 sw/uiconfig/sglobal/toolbar/textobjectbar.xml                       |   17 
 sw/uiconfig/sglobal/toolbar/toolbar.xml                             |   17 
 sw/uiconfig/sglobal/toolbar/viewerbar.xml                           |   17 
 sw/uiconfig/sweb/menubar/menubar.xml                                |   17 
 sw/uiconfig/sweb/statusbar/statusbar.xml                            |   17 
 sw/uiconfig/sweb/toolbar/arrowshapes.xml                            |   17 
 sw/uiconfig/sweb/toolbar/basicshapes.xml                            |   17 
 sw/uiconfig/sweb/toolbar/bezierobjectbar.xml                        |   17 
 sw/uiconfig/sweb/toolbar/calloutshapes.xml                          |   17 
 sw/uiconfig/sweb/toolbar/colorbar.xml                               |   17 
 sw/uiconfig/sweb/toolbar/drawingobjectbar.xml                       |   17 
 sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml                      |   17 
 sw/uiconfig/sweb/toolbar/extrusionobjectbar.xml                     |   17 
 sw/uiconfig/sweb/toolbar/findbar.xml                                |   17 
 sw/uiconfig/sweb/toolbar/flowchartshapes.xml                        |   17 
 sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml                      |   17 
 sw/uiconfig/sweb/toolbar/fontworkshapetype.xml                      |   17 
 sw/uiconfig/sweb/toolbar/formcontrols.xml                           |   17 
 sw/uiconfig/sweb/toolbar/formdesign.xml                             |   17 
 sw/uiconfig/sweb/toolbar/formsfilterbar.xml                         |   17 
 sw/uiconfig/sweb/toolbar/formsnavigationbar.xml                     |   17 
 sw/uiconfig/sweb/toolbar/formtextobjectbar.xml                      |   17 
 sw/uiconfig/sweb/toolbar/frameobjectbar.xml                         |   17 
 sw/uiconfig/sweb/toolbar/graffilterbar.xml                          |   17 
 sw/uiconfig/sweb/toolbar/graphicobjectbar.xml                       |   17 
 sw/uiconfig/sweb/toolbar/insertbar.xml                              |   17 
 sw/uiconfig/sweb/toolbar/mediaobjectbar.xml                         |   17 
 sw/uiconfig/sweb/toolbar/numobjectbar.xml                           |   17 
 sw/uiconfig/sweb/toolbar/oleobjectbar.xml                           |   17 
 sw/uiconfig/sweb/toolbar/optimizetablebar.xml                       |   17 
 sw/uiconfig/sweb/toolbar/previewobjectbar.xml                       |   17 
 sw/uiconfig/sweb/toolbar/standardbar.xml                            |   17 
 sw/uiconfig/sweb/toolbar/starshapes.xml                             |   17 
 sw/uiconfig/sweb/toolbar/symbolshapes.xml                           |   17 
 sw/uiconfig/sweb/toolbar/tableobjectbar.xml                         |   17 
 sw/uiconfig/sweb/toolbar/textobjectbar.xml                          |   17 
 sw/uiconfig/sweb/toolbar/toolbar.xml                                |   17 
 sw/uiconfig/sweb/toolbar/viewerbar.xml                              |   17 
 sw/uiconfig/swform/menubar/menubar.xml                              |   17 
 sw/uiconfig/swform/statusbar/statusbar.xml                          |   17 
 sw/uiconfig/swform/toolbar/alignmentbar.xml                         |   17 
 sw/uiconfig/swform/toolbar/arrowshapes.xml                          |   17 
 sw/uiconfig/swform/toolbar/basicshapes.xml                          |   17 
 sw/uiconfig/swform/toolbar/bezierobjectbar.xml                      |   17 
 sw/uiconfig/swform/toolbar/calloutshapes.xml                        |   17 
 sw/uiconfig/swform/toolbar/colorbar.xml                             |   17 
 sw/uiconfig/swform/toolbar/drawbar.xml                              |   17 
 sw/uiconfig/swform/toolbar/drawingobjectbar.xml                     |   17 
 sw/uiconfig/swform/toolbar/drawtextobjectbar.xml                    |   17 
 sw/uiconfig/swform/toolbar/extrusionobjectbar.xml                   |   17 
 sw/uiconfig/swform/toolbar/flowchartshapes.xml                      |   17 
 sw/uiconfig/swform/toolbar/fontworkobjectbar.xml                    |   17 
 sw/uiconfig/swform/toolbar/fontworkshapetype.xml                    |   17 
 sw/uiconfig/swform/toolbar/formcontrols.xml                         |   17 
 sw/uiconfig/swform/toolbar/formdesign.xml                           |   17 
 sw/uiconfig/swform/toolbar/formsfilterbar.xml                       |   17 
 sw/uiconfig/swform/toolbar/formsnavigationbar.xml                   |   17 
 sw/uiconfig/swform/toolbar/formtextobjectbar.xml                    |   17 
 sw/uiconfig/swform/toolbar/frameobjectbar.xml                       |   17 
 sw/uiconfig/swform/toolbar/graffilterbar.xml                        |   17 
 sw/uiconfig/swform/toolbar/graphicobjectbar.xml                     |   17 
 sw/uiconfig/swform/toolbar/insertbar.xml                            |   17 
 sw/uiconfig/swform/toolbar/insertobjectbar.xml                      |   17 
 sw/uiconfig/swform/toolbar/mediaobjectbar.xml                       |   17 
 sw/uiconfig/swform/toolbar/moreformcontrols.xml                     |   17 
 sw/uiconfig/swform/toolbar/numobjectbar.xml                         |   17 
 sw/uiconfig/swform/toolbar/oleobjectbar.xml                         |   17 
 sw/uiconfig/swform/toolbar/optimizetablebar.xml                     |   17 
 sw/uiconfig/swform/toolbar/previewobjectbar.xml                     |   17 
 sw/uiconfig/swform/toolbar/standardbar.xml                          |   17 
 sw/uiconfig/swform/toolbar/starshapes.xml                           |   17 
 sw/uiconfig/swform/toolbar/symbolshapes.xml                         |   17 
 sw/uiconfig/swform/toolbar/tableobjectbar.xml                       |   17 
 sw/uiconfig/swform/toolbar/textobjectbar.xml                        |   17 
 sw/uiconfig/swform/toolbar/toolbar.xml                              |   17 
 sw/uiconfig/swform/toolbar/viewerbar.xml                            |   17 
 sw/uiconfig/swreport/menubar/menubar.xml                            |   17 
 sw/uiconfig/swreport/statusbar/statusbar.xml                        |   17 
 sw/uiconfig/swreport/toolbar/alignmentbar.xml                       |   17 
 sw/uiconfig/swreport/toolbar/arrowshapes.xml                        |   17 
 sw/uiconfig/swreport/toolbar/basicshapes.xml                        |   17 
 sw/uiconfig/swreport/toolbar/bezierobjectbar.xml                    |   17 
 sw/uiconfig/swreport/toolbar/calloutshapes.xml                      |   17 
 sw/uiconfig/swreport/toolbar/colorbar.xml                           |   17 
 sw/uiconfig/swreport/toolbar/drawbar.xml                            |   17 
 sw/uiconfig/swreport/toolbar/drawingobjectbar.xml                   |   17 
 sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml                  |   17 
 sw/uiconfig/swreport/toolbar/extrusionobjectbar.xml                 |   17 
 sw/uiconfig/swreport/toolbar/flowchartshapes.xml                    |   17 
 sw/uiconfig/swreport/toolbar/fontworkobjectbar.xml                  |   17 
 sw/uiconfig/swreport/toolbar/fontworkshapetype.xml                  |   17 
 sw/uiconfig/swreport/toolbar/formcontrols.xml                       |   17 
 sw/uiconfig/swreport/toolbar/formdesign.xml                         |   17 
 sw/uiconfig/swreport/toolbar/formsfilterbar.xml                     |   17 
 sw/uiconfig/swreport/toolbar/formsnavigationbar.xml                 |   17 
 sw/uiconfig/swreport/toolbar/formtextobjectbar.xml                  |   17 
 sw/uiconfig/swreport/toolbar/frameobjectbar.xml                     |   17 
 sw/uiconfig/swreport/toolbar/graffilterbar.xml                      |   17 
 sw/uiconfig/swreport/toolbar/graphicobjectbar.xml                   |   17 
 sw/uiconfig/swreport/toolbar/insertbar.xml                          |   17 
 sw/uiconfig/swreport/toolbar/insertobjectbar.xml                    |   17 
 sw/uiconfig/swreport/toolbar/mediaobjectbar.xml                     |   17 
 sw/uiconfig/swreport/toolbar/moreformcontrols.xml                   |   17 
 sw/uiconfig/swreport/toolbar/numobjectbar.xml                       |   17 
 sw/uiconfig/swreport/toolbar/oleobjectbar.xml                       |   17 
 sw/uiconfig/swreport/toolbar/optimizetablebar.xml                   |   17 
 sw/uiconfig/swreport/toolbar/previewobjectbar.xml                   |   17 
 sw/uiconfig/swreport/toolbar/standardbar.xml                        |   17 
 sw/uiconfig/swreport/toolbar/starshapes.xml                         |   17 
 sw/uiconfig/swreport/toolbar/symbolshapes.xml                       |   17 
 sw/uiconfig/swreport/toolbar/tableobjectbar.xml                     |   17 
 sw/uiconfig/swreport/toolbar/textobjectbar.xml                      |   17 
 sw/uiconfig/swreport/toolbar/toolbar.xml                            |   17 
 sw/uiconfig/swreport/toolbar/viewerbar.xml                          |   17 
 sw/uiconfig/swriter/menubar/menubar.xml                             |   17 
 sw/uiconfig/swriter/statusbar/statusbar.xml                         |   17 
 sw/uiconfig/swriter/toolbar/alignmentbar.xml                        |   17 
 sw/uiconfig/swriter/toolbar/arrowshapes.xml                         |   17 
 sw/uiconfig/swriter/toolbar/basicshapes.xml                         |   17 
 sw/uiconfig/swriter/toolbar/bezierobjectbar.xml                     |   17 
 sw/uiconfig/swriter/toolbar/calloutshapes.xml                       |   17 
 sw/uiconfig/swriter/toolbar/colorbar.xml                            |   17 
 sw/uiconfig/swriter/toolbar/drawbar.xml                             |   17 
 sw/uiconfig/swriter/toolbar/drawingobjectbar.xml                    |   17 
 sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml                   |   17 
 sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml                  |   17 
 sw/uiconfig/swriter/toolbar/findbar.xml                             |   17 
 sw/uiconfig/swriter/toolbar/flowchartshapes.xml                     |   17 
 sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml                   |   17 
 sw/uiconfig/swriter/toolbar/fontworkshapetype.xml                   |   17 
 sw/uiconfig/swriter/toolbar/formcontrols.xml                        |   17 
 sw/uiconfig/swriter/toolbar/formdesign.xml                          |   17 
 sw/uiconfig/swriter/toolbar/formsfilterbar.xml                      |   17 
 sw/uiconfig/swriter/toolbar/formsnavigationbar.xml                  |   17 
 sw/uiconfig/swriter/toolbar/formtextobjectbar.xml                   |   17 
 sw/uiconfig/swriter/toolbar/frameobjectbar.xml                      |   17 
 sw/uiconfig/swriter/toolbar/graffilterbar.xml                       |   17 
 sw/uiconfig/swriter/toolbar/graphicobjectbar.xml                    |   17 
 sw/uiconfig/swriter/toolbar/insertbar.xml                           |   17 
 sw/uiconfig/swriter/toolbar/mediaobjectbar.xml                      |   17 
 sw/uiconfig/swriter/toolbar/moreformcontrols.xml                    |   17 
 sw/uiconfig/swriter/toolbar/navigationobjectbar.xml                 |    8 
 sw/uiconfig/swriter/toolbar/numobjectbar.xml                        |   17 
 sw/uiconfig/swriter/toolbar/oleobjectbar.xml                        |   17 
 sw/uiconfig/swriter/toolbar/optimizetablebar.xml                    |   17 
 sw/uiconfig/swriter/toolbar/previewobjectbar.xml                    |   17 
 sw/uiconfig/swriter/toolbar/standardbar.xml                         |   17 
 sw/uiconfig/swriter/toolbar/starshapes.xml                          |   17 
 sw/uiconfig/swriter/toolbar/symbolshapes.xml                        |   17 
 sw/uiconfig/swriter/toolbar/tableobjectbar.xml                      |   17 
 sw/uiconfig/swriter/toolbar/textobjectbar.xml                       |   17 
 sw/uiconfig/swriter/toolbar/toolbar.xml                             |   17 
 sw/uiconfig/swriter/toolbar/viewerbar.xml                           |   17 
 sw/uiconfig/swxform/menubar/menubar.xml                             |   17 
 sw/uiconfig/swxform/statusbar/statusbar.xml                         |   17 
 sw/uiconfig/swxform/toolbar/alignmentbar.xml                        |   17 
 sw/uiconfig/swxform/toolbar/arrowshapes.xml                         |   17 
 sw/uiconfig/swxform/toolbar/basicshapes.xml                         |   17 
 sw/uiconfig/swxform/toolbar/bezierobjectbar.xml                     |   17 
 sw/uiconfig/swxform/toolbar/calloutshapes.xml                       |   17 
 sw/uiconfig/swxform/toolbar/colorbar.xml                            |   17 
 sw/uiconfig/swxform/toolbar/drawbar.xml                             |   17 
 sw/uiconfig/swxform/toolbar/drawingobjectbar.xml                    |   17 
 sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml                   |   17 
 sw/uiconfig/swxform/toolbar/extrusionobjectbar.xml                  |   17 
 sw/uiconfig/swxform/toolbar/findbar.xml                             |   17 
 sw/uiconfig/swxform/toolbar/flowchartshapes.xml                     |   17 
 sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml                   |   17 
 sw/uiconfig/swxform/toolbar/fontworkshapetype.xml                   |   17 
 sw/uiconfig/swxform/toolbar/formcontrols.xml                        |   17 
 sw/uiconfig/swxform/toolbar/formdesign.xml                          |   17 
 sw/uiconfig/swxform/toolbar/formsfilterbar.xml                      |   17 
 sw/uiconfig/swxform/toolbar/formsnavigationbar.xml                  |   17 
 sw/uiconfig/swxform/toolbar/formtextobjectbar.xml                   |   17 
 sw/uiconfig/swxform/toolbar/frameobjectbar.xml                      |   17 
 sw/uiconfig/swxform/toolbar/graffilterbar.xml                       |   17 
 sw/uiconfig/swxform/toolbar/graphicobjectbar.xml                    |   17 
 sw/uiconfig/swxform/toolbar/insertbar.xml                           |   17 
 sw/uiconfig/swxform/toolbar/insertobjectbar.xml                     |   17 
 sw/uiconfig/swxform/toolbar/mediaobjectbar.xml                      |   17 
 sw/uiconfig/swxform/toolbar/moreformcontrols.xml                    |   17 
 sw/uiconfig/swxform/toolbar/numobjectbar.xml                        |   17 
 sw/uiconfig/swxform/toolbar/oleobjectbar.xml                        |   17 
 sw/uiconfig/swxform/toolbar/optimizetablebar.xml                    |   17 
 sw/uiconfig/swxform/toolbar/previewobjectbar.xml                    |   17 
 sw/uiconfig/swxform/toolbar/standardbar.xml                         |   17 
 sw/uiconfig/swxform/toolbar/starshapes.xml                          |   17 
 sw/uiconfig/swxform/toolbar/symbolshapes.xml                        |   17 
 sw/uiconfig/swxform/toolbar/tableobjectbar.xml                      |   17 
 sw/uiconfig/swxform/toolbar/textobjectbar.xml                       |   17 
 sw/uiconfig/swxform/toolbar/toolbar.xml                             |   17 
 sw/uiconfig/swxform/toolbar/viewerbar.xml                           |   17 
 sw/util/msword.component                                            |   43 --
 sw/util/sw.component                                                |   43 --
 sw/util/swd.component                                               |   43 --
 sw/util/vbaswobj.component                                          |   43 --
 1653 files changed, 24602 insertions(+), 33047 deletions(-)

New commits:
commit caaeb0a046a0c712224c21e3e8531e67efd4216f
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Mar 31 10:05:04 2011 +0200

    re-base on ALv2 code. Includes:
    
        Patches contributed by Oliver-Rainer Wittmann
        sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
        apply print settings to new printing routines
        http://svn.apache.org/viewvc?view=revision&revision=1172115
        sw34bf06: #o12311627# use <rtl_random> methods to
        create unique ids for list styles and list ids
        http://svn.apache.org/viewvc?view=revision&revision=1172112
        sw34bf06 #i114725#,#i115828# - method <SwDoc::ClearDoc()> -
        clear list structures completely
        http://svn.apache.org/viewvc?view=revision&revision=1172122
        i#118572 - remove ui string and help content regarding usage of
        Java Mail in Writer's Mail Merge as Java Mail is not used.
        http://svn.apache.org/viewvc?view=revision&revision=1197035
    
        Patches contributed by Mathias Bauer
        cws mba34issues01: #i117718#: provide filter name in
        case storage of medium does not allow to detect one
        http://svn.apache.org/viewvc?view=revision&revision=1172350
        cws mba34issues01: #i117721#: directly provide
        parameters retrieved from SfxMedium
        http://svn.apache.org/viewvc?view=revision&revision=1172353
        gnumake4 work variously
        http://svn.apache.org/viewvc?view=revision&revision=1394707
        http://svn.apache.org/viewvc?view=revision&revision=1394326
        http://svn.apache.org/viewvc?view=revision&revision=1396797
        http://svn.apache.org/viewvc?view=revision&revision=1397315
        cws mba34issues01: #i117723#: convert assertion into trace
        http://svn.apache.org/viewvc?view=revision&revision=1172355
        cws mba34issues01: #i117699#: keep layout alive until swdoc dies
        http://svn.apache.org/viewvc?view=revision&revision=1172362
        cws mba34issues01: #i117943#: missing color attributes in RTF clipboard
        http://svn.apache.org/viewvc?view=revision&revision=1172363
    
        Patch contributed by Henning Brinkmann
        imported patch i#103878
        http://svn.apache.org/viewvc?view=revision&revision=1172109
    
        Patches contributed by Michael Stahl
        sw34bf06: #i117955#: WW8 export: disable storing of section breaks in endnotes
        http://svn.apache.org/viewvc?view=revision&revision=1172119
    
        Patch contributed by imacat
        Fixed the Asian language work count.
        http://svn.apache.org/viewvc?view=revision&revision=1241345
    
        Patch contributed by Pedro Giffuni
        i#20878 - Add comment with BZ issue for reference.
        http://svn.apache.org/viewvc?view=revision&revision=1244517
    
        Patch contributed by Andre Fischer
        Do not add targets for junit tests when junit is disabled.
        http://svn.apache.org/viewvc?view=revision&revision=1241508
    
    add writerperfect dependency.

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 9b347e0..f989fde 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -99,6 +99,10 @@ public:
                         SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
                                     const String& rBaseURL,
                                     const SfxItemSet* pSet=0 );
+                        SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+                                    const String& rBaseURL,
+                                    const String& rTypeName,
+                                    const SfxItemSet* pSet=0 );
                         SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
 
                         ~SfxMedium();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b1f3541..2287e9e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2885,7 +2885,6 @@ SfxMedium::SfxMedium(const String &rName, StreamMode nOpenMode, const SfxFilter
     Init_Impl();
 }
 
-
 SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) :
     pImp(new SfxMedium_Impl(this))
 {
@@ -2958,6 +2957,24 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str
 
 //------------------------------------------------------------------
 
+SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const String &rTypeName, const SfxItemSet* p ) :
+    pImp(new SfxMedium_Impl(this))
+{
+    pImp->m_pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( rTypeName );
+    DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );
+
+    Init_Impl();
+    pImp->xStorage = rStor;
+    pImp->bDisposeStorage = false;
+
+    // always take BaseURL first, could be overwritten by ItemSet
+    GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) );
+    if ( p )
+        GetItemSet()->Put( *p );
+}
+
+//------------------------------------------------------------------
+
 SfxMedium::~SfxMedium()
 {
     // if there is a requirement to clean the backup this is the last possibility to do it
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f970dad..42e3303 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,sw))
 
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 3c23785..c451002 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_JunitTest_JunitTest,sw_complex))
 
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index ec63c19..df05e59 100644
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
 
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index cba74d9..b5f0b20 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,msword))
 
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index ba3fcb2..2705b39 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This file incorporates work covered by the following license notice:
 #
-# This file is part of OpenOffice.org.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,sw))
 
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 856efac..53a3bbf 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,swd))
 
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index f5dd9a8..4a445fd 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,swui))
 
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 7f593ec..a02e935 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,vbaswobj))
 
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 77e0bf3..6fb0622 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Module_Module,sw))
 
@@ -69,9 +60,11 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 ))
 endif
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
     JunitTest_sw_complex \
     JunitTest_sw_unoapi \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
index 18eb908..9d0bf55 100644
--- a/sw/Package_uiconfig.mk
+++ b/sw/Package_uiconfig.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig))
 
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 4ea69cd..dc990c5 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.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 _ENHANCEDPDFEXPORTHELPER_HXX
 #define _ENHANCEDPDFEXPORTHELPER_HXX
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 01091e9..e236102 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.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 IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
  #define IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index 36e1d35..376ac4d 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.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 IDOCUMENTDRAWMODEL_HXX_INCLUDED
 #define IDOCUMENTDRAWMODEL_HXX_INCLUDED
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index 8abdeae..dad3890 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #ifndef INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
 #define INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
 
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 4cc0318..c68a6e8 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.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 IDOCUMENTFIELDSACCESS_HXX_INCLUDED
 #define IDOCUMENTFIELDSACCESS_HXX_INCLUDED
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index d3b1c16..96be5ad 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.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 IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
 #define IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 9c251b0..4575cdc 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.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 IDOCUMENTREDLINE_HXX_INCLUDED
  #define IDOCUMENTREDLINE_HXX_INCLUDED
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index efddb59..2c02236 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.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 IDOCUMENTSETTINGACCESS_HXX_INCLUDED
 #define IDOCUMENTSETTINGACCESS_HXX_INCLUDED
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index 83322b9..477e182 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.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 IDOCUMENTSTATE_HXX_INCLUDED
  #define IDOCUMENTSTATE_HXX_INCLUDED
diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 8bdebba..4ec926a 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.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 IDOCUMENTSTATISTICS_HXX_INCLUDED
  #define IDOCUMENTSTATISTICS_HXX_INCLUDED
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index 8848a7d..c2fde51 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.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 IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
  #define IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 66d1dc6..49f5d67 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.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 _IMARK_HXX
 #define _IMARK_HXX
 
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 8540697..0a705ee 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.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 _POSTITMGR_HXX
 #define _POSTITMGR_HXX
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 839f672..f2078c2 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.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 _SIDEBARWIN_HXX
 #define _SIDEBARWIN_HXX
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index b0c9e8a..cf5bdd9 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.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 _SW_APPLET_IMPL_HXX
 #define _SW_APPLET_IMPL_HXX
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index e659d65..768e69f 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.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 _SW_NODE_NUM_HXX
 #define _SW_NODE_NUM_HXX
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 00256ab..f385bd2 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.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 _SW_NUMBER_TREE_HXX
 #define _SW_NUMBER_TREE_HXX
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index d1ce1e3..bb53508 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.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 _SW_REWRITER_HXX
 #define _SW_REWRITER_HXX
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index cd18492..71c9f34 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.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 _SWSMARTTAGMGR_HXX
 #define _SWSMARTTAGMGR_HXX
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 34797ca..9ad540f 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.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 _SWSTYLENAMEMAPPER_HXX
 #define _SWSTYLENAMEMAPPER_HXX
 
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index c59fda7..38f4df1 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.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 _SW_XMLSECTIONLIST_HXX
 #define _SW_XMLSECTIONLIST_HXX
 
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index 4269a8d..cf822c0 100644
--- a/sw/inc/TextCursorHelper.hxx
+++ b/sw/inc/TextCursorHelper.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 _SW_TEXTCURSORHELPER_HXX
 #define _SW_TEXTCURSORHELPER_HXX
 
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 1134b6d..cfc5f2f 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.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 _ACCMAP_HXX
 #define _ACCMAP_HXX
 
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index b267213..52a3777 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.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 SW_ACMPLWRD_HXX
 #define SW_ACMPLWRD_HXX
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 85e3911..43ecefa 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.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 _ANCHOREDDRAWOBJECT_HXX
 #define _ANCHOREDDRAWOBJECT_HXX
 
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 0aad748..0611a23 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.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 _ANCHOREDOBJECT_HXX
 #define _ANCHOREDOBJECT_HXX
 
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index b9c1cf8..067a494 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.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 SW_AUTHFLD_HXX
 #define SW_AUTHFLD_HXX
 
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 7ce0880..6cac07c 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.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 SW_BPARR_HXX
 #define SW_BPARR_HXX
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 44b8555..0bfc579 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.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 _BREAKIT_HXX
 #define _BREAKIT_HXX
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 4eb30e1..105ba9d 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.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 _CALBCK_HXX
 #define _CALBCK_HXX
@@ -235,7 +226,7 @@ public:
 
     const SwModify& GetModify() const { return rRoot; }
 
-    SwClient* operator++(int);
+    SwClient* operator++();
     SwClient* GoStart();
     SwClient* GoEnd();
 
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index fe9512d..4e2a665 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.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

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list