[Libreoffice-commits] core.git: 12 commits - compilerplugins/clang cui/source dbaccess/source filter/source forms/source formula/source fpicker/source include/dbaccess include/filter include/formula include/oox include/test lotuswordpro/source oox/inc oox/source sc/inc sc/qa sc/source sd/inc sd/source slideshow/source svgio/inc svgio/source svx/source sw/inc sw/source ucb/source vbahelper/source vcl/inc vcl/unx vcl/workben writerfilter/source

Noel Grandin noel at peralex.com
Tue May 5 00:32:22 PDT 2015


 compilerplugins/clang/staticmethods.cxx                                |   20 
 cui/source/customize/acccfg.cxx                                        |    2 
 cui/source/dialogs/colorpicker.cxx                                     |    2 
 cui/source/inc/SpellDialog.hxx                                         |    2 
 cui/source/inc/about.hxx                                               |    4 
 cui/source/inc/acccfg.hxx                                              |    4 
 cui/source/inc/autocdlg.hxx                                            |    2 
 cui/source/inc/cfg.hxx                                                 |    2 
 cui/source/inc/cfgutil.hxx                                             |    4 
 cui/source/inc/cuicharmap.hxx                                          |    2 
 cui/source/inc/cuigaldlg.hxx                                           |    2 
 cui/source/inc/cuitabarea.hxx                                          |    6 
 cui/source/inc/hldoctp.hxx                                             |    2 
 cui/source/inc/iconcdlg.hxx                                            |   10 
 cui/source/inc/macropg.hxx                                             |    4 
 cui/source/inc/optlingu.hxx                                            |    2 
 cui/source/inc/scriptdlg.hxx                                           |   12 
 cui/source/inc/selector.hxx                                            |    2 
 cui/source/inc/swpossizetabpage.hxx                                    |    6 
 cui/source/inc/treeopt.hxx                                             |    8 
 cui/source/options/fontsubs.cxx                                        |    6 
 cui/source/options/fontsubs.hxx                                        |    4 
 cui/source/options/optaboutconfig.hxx                                  |    4 
 cui/source/options/optfltr.cxx                                         |    2 
 cui/source/options/optfltr.hxx                                         |    2 
 cui/source/options/optlingu.cxx                                        |    2 
 cui/source/options/optopencl.hxx                                       |    4 
 cui/source/tabpages/autocdlg.cxx                                       |    2 
 dbaccess/source/core/api/CacheSet.cxx                                  |    2 
 dbaccess/source/core/api/CacheSet.hxx                                  |    4 
 dbaccess/source/core/api/KeySet.cxx                                    |    2 
 dbaccess/source/core/api/KeySet.hxx                                    |    6 
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx                 |    6 
 dbaccess/source/core/dataaccess/documentdefinition.hxx                 |    2 
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx                 |    8 
 dbaccess/source/core/misc/dsntypes.cxx                                 |    4 
 dbaccess/source/filter/xml/xmlDataSourceSetting.hxx                    |    2 
 dbaccess/source/filter/xml/xmlExport.hxx                               |    2 
 dbaccess/source/filter/xml/xmlfilter.hxx                               |    2 
 dbaccess/source/inc/dsntypes.hxx                                       |    4 
 dbaccess/source/ui/app/AppController.cxx                               |    8 
 dbaccess/source/ui/app/AppController.hxx                               |    4 
 dbaccess/source/ui/app/AppControllerDnD.cxx                            |    4 
 dbaccess/source/ui/app/AppControllerGen.cxx                            |    2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                         |   12 
 dbaccess/source/ui/app/AppDetailPageHelper.hxx                         |    4 
 dbaccess/source/ui/app/AppDetailView.cxx                               |    7 
 dbaccess/source/ui/app/AppDetailView.hxx                               |    2 
 dbaccess/source/ui/app/AppView.cxx                                     |    2 
 dbaccess/source/ui/browser/dsEntriesNoExp.cxx                          |    6 
 dbaccess/source/ui/browser/genericcontroller.cxx                       |    8 
 dbaccess/source/ui/browser/unodatbr.cxx                                |    6 
 dbaccess/source/ui/control/TableGrantCtrl.cxx                          |    2 
 dbaccess/source/ui/control/tabletree.cxx                               |   10 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx                                 |    2 
 dbaccess/source/ui/dlg/DbAdminImpl.hxx                                 |   10 
 dbaccess/source/ui/dlg/adminpages.hxx                                  |    2 
 dbaccess/source/ui/dlg/adtabdlg.cxx                                    |    2 
 dbaccess/source/ui/dlg/dbfindex.hxx                                    |    2 
 dbaccess/source/ui/dlg/dbwizsetup.cxx                                  |    4 
 dbaccess/source/ui/dlg/generalpage.cxx                                 |    4 
 dbaccess/source/ui/dlg/queryfilter.cxx                                 |    2 
 dbaccess/source/ui/dlg/tablespage.cxx                                  |    6 
 dbaccess/source/ui/inc/FieldDescControl.hxx                            |    2 
 dbaccess/source/ui/inc/JoinController.hxx                              |    2 
 dbaccess/source/ui/inc/TableConnection.hxx                             |    2 
 dbaccess/source/ui/inc/TableCopyHelper.hxx                             |    2 
 dbaccess/source/ui/inc/TableGrantCtrl.hxx                              |    2 
 dbaccess/source/ui/inc/WColumnSelect.hxx                               |    4 
 dbaccess/source/ui/inc/WCopyTable.hxx                                  |    4 
 dbaccess/source/ui/inc/imageprovider.hxx                               |    8 
 dbaccess/source/ui/inc/indexcollection.hxx                             |    2 
 dbaccess/source/ui/inc/queryfilter.hxx                                 |    6 
 dbaccess/source/ui/inc/sbagrid.hxx                                     |    2 
 dbaccess/source/ui/inc/tabletree.hxx                                   |    6 
 dbaccess/source/ui/inc/unodatbr.hxx                                    |   10 
 dbaccess/source/ui/misc/TableCopyHelper.cxx                            |    2 
 dbaccess/source/ui/misc/WCopyTable.cxx                                 |    4 
 dbaccess/source/ui/querydesign/JoinDesignView.cxx                      |    2 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx                  |    2 
 dbaccess/source/ui/querydesign/querycontroller.cxx                     |    4 
 dbaccess/source/ui/uno/dbinteraction.hxx                               |    4 
 filter/source/config/cache/filtercache.hxx                             |    8 
 filter/source/graphicfilter/icgm/class2.cxx                            |   10 
 filter/source/graphicfilter/icgm/class5.cxx                            |   10 
 filter/source/graphicfilter/icgm/elements.hxx                          |    6 
 filter/source/msfilter/eschesdo.hxx                                    |    2 
 filter/source/msfilter/msdffimp.cxx                                    |   16 
 filter/source/msfilter/mstoolbar.cxx                                   |    2 
 filter/source/msfilter/svdfppt.cxx                                     |   49 -
 filter/source/svg/gfxtypes.hxx                                         |    2 
 filter/source/svg/svgfilter.hxx                                        |   22 
 filter/source/svg/svgreader.cxx                                        |   22 
 filter/source/svg/svgwriter.hxx                                        |    6 
 filter/source/xsltdialog/typedetectionexport.hxx                       |    4 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx                   |    2 
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx                   |    2 
 filter/source/xsltdialog/xmlfiltertabpagexslt.hxx                      |    2 
 filter/source/xsltdialog/xmlfiltertestdialog.hxx                       |    2 
 forms/source/component/Button.cxx                                      |    3 
 forms/source/component/DatabaseForm.cxx                                |    2 
 forms/source/component/DatabaseForm.hxx                                |    6 
 forms/source/component/Grid.cxx                                        |    2 
 forms/source/component/Grid.hxx                                        |    2 
 forms/source/component/formcontrolfont.cxx                             |    6 
 forms/source/inc/formcontrolfont.hxx                                   |    8 
 forms/source/inc/formnavigation.hxx                                    |    4 
 forms/source/richtext/featuredispatcher.cxx                            |    2 
 forms/source/richtext/featuredispatcher.hxx                            |    4 
 forms/source/runtime/formoperations.cxx                                |    2 
 forms/source/runtime/formoperations.hxx                                |    2 
 forms/source/solar/control/navtoolbar.cxx                              |   16 
 forms/source/solar/inc/navtoolbar.hxx                                  |    8 
 forms/source/xforms/binding.cxx                                        |    2 
 forms/source/xforms/binding.hxx                                        |    2 
 forms/source/xforms/computedexpression.hxx                             |    2 
 forms/source/xforms/submission.hxx                                     |    2 
 forms/source/xforms/submission/serialization_urlencoded.hxx            |    4 
 formula/source/core/api/FormulaCompiler.cxx                            |    4 
 formula/source/core/api/token.cxx                                      |    6 
 fpicker/source/office/OfficeControlAccess.hxx                          |    6 
 fpicker/source/office/asyncfilepicker.cxx                              |    2 
 fpicker/source/office/commonpicker.cxx                                 |    3 
 fpicker/source/office/iodlg.cxx                                        |    2 
 fpicker/source/office/iodlg.hxx                                        |    4 
 include/dbaccess/genericcontroller.hxx                                 |    4 
 include/filter/msfilter/escherex.hxx                                   |    8 
 include/filter/msfilter/msdffimp.hxx                                   |   18 
 include/filter/msfilter/mstoolbar.hxx                                  |    8 
 include/filter/msfilter/svdfppt.hxx                                    |   18 
 include/formula/FormulaCompiler.hxx                                    |    4 
 include/formula/tokenarray.hxx                                         |    4 
 include/oox/core/filterdetect.hxx                                      |    2 
 include/oox/crypto/AgileEngine.hxx                                     |    2 
 include/oox/dump/dumperbase.hxx                                        |    6 
 include/oox/export/drawingml.hxx                                       |    6 
 include/oox/ole/axcontrol.hxx                                          |   50 -
 include/oox/ppt/timenode.hxx                                           |    2 
 include/oox/token/tokenmap.hxx                                         |    4 
 include/test/htmltesttools.hxx                                         |    4 
 include/test/sheet/xdatapilotdescriptor.hxx                            |    4 
 include/test/sheet/xdatapilottable2.hxx                                |    2 
 include/test/sheet/xspreadsheets2.hxx                                  |    2 
 include/test/sheet/xstyleloader.hxx                                    |    4 
 include/test/xmltesttools.hxx                                          |    2 
 lotuswordpro/source/filter/explode.hxx                                 |    2 
 lotuswordpro/source/filter/lwpbackgroundstuff.hxx                      |    2 
 lotuswordpro/source/filter/lwpbulletstylemgr.cxx                       |    2 
 lotuswordpro/source/filter/lwpcelllayout.hxx                           |    4 
 lotuswordpro/source/filter/lwpdivopts.hxx                              |    2 
 lotuswordpro/source/filter/lwpdoc.hxx                                  |    2 
 lotuswordpro/source/filter/lwpdocdata.hxx                              |    4 
 lotuswordpro/source/filter/lwpdrawobj.cxx                              |   22 
 lotuswordpro/source/filter/lwpdrawobj.hxx                              |    6 
 lotuswordpro/source/filter/lwpfont.hxx                                 |    4 
 lotuswordpro/source/filter/lwpfoundry.cxx                              |    2 
 lotuswordpro/source/filter/lwpfoundry.hxx                              |    4 
 lotuswordpro/source/filter/lwpfribmark.hxx                             |    2 
 lotuswordpro/source/filter/lwpfribptr.hxx                              |    2 
 lotuswordpro/source/filter/lwpgrfobj.cxx                               |    6 
 lotuswordpro/source/filter/lwpgrfobj.hxx                               |    2 
 lotuswordpro/source/filter/lwpnumericfmt.hxx                           |    2 
 lotuswordpro/source/filter/lwpobjstrm.hxx                              |    2 
 lotuswordpro/source/filter/lwppara.hxx                                 |    2 
 lotuswordpro/source/filter/lwppara1.cxx                                |    2 
 lotuswordpro/source/filter/lwpparastyle.cxx                            |    2 
 lotuswordpro/source/filter/lwpparastyle.hxx                            |    4 
 lotuswordpro/source/filter/lwpprtinfo.hxx                              |    4 
 lotuswordpro/source/filter/lwpsilverbullet.hxx                         |    6 
 lotuswordpro/source/filter/lwptablelayout.hxx                          |    2 
 lotuswordpro/source/filter/lwptoc.hxx                                  |    2 
 lotuswordpro/source/filter/lwpuidoc.cxx                                |    2 
 lotuswordpro/source/filter/lwpuidoc.hxx                                |    2 
 lotuswordpro/source/filter/lwpusrdicts.hxx                             |    2 
 lotuswordpro/source/filter/xfilter/xfframe.hxx                         |    2 
 oox/inc/drawingml/chart/objectformatter.hxx                            |    2 
 oox/inc/drawingml/shape3dproperties.hxx                                |   14 
 oox/source/core/filterdetect.cxx                                       |    2 
 oox/source/docprop/docprophandler.hxx                                  |    4 
 oox/source/drawingml/chart/axisconverter.cxx                           |    2 
 oox/source/drawingml/chart/seriesconverter.cxx                         |    2 
 oox/source/drawingml/chart/titleconverter.cxx                          |    2 
 oox/source/drawingml/customshapepresetdata.cxx                         |    4 
 oox/source/drawingml/effectpropertiescontext.hxx                       |    2 
 oox/source/dump/dumperbase.cxx                                         |    2 
 oox/source/helper/attributelist.cxx                                    |    2 
 oox/source/ole/axcontrol.cxx                                           |  113 +-
 oox/source/token/tokenmap.cxx                                          |    4 
 sc/inc/afmtuno.hxx                                                     |    4 
 sc/inc/appoptio.hxx                                                    |   14 
 sc/inc/arealink.hxx                                                    |    2 
 sc/inc/chgtrack.hxx                                                    |    2 
 sc/inc/clkernelthread.hxx                                              |    4 
 sc/inc/column.hxx                                                      |    4 
 sc/inc/dapiuno.hxx                                                     |    4 
 sc/inc/defaultsoptions.hxx                                             |    2 
 sc/inc/docoptio.hxx                                                    |    4 
 sc/inc/document.hxx                                                    |    6 
 sc/inc/dpcache.hxx                                                     |    2 
 sc/inc/dpfilteredcache.hxx                                             |    2 
 sc/inc/dpobject.hxx                                                    |    2 
 sc/inc/dptabdat.hxx                                                    |    2 
 sc/inc/externalrefmgr.hxx                                              |    2 
 sc/inc/filtopt.hxx                                                     |    2 
 sc/inc/formulaopt.hxx                                                  |    4 
 sc/inc/inputopt.hxx                                                    |    2 
 sc/inc/printopt.hxx                                                    |    2 
 sc/inc/rangeutl.hxx                                                    |   24 
 sc/inc/scmod.hxx                                                       |    6 
 sc/inc/stlalgorithm.hxx                                                |   10 
 sc/inc/table.hxx                                                       |    2 
 sc/inc/viewopti.hxx                                                    |    6 
 sc/qa/unit/helper/csv_handler.hxx                                      |   12 
 sc/qa/unit/helper/sorthelper.hxx                                       |    2 
 sc/qa/unit/ucalc.cxx                                                   |    2 
 sc/qa/unit/ucalc_sort.cxx                                              |    2 
 sc/source/core/data/bcaslot.cxx                                        |    4 
 sc/source/core/data/column.cxx                                         |    8 
 sc/source/core/data/column3.cxx                                        |    4 
 sc/source/core/data/documen3.cxx                                       |    2 
 sc/source/core/data/document.cxx                                       |    8 
 sc/source/core/data/dpcache.cxx                                        |    3 
 sc/source/core/data/dpfilteredcache.cxx                                |    4 
 sc/source/core/data/dptabdat.cxx                                       |    4 
 sc/source/core/data/table3.cxx                                         |    4 
 sc/source/core/data/validat.cxx                                        |    4 
 sc/source/core/inc/bcaslot.hxx                                         |    8 
 sc/source/core/inc/interpre.hxx                                        |   40 
 sc/source/core/opencl/opbase.hxx                                       |   12 
 sc/source/core/tool/charthelper.cxx                                    |    2 
 sc/source/core/tool/chartlock.cxx                                      |    2 
 sc/source/core/tool/compiler.cxx                                       |   18 
 sc/source/core/tool/interpr4.cxx                                       |    2 
 sc/source/core/tool/rangeutl.cxx                                       |   12 
 sc/source/core/tool/scmatrix.cxx                                       |    2 
 sc/source/filter/excel/excform.cxx                                     |    2 
 sc/source/filter/excel/read.cxx                                        |    2 
 sc/source/filter/excel/xechart.cxx                                     |   13 
 sc/source/filter/excel/xeescher.cxx                                    |    4 
 sc/source/filter/excel/xelink.cxx                                      |   10 
 sc/source/filter/excel/xepivot.cxx                                     |    6 
 sc/source/filter/excel/xeroot.cxx                                      |    4 
 sc/source/filter/excel/xestream.cxx                                    |    4 
 sc/source/filter/excel/xestyle.cxx                                     |    2 
 sc/source/filter/excel/xichart.cxx                                     |   12 
 sc/source/filter/excel/xilink.cxx                                      |    2 
 sc/source/filter/excel/xiroot.cxx                                      |    2 
 sc/source/filter/excel/xistream.cxx                                    |    4 
 sc/source/filter/html/htmlpars.cxx                                     |   10 
 sc/source/filter/inc/XclExpChangeTrack.hxx                             |   10 
 sc/source/filter/inc/addressconverter.hxx                              |   12 
 sc/source/filter/inc/dif.hxx                                           |    6 
 sc/source/filter/inc/excform.hxx                                       |    4 
 sc/source/filter/inc/formulabase.hxx                                   |    2 
 sc/source/filter/inc/htmlexp.hxx                                       |    6 
 sc/source/filter/inc/htmlpars.hxx                                      |    4 
 sc/source/filter/inc/lotfntbf.hxx                                      |    2 
 sc/source/filter/inc/pivotcachebuffer.hxx                              |    4 
 sc/source/filter/inc/qproform.hxx                                      |    8 
 sc/source/filter/inc/scflt.hxx                                         |    2 
 sc/source/filter/inc/stylesbuffer.hxx                                  |    4 
 sc/source/filter/inc/worksheetsettings.hxx                             |    2 
 sc/source/filter/inc/xechart.hxx                                       |    2 
 sc/source/filter/inc/xecontent.hxx                                     |    2 
 sc/source/filter/inc/xeescher.hxx                                      |    4 
 sc/source/filter/inc/xepivot.hxx                                       |    8 
 sc/source/filter/inc/xeroot.hxx                                        |    2 
 sc/source/filter/inc/xestream.hxx                                      |    4 
 sc/source/filter/inc/xichart.hxx                                       |    2 
 sc/source/filter/inc/xicontent.hxx                                     |    2 
 sc/source/filter/inc/xiroot.hxx                                        |    2 
 sc/source/filter/inc/xistream.hxx                                      |    4 
 sc/source/filter/inc/xlchart.hxx                                       |    8 
 sc/source/filter/oox/addressconverter.cxx                              |    2 
 sc/source/filter/oox/autofilterbuffer.cxx                              |    4 
 sc/source/filter/oox/commentsbuffer.cxx                                |    4 
 sc/source/filter/oox/externallinkbuffer.cxx                            |    2 
 sc/source/filter/oox/formulabase.cxx                                   |    2 
 sc/source/filter/oox/formulaparser.cxx                                 |    4 
 sc/source/filter/oox/pivotcachebuffer.cxx                              |    6 
 sc/source/filter/oox/pivottablebuffer.cxx                              |    4 
 sc/source/filter/oox/scenariobuffer.cxx                                |    4 
 sc/source/filter/oox/stylesbuffer.cxx                                  |    4 
 sc/source/filter/oox/tablebuffer.cxx                                   |    4 
 sc/source/filter/oox/workbookhelper.cxx                                |    2 
 sc/source/filter/oox/worksheetfragment.cxx                             |    6 
 sc/source/filter/xml/XMLExportDataPilot.cxx                            |    2 
 sc/source/filter/xml/XMLExportDataPilot.hxx                            |    2 
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx                       |    2 
 sc/source/filter/xml/XMLStylesExportHelper.hxx                         |   16 
 sc/source/filter/xml/XMLStylesImportHelper.hxx                         |    4 
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx                     |    4 
 sc/source/filter/xml/XMLTableShapeImportHelper.hxx                     |    2 
 sc/source/filter/xml/xmlexprt.cxx                                      |    4 
 sc/source/filter/xml/xmlexprt.hxx                                      |    8 
 sc/source/filter/xml/xmlfilti.cxx                                      |    4 
 sc/source/filter/xml/xmlfilti.hxx                                      |    6 
 sc/source/filter/xml/xmlimprt.cxx                                      |    4 
 sc/source/filter/xml/xmlimprt.hxx                                      |    2 
 sc/source/filter/xml/xmlsubti.hxx                                      |    2 
 sc/source/ui/Accessibility/AccessibleDocument.cxx                      |   10 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx           |    4 
 sc/source/ui/app/inputwin.cxx                                          |    6 
 sc/source/ui/app/scmod.cxx                                             |    4 
 sc/source/ui/condformat/condformatdlgentry.cxx                         |    6 
 sc/source/ui/dbgui/consdlg.cxx                                         |   14 
 sc/source/ui/docshell/datastream.cxx                                   |    8 
 sc/source/ui/docshell/dbdocfun.cxx                                     |   24 
 sc/source/ui/docshell/dbdocimp.cxx                                     |    4 
 sc/source/ui/docshell/docfunc.cxx                                      |   28 
 sc/source/ui/docshell/docsh3.cxx                                       |    2 
 sc/source/ui/docshell/docsh4.cxx                                       |    4 
 sc/source/ui/docshell/externalrefmgr.cxx                               |    4 
 sc/source/ui/docshell/impex.cxx                                        |    2 
 sc/source/ui/formdlg/formula.cxx                                       |   10 
 sc/source/ui/inc/AccessibleCell.hxx                                    |    2 
 sc/source/ui/inc/AccessibleCsvControl.hxx                              |    2 
 sc/source/ui/inc/AccessibleDocument.hxx                                |    2 
 sc/source/ui/inc/AccessibleSpreadsheet.hxx                             |    8 
 sc/source/ui/inc/AccessibleText.hxx                                    |    6 
 sc/source/ui/inc/AnalysisOfVarianceDialog.hxx                          |    2 
 sc/source/ui/inc/anyrefdg.hxx                                          |   14 
 sc/source/ui/inc/cellsh.hxx                                            |    2 
 sc/source/ui/inc/condformatdlgentry.hxx                                |    6 
 sc/source/ui/inc/conflictsdlg.hxx                                      |    2 
 sc/source/ui/inc/consdlg.hxx                                           |    4 
 sc/source/ui/inc/docsh.hxx                                             |    6 
 sc/source/ui/inc/drawsh.hxx                                            |    4 
 sc/source/ui/inc/drtxtob.hxx                                           |    4 
 sc/source/ui/inc/formula.hxx                                           |    6 
 sc/source/ui/inc/fupoor.hxx                                            |    2 
 sc/source/ui/inc/impex.hxx                                             |    2 
 sc/source/ui/inc/inputhdl.hxx                                          |    2 
 sc/source/ui/inc/inputwin.hxx                                          |    2 
 sc/source/ui/inc/namemgrtable.hxx                                      |    2 
 sc/source/ui/inc/navipi.hxx                                            |   10 
 sc/source/ui/inc/scuitphfedit.hxx                                      |    4 
 sc/source/ui/inc/tabview.hxx                                           |    2 
 sc/source/ui/inc/tabvwsh.hxx                                           |   12 
 sc/source/ui/inc/tpsubt.hxx                                            |    4 
 sc/source/ui/inc/tpusrlst.hxx                                          |    2 
 sc/source/ui/inc/viewfunc.hxx                                          |    2 
 sc/source/ui/miscdlgs/anyrefdg.cxx                                     |   16 
 sc/source/ui/miscdlgs/optsolver.cxx                                    |    2 
 sc/source/ui/navipi/content.cxx                                        |    8 
 sc/source/ui/navipi/navipi.cxx                                         |    2 
 sc/source/ui/optdlg/tpusrlst.cxx                                       |    4 
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx                        |    2 
 sc/source/ui/undo/undoblk.cxx                                          |   12 
 sc/source/ui/unoobj/appluno.cxx                                        |    2 
 sc/source/ui/unoobj/cellsuno.cxx                                       |    4 
 sc/source/ui/unoobj/chart2uno.cxx                                      |    4 
 sc/source/ui/unoobj/chartuno.cxx                                       |    8 
 sc/source/ui/unoobj/dapiuno.cxx                                        |    2 
 sc/source/ui/unoobj/docuno.cxx                                         |    6 
 sc/source/ui/unoobj/tokenuno.cxx                                       |    4 
 sc/source/ui/vba/excelvbahelper.cxx                                    |    4 
 sc/source/ui/vba/vbachart.hxx                                          |    2 
 sc/source/ui/vba/vbaformatcondition.cxx                                |    4 
 sc/source/ui/vba/vbaformatconditions.hxx                               |    2 
 sc/source/ui/vba/vbainterior.cxx                                       |    2 
 sc/source/ui/vba/vbainterior.hxx                                       |   10 
 sc/source/ui/vba/vbaworkbook.hxx                                       |    4 
 sc/source/ui/vba/vbaworkbooks.hxx                                      |    4 
 sc/source/ui/view/dbfunc4.cxx                                          |    2 
 sc/source/ui/view/drawview.cxx                                         |    2 
 sc/source/ui/view/formatsh.cxx                                         |    4 
 sc/source/ui/view/gridwin4.cxx                                         |    2 
 sc/source/ui/view/spelleng.cxx                                         |    2 
 sc/source/ui/view/tabvwsh3.cxx                                         |    4 
 sc/source/ui/view/viewfunc.cxx                                         |    2 
 sd/inc/Outliner.hxx                                                    |    2 
 sd/inc/OutlinerIterator.hxx                                            |    6 
 sd/inc/sdfilter.hxx                                                    |    4 
 sd/inc/sdmod.hxx                                                       |    4 
 sd/inc/stlpool.hxx                                                     |    2 
 sd/inc/stlsheet.hxx                                                    |    2 
 sd/source/core/stlpool.cxx                                             |    2 
 sd/source/core/stlsheet.cxx                                            |    2 
 sd/source/filter/eppt/eppt.cxx                                         |    2 
 sd/source/filter/eppt/eppt.hxx                                         |    8 
 sd/source/filter/eppt/epptbase.hxx                                     |   10 
 sd/source/filter/eppt/epptooxml.hxx                                    |   12 
 sd/source/filter/eppt/epptso.cxx                                       |    8 
 sd/source/filter/eppt/escherex.hxx                                     |    8 
 sd/source/filter/eppt/pptexanimations.cxx                              |    4 
 sd/source/filter/eppt/pptexanimations.hxx                              |   26 
 sd/source/filter/eppt/pptx-epptbase.cxx                                |    8 
 sd/source/filter/eppt/pptx-text.cxx                                    |    4 
 sd/source/filter/eppt/text.hxx                                         |    2 
 sd/source/filter/html/htmlex.cxx                                       |   14 
 sd/source/filter/html/htmlex.hxx                                       |   22 
 sd/source/filter/ppt/pptatom.hxx                                       |    4 
 sd/source/filter/ppt/pptinanimations.cxx                               |   36 
 sd/source/filter/ppt/pptinanimations.hxx                               |   34 
 sd/source/filter/sdfilter.cxx                                          |    4 
 sd/source/filter/xml/sdtransform.cxx                                   |    2 
 sd/source/ui/animations/CustomAnimationPane.hxx                        |    2 
 sd/source/ui/annotations/annotationmanagerimpl.hxx                     |    6 
 sd/source/ui/annotations/annotationwindow.cxx                          |    6 
 sd/source/ui/dlg/PhotoAlbumDialog.hxx                                  |    4 
 sd/source/ui/dlg/dlgass.cxx                                            |    6 
 sd/source/ui/dlg/sdtreelb.cxx                                          |   21 
 sd/source/ui/dlg/vectdlg.cxx                                           |    2 
 sd/source/ui/framework/configuration/ConfigurationClassifier.cxx       |    2 
 sd/source/ui/framework/configuration/ConfigurationClassifier.hxx       |    8 
 sd/source/ui/framework/factories/FullScreenPane.hxx                    |    2 
 sd/source/ui/func/smarttag.cxx                                         |    2 
 sd/source/ui/inc/DrawController.hxx                                    |    2 
 sd/source/ui/inc/DrawDocShell.hxx                                      |    2 
 sd/source/ui/inc/DrawViewShell.hxx                                     |    4 
 sd/source/ui/inc/OutlineView.hxx                                       |    8 
 sd/source/ui/inc/OutlineViewShell.hxx                                  |    2 
 sd/source/ui/inc/SlideSorterViewShell.hxx                              |    2 
 sd/source/ui/inc/ViewClipboard.hxx                                     |    2 
 sd/source/ui/inc/ViewTabBar.hxx                                        |    2 
 sd/source/ui/inc/fumorph.hxx                                           |   10 
 sd/source/ui/inc/fupoor.hxx                                            |    2 
 sd/source/ui/inc/navigatr.hxx                                          |    4 
 sd/source/ui/inc/smarttag.hxx                                          |    2 
 sd/source/ui/inc/tbx_ww.hxx                                            |    2 
 sd/source/ui/inc/tools/SlotStateListener.hxx                           |    2 
 sd/source/ui/inc/tpaction.hxx                                          |    4 
 sd/source/ui/inc/tpoption.hxx                                          |    6 
 sd/source/ui/inc/unosrch.hxx                                           |    4 
 sd/source/ui/inc/vectdlg.hxx                                           |    2 
 sd/source/ui/remotecontrol/Receiver.hxx                                |    2 
 sd/source/ui/sidebar/MasterPageContainerQueue.cxx                      |    2 
 sd/source/ui/sidebar/MasterPageContainerQueue.hxx                      |    2 
 sd/source/ui/sidebar/MasterPagesSelector.cxx                           |    2 
 sd/source/ui/sidebar/MasterPagesSelector.hxx                           |    2 
 sd/source/ui/slideshow/slideshowimpl.cxx                               |    2 
 sd/source/ui/slideshow/slideshowimpl.hxx                               |    4 
 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx          |    2 
 sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx       |    2 
 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx               |    2 
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx             |   12 
 sd/source/ui/slidesorter/view/SlsLayouter.cxx                          |    6 
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx                 |    6 
 sd/source/ui/tools/SlotStateListener.cxx                               |    2 
 sd/source/ui/view/DocumentRenderer.cxx                                 |    2 
 sd/source/ui/view/ToolBarManager.cxx                                   |    4 
 sd/source/ui/view/ViewShellManager.cxx                                 |    4 
 sd/source/ui/view/outlnvsh.cxx                                         |    8 
 sd/source/ui/view/sdview.cxx                                           |    2 
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    2 
 svgio/inc/svgio/svgreader/svgtextnode.hxx                              |    4 
 svgio/source/svgreader/svgtextnode.cxx                                 |    2 
 svx/source/tbxctrls/tbcontrl.cxx                                       |    4 
 sw/inc/PostItMgr.hxx                                                   |    2 
 sw/inc/accmap.hxx                                                      |    2 
 sw/inc/calc.hxx                                                        |    2 
 sw/inc/cellfml.hxx                                                     |    6 
 sw/inc/crsrsh.hxx                                                      |   20 
 sw/inc/dbmgr.hxx                                                       |   10 
 sw/inc/dcontact.hxx                                                    |    2 
 sw/inc/doc.hxx                                                         |   72 -
 sw/inc/docary.hxx                                                      |    2 
 sw/inc/docufld.hxx                                                     |    8 
 sw/inc/editsh.hxx                                                      |   16 
 sw/inc/fesh.hxx                                                        |    4 
 sw/inc/list.hxx                                                        |    2 
 sw/inc/modcfg.hxx                                                      |    8 
 sw/inc/ndarr.hxx                                                       |   24 
 sw/inc/reffld.hxx                                                      |    4 
 sw/inc/section.hxx                                                     |    2 
 sw/inc/shellio.hxx                                                     |    4 
 sw/inc/swmodule.hxx                                                    |    4 
 sw/inc/swtable.hxx                                                     |    6 
 sw/inc/undobj.hxx                                                      |   18 
 sw/inc/unochart.hxx                                                    |    2 
 sw/inc/unodraw.hxx                                                     |    2 
 sw/inc/unotbl.hxx                                                      |    2 
 sw/inc/viewopt.hxx                                                     |   18 
 sw/source/core/access/accmap.cxx                                       |    2 
 sw/source/core/access/accpara.hxx                                      |   12 
 sw/source/core/access/accportions.cxx                                  |    6 
 sw/source/core/access/accportions.hxx                                  |    8 
 sw/source/core/bastyp/SwSmartTagMgr.cxx                                |    4 
 sw/source/core/crsr/crsrsh.cxx                                         |   27 
 sw/source/core/crsr/crstrvl.cxx                                        |   18 
 sw/source/core/crsr/pam.cxx                                            |   25 
 sw/source/core/crsr/swcrsr.cxx                                         |   18 
 sw/source/core/crsr/trvlreg.cxx                                        |    8 
 sw/source/core/crsr/trvltbl.cxx                                        |    8 
 sw/source/core/crsr/viscrs.cxx                                         |    2 
 sw/source/core/doc/CntntIdxStore.cxx                                   |    4 
 sw/source/core/doc/DocumentContentOperationsManager.cxx                |   13 
 sw/source/core/doc/DocumentFieldsManager.cxx                           |    7 
 sw/source/core/doc/DocumentLayoutManager.cxx                           |    2 
 sw/source/core/doc/DocumentRedlineManager.cxx                          |    6 
 sw/source/core/doc/doc.cxx                                             |    6 
 sw/source/core/doc/docbm.cxx                                           |    6 
 sw/source/core/doc/doccomp.cxx                                         |   12 
 sw/source/core/doc/docdesc.cxx                                         |    4 
 sw/source/core/doc/docedt.cxx                                          |    2 
 sw/source/core/doc/docfld.cxx                                          |    2 
 sw/source/core/doc/docfly.cxx                                          |    2 
 sw/source/core/doc/docfmt.cxx                                          |    4 
 sw/source/core/doc/docnum.cxx                                          |    4 
 sw/source/core/doc/docredln.cxx                                        |    4 
 sw/source/core/doc/docsort.cxx                                         |    2 
 sw/source/core/doc/doctxm.cxx                                          |   16 
 sw/source/core/doc/list.cxx                                            |    4 
 sw/source/core/doc/number.cxx                                          |    8 
 sw/source/core/doc/poolfmt.cxx                                         |    2 
 sw/source/core/doc/tblafmt.cxx                                         |    2 
 sw/source/core/doc/tblcpy.cxx                                          |    6 
 sw/source/core/docnode/ndsect.cxx                                      |   12 
 sw/source/core/docnode/ndtbl.cxx                                       |    6 
 sw/source/core/docnode/ndtbl1.cxx                                      |   12 
 sw/source/core/docnode/node.cxx                                        |    4 
 sw/source/core/docnode/nodes.cxx                                       |   15 
 sw/source/core/docnode/section.cxx                                     |    6 
 sw/source/core/draw/dview.cxx                                          |    2 
 sw/source/core/edit/acorrect.cxx                                       |    2 
 sw/source/core/edit/autofmt.cxx                                        |   36 
 sw/source/core/edit/editsh.cxx                                         |    4 
 sw/source/core/edit/edlingu.cxx                                        |   12 
 sw/source/core/edit/ednumber.cxx                                       |   14 
 sw/source/core/edit/edsect.cxx                                         |    4 
 sw/source/core/edit/edtox.cxx                                          |    6 
 sw/source/core/fields/cellfml.cxx                                      |    4 
 sw/source/core/fields/docufld.cxx                                      |   12 
 sw/source/core/fields/reffld.cxx                                       |    6 
 sw/source/core/frmedt/fefly1.cxx                                       |   14 
 sw/source/core/frmedt/fetab.cxx                                        |   24 
 sw/source/core/graphic/ndgrf.cxx                                       |    2 
 sw/source/core/inc/SwXMLTextBlocks.hxx                                 |    2 
 sw/source/core/inc/UndoBookmark.hxx                                    |    2 
 sw/source/core/inc/UndoTable.hxx                                       |    2 
 sw/source/core/inc/anchoredobjectposition.hxx                          |   12 
 sw/source/core/inc/docsort.hxx                                         |    2 
 sw/source/core/inc/dview.hxx                                           |    4 
 sw/source/core/inc/fefly.hxx                                           |    2 
 sw/source/core/inc/fntcache.hxx                                        |    2 
 sw/source/core/inc/frame.hxx                                           |    2 
 sw/source/core/inc/frminf.hxx                                          |    2 
 sw/source/core/inc/ftnboss.hxx                                         |    2 
 sw/source/core/inc/layact.hxx                                          |    2 
 sw/source/core/inc/pamtyp.hxx                                          |    2 
 sw/source/core/inc/rootfrm.hxx                                         |    2 
 sw/source/core/inc/swcache.hxx                                         |    2 
 sw/source/core/inc/txmsrt.hxx                                          |    2 
 sw/source/core/inc/txtfrm.hxx                                          |    6 
 sw/source/core/inc/wrong.hxx                                           |   10 
 sw/source/core/layout/dbg_lay.cxx                                      |    2 
 sw/source/core/layout/frmtool.cxx                                      |    2 
 sw/source/core/layout/layact.cxx                                       |    6 
 sw/source/core/layout/pagechg.cxx                                      |    4 
 sw/source/core/layout/paintfrm.cxx                                     |    2 
 sw/source/core/layout/trvlfrm.cxx                                      |    2 
 sw/source/core/objectpositioning/anchoredobjectposition.cxx            |    6 
 sw/source/core/ole/ndole.cxx                                           |    2 
 sw/source/core/table/swtable.cxx                                       |    2 
 sw/source/core/text/frmform.cxx                                        |   12 
 sw/source/core/text/frminf.cxx                                         |    2 
 sw/source/core/text/inftxt.cxx                                         |    4 
 sw/source/core/text/itrform2.hxx                                       |    2 
 sw/source/core/text/porexp.cxx                                         |    4 
 sw/source/core/text/porexp.hxx                                         |    4 
 sw/source/core/text/portxt.cxx                                         |    3 
 sw/source/core/text/redlnitr.hxx                                       |    2 
 sw/source/core/text/txtfrm.cxx                                         |    2 
 sw/source/core/text/txtftn.cxx                                         |    8 
 sw/source/core/text/xmldump.cxx                                        |    2 
 sw/source/core/txtnode/fntcache.cxx                                    |    4 
 sw/source/core/txtnode/ndtxt.cxx                                       |    2 
 sw/source/core/txtnode/txtedt.cxx                                      |    4 
 sw/source/core/undo/rolbck.cxx                                         |    2 
 sw/source/core/undo/unattr.cxx                                         |  484 +++-------
 sw/source/core/undo/undobj.cxx                                         |   19 
 sw/source/core/undo/undobj1.cxx                                        |    4 
 sw/source/core/undo/untbl.cxx                                          |    8 
 sw/source/core/unocore/unocrsr.cxx                                     |    2 
 sw/source/core/unocore/unocrsrhelper.cxx                               |    8 
 sw/source/core/unocore/unodraw.cxx                                     |    2 
 sw/source/core/unocore/unofield.cxx                                    |    4 
 sw/source/core/unocore/unoframe.cxx                                    |   10 
 sw/source/core/unocore/unoidx.cxx                                      |    6 
 sw/source/core/unocore/unoportenum.cxx                                 |    2 
 sw/source/core/unocore/unosect.cxx                                     |    2 
 sw/source/core/unocore/unostyle.cxx                                    |    6 
 sw/source/core/unocore/unotbl.cxx                                      |   32 
 sw/source/core/unocore/unotext.cxx                                     |    2 
 sw/source/core/view/vnew.cxx                                           |    2 
 sw/source/filter/basflt/fltshell.cxx                                   |    4 
 sw/source/filter/basflt/shellio.cxx                                    |    2 
 sw/source/filter/html/htmlatr.cxx                                      |    6 
 sw/source/filter/html/htmlcss1.cxx                                     |    4 
 sw/source/filter/html/htmlgrin.cxx                                     |    2 
 sw/source/filter/html/htmltab.cxx                                      |   18 
 sw/source/filter/html/htmltabw.cxx                                     |    8 
 sw/source/filter/html/svxcss1.hxx                                      |    4 
 sw/source/filter/html/swhtml.cxx                                       |    6 
 sw/source/filter/html/swhtml.hxx                                       |   16 
 sw/source/filter/html/wrthtml.hxx                                      |    6 
 sw/source/filter/inc/wrtswtbl.hxx                                      |    4 
 sw/source/filter/writer/writer.cxx                                     |    4 
 sw/source/filter/writer/wrtswtbl.cxx                                   |    2 
 sw/source/filter/ww8/WW8FFData.hxx                                     |    2 
 sw/source/filter/ww8/attributeoutputbase.hxx                           |    2 
 sw/source/filter/ww8/docxattributeoutput.cxx                           |    2 
 sw/source/filter/ww8/docxattributeoutput.hxx                           |   10 
 sw/source/filter/ww8/docxexport.cxx                                    |    4 
 sw/source/filter/ww8/docxexport.hxx                                    |    4 
 sw/source/filter/ww8/docxsdrexport.cxx                                 |    6 
 sw/source/filter/ww8/escher.hxx                                        |    4 
 sw/source/filter/ww8/rtfexport.cxx                                     |    6 
 sw/source/filter/ww8/wrtw8esh.cxx                                      |    2 
 sw/source/filter/ww8/wrtw8nds.cxx                                      |    2 
 sw/source/filter/ww8/wrtw8num.cxx                                      |    2 
 sw/source/filter/ww8/wrtw8sty.cxx                                      |    4 
 sw/source/filter/ww8/wrtww8.hxx                                        |   10 
 sw/source/filter/ww8/ww8atr.cxx                                        |   10 
 sw/source/filter/ww8/ww8glsy.hxx                                       |    6 
 sw/source/filter/ww8/ww8par.cxx                                        |    6 
 sw/source/filter/ww8/ww8par.hxx                                        |   55 -
 sw/source/filter/ww8/ww8par2.cxx                                       |    6 
 sw/source/filter/ww8/ww8par5.cxx                                       |    4 
 sw/source/filter/ww8/ww8par6.cxx                                       |   26 
 sw/source/filter/ww8/ww8scan.cxx                                       |    4 
 sw/source/filter/ww8/ww8scan.hxx                                       |    4 
 sw/source/filter/xml/XMLRedlineImportHelper.hxx                        |    2 
 sw/source/filter/xml/wrtxml.hxx                                        |    2 
 sw/source/filter/xml/xmlexpit.cxx                                      |    2 
 sw/source/filter/xml/xmlexpit.hxx                                      |    4 
 sw/source/filter/xml/xmliteme.cxx                                      |    6 
 sw/source/filter/xml/xmltexte.cxx                                      |    2 
 sw/source/filter/xml/xmltexte.hxx                                      |    4 
 sw/source/ui/chrdlg/drpcps.cxx                                         |    2 
 sw/source/ui/envelp/mailmrge.cxx                                       |    2 
 sw/source/ui/fldui/flddb.cxx                                           |    2 
 sw/source/ui/fldui/flddok.cxx                                          |    2 
 sw/source/ui/fldui/fldedt.cxx                                          |    4 
 sw/source/ui/fldui/fldfunc.cxx                                         |    2 
 sw/source/ui/fldui/fldfunc.hxx                                         |    2 
 sw/source/ui/fldui/fldref.cxx                                          |    2 
 sw/source/ui/fldui/fldvar.cxx                                          |    2 
 sw/source/ui/vba/vbaparagraphformat.hxx                                |   10 
 sw/source/ui/vba/vbatablehelper.cxx                                    |    4 
 sw/source/ui/vba/vbatablehelper.hxx                                    |    6 
 sw/source/uibase/app/docsh2.cxx                                        |    2 
 sw/source/uibase/app/docstyle.cxx                                      |    6 
 sw/source/uibase/config/viewopt.cxx                                    |   10 
 sw/source/uibase/dbui/mmconfigitem.cxx                                 |    2 
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx                   |    6 
 sw/source/uibase/docvw/edtwin.cxx                                      |    6 
 sw/source/uibase/fldui/fldmgr.cxx                                      |    6 
 sw/source/uibase/inc/annotsh.hxx                                       |    8 
 sw/source/uibase/inc/barcfg.hxx                                        |    2 
 sw/source/uibase/inc/basesh.hxx                                        |    2 
 sw/source/uibase/inc/content.hxx                                       |    2 
 sw/source/uibase/inc/drwtxtsh.hxx                                      |    2 
 sw/source/uibase/inc/edtwin.hxx                                        |   12 
 sw/source/uibase/inc/envimg.hxx                                        |    2 
 sw/source/uibase/inc/fldmgr.hxx                                        |    4 
 sw/source/uibase/inc/formatclipboard.hxx                               |    2 
 sw/source/uibase/inc/frmpage.hxx                                       |    4 
 sw/source/uibase/inc/gloslst.hxx                                       |    2 
 sw/source/uibase/inc/navicfg.hxx                                       |    2 
 sw/source/uibase/inc/numpara.hxx                                       |    2 
 sw/source/uibase/inc/olmenu.hxx                                        |    2 
 sw/source/uibase/inc/optpage.hxx                                       |    2 
 sw/source/uibase/inc/pggrid.hxx                                        |    2 
 sw/source/uibase/inc/pview.hxx                                         |    2 
 sw/source/uibase/inc/usrpref.hxx                                       |    4 
 sw/source/uibase/lingu/hyp.cxx                                         |    2 
 sw/source/uibase/lingu/olmenu.cxx                                      |    4 
 sw/source/uibase/shells/textfld.cxx                                    |    4 
 sw/source/uibase/shells/textsh1.cxx                                    |   12 
 sw/source/uibase/uiview/formatclipboard.cxx                            |    2 
 sw/source/uibase/uiview/view.cxx                                       |    2 
 sw/source/uibase/uiview/view0.cxx                                      |    2 
 sw/source/uibase/uiview/view1.cxx                                      |    2 
 sw/source/uibase/uiview/view2.cxx                                      |   10 
 sw/source/uibase/uiview/viewling.cxx                                   |    4 
 sw/source/uibase/uno/dlelstnr.cxx                                      |    2 
 sw/source/uibase/uno/unodispatch.cxx                                   |    2 
 sw/source/uibase/uno/unomod.cxx                                        |    2 
 sw/source/uibase/uno/unotxdoc.cxx                                      |    6 
 sw/source/uibase/uno/unotxvw.cxx                                       |    8 
 sw/source/uibase/utlui/content.cxx                                     |    4 
 ucb/source/ucp/gio/gio_content.hxx                                     |    2 
 vbahelper/source/msforms/vbamultipage.hxx                              |    4 
 vbahelper/source/vbahelper/vbacommandbarcontrols.hxx                   |    4 
 vbahelper/source/vbahelper/vbalineformat.hxx                           |    4 
 vbahelper/source/vbahelper/vbapictureformat.hxx                        |    2 
 vcl/inc/unx/gtk/gtkdata.hxx                                            |    4 
 vcl/inc/unx/gtk/gtkframe.hxx                                           |   10 
 vcl/inc/unx/i18n_ic.hxx                                                |    4 
 vcl/inc/unx/saldata.hxx                                                |    2 
 vcl/unx/generic/app/i18n_ic.cxx                                        |    2 
 vcl/unx/generic/app/saldata.cxx                                        |    2 
 vcl/unx/generic/app/saltimer.cxx                                       |    2 
 vcl/unx/generic/gdi/xrender_peer.hxx                                   |    4 
 vcl/unx/gtk/app/gtkinst.cxx                                            |    2 
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx                               |    2 
 vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx                               |    2 
 vcl/unx/gtk/fpicker/SalGtkPicker.hxx                                   |    2 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx                               |    4 
 vcl/unx/gtk/window/gtksalframe.cxx                                     |   34 
 vcl/workben/mtfdemo.cxx                                                |    2 
 vcl/workben/svpclient.cxx                                              |    2 
 vcl/workben/vcldemo.cxx                                                |   16 
 writerfilter/source/dmapper/DomainMapper.hxx                           |   12 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx                      |    4 
 writerfilter/source/dmapper/PropertyMap.hxx                            |    4 
 writerfilter/source/dmapper/ThemeTable.hxx                             |    4 
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx                        |    6 
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx                  |    8 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx                         |   10 
 writerfilter/source/rtftok/rtfsdrimport.hxx                            |    4 
 writerfilter/source/rtftok/rtftokenizer.hxx                            |    2 
 714 files changed, 2192 insertions(+), 2310 deletions(-)

New commits:
commit 259820af718fe15ea5080711f77918dad8f14fbb
Author: Noel Grandin <noel at peralex.com>
Date:   Mon May 4 10:29:18 2015 +0200

    loplugin:staticmethods
    
    Change-Id: I90dd921077bbfc57200e398e7959306f26c65cfe

diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 4c5ecaf..562694b 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -169,13 +169,21 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
         return true;
     }
     // used in a function-pointer-table
-    if (startsWith(fqn, "SbiRuntime::Step")) {
+    if (startsWith(fqn, "SbiRuntime::Step") || startsWith(fqn, "oox::xls::OoxFormulaParserImpl::")
+        || startsWith(fqn, "SwTableFormula::")
+        || startsWith(fqn, "oox::xls::BiffFormulaParserImpl::")
+        || fqn == "SwWW8ImplReader::Read_F_Shape"
+        || fqn == "SwWW8ImplReader::Read_Majority") {
         return true;
     }
     // have no idea why this can't be static, but 'make check' fails with it so...
     if (fqn == "oox::drawingml::Shape::resolveRelationshipsOfTypeFromOfficeDoc") {
         return true;
     }
+    // template magic
+    if (fqn == "ColumnBatch::getValue") {
+        return true;
+    }
 
     bVisitedThis = false;
     TraverseStmt(pCXXMethodDecl->getBody());
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 8125174..859e074 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -121,7 +121,7 @@ class SwNoteProps: public utl::ConfigItem
         {
             return bIsShowAnchor;
         }
-        ::com::sun::star::uno::Sequence< OUString >& GetPropertyNames()
+        static ::com::sun::star::uno::Sequence< OUString >& GetPropertyNames()
         {
             static ::com::sun::star::uno::Sequence< OUString > aNames;
             if(!aNames.getLength())
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index d831d95..2cb5a56 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -166,7 +166,7 @@ public:
     {
         return mpVSh;
     }
-    bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh);
+    static bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh);
     void AddShapeContext(const SdrObject *pObj,
                              ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccShape);
 
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index d103f3e..55cc98f 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -177,7 +177,7 @@ class SwCalc
 
     bool        ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* );
 
-    OUString  GetColumnName( const OUString& rName );
+    static OUString  GetColumnName( const OUString& rName );
     OUString  GetDBName( const OUString& rName );
 
     SwCalc( const SwCalc& ) SAL_DELETED_FUNCTION;
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 9f06a1a..880e291 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -75,12 +75,12 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
     void _SplitMergeBoxNm( const SwTable&, OUString&, OUString&, OUString* = 0,
                         void* pPara = 0 ) const;
 
-    void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd,
-                    SwSelBoxes& rBoxes ) const;
+    static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd,
+                    SwSelBoxes& rBoxes );
     OUString ScanString( FnScanFormula fnFormula, const SwTable& rTbl,
                         void* = 0 ) const;
 
-    const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm ) const;
+    static const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm );
 
 protected:
     enum NameType { EXTRNL_NAME, INTRNL_NAME, REL_NAME };
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index b84fc43..31fdbe2 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -703,18 +703,18 @@ public:
 
     bool GotoFld( const SwFmtFld& rFld );
 
-    SwTxtFld* GetTxtFldAtPos(
+    static SwTxtFld* GetTxtFldAtPos(
         const SwPosition* pPos,
-        const bool bIncludeInputFldAtStart ) const;
-    SwField* GetFieldAtCrsr(
+        const bool bIncludeInputFldAtStart );
+    static SwField* GetFieldAtCrsr(
         const SwPaM* pCrsr,
-        const bool bIncludeInputFldAtStart ) const;
+        const bool bIncludeInputFldAtStart );
     SwField* GetCurFld( const bool bIncludeInputFldAtStart = false ) const;
     bool CrsrInsideInputFld() const;
-    bool PosInsideInputFld( const SwPosition& rPos ) const;
+    static bool PosInsideInputFld( const SwPosition& rPos );
     bool DocPtInsideInputFld( const Point& rDocPt ) const;
-    sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos ) const;
-    sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos ) const;
+    static sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos );
+    static sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos );
 
     // Return number of cursors in ring (The flag indicates whether
     // only cursors containing selections are requested).
@@ -822,10 +822,10 @@ public:
     // is cursor or the point in/over a right to left formatted text?
     bool IsInRightToLeftText( const Point* pPt = 0 ) const;
 
-    void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
+    static void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
     bool   bColumnChange();
-    void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
-    void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
+    static void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
+    static void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
     // If the current cursor position is inside a hidden range, the hidden range
     // is selected and true is returned:
     bool SelectHiddenRange();
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 3cfafbb..d420a8a 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -238,7 +238,7 @@ public:
 
     /// Merging of data records into fields.
     bool            MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = NULL );
-    bool            Merge(SwWrtShell* pSh);
+    static bool     Merge(SwWrtShell* pSh);
     void            MergeCancel();
 
     /// Initialize data fields that lack name of database.
@@ -260,11 +260,11 @@ public:
     /// Fill listbox with all column names of a database table.
     void            GetColumnNames(ListBox* pListBox,
                             const OUString& rDBName, const OUString& rTableName, bool bAppend = false);
-    void            GetColumnNames(ListBox* pListBox,
+    static void GetColumnNames(ListBox* pListBox,
                             css::uno::Reference< css::sdbc::XConnection> xConnection,
                             const OUString& rTableName, bool bAppend = false);
 
-    sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
+    static sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
                             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
                             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn,
                             SvNumberFormatter* pNFmtr,
@@ -285,7 +285,7 @@ public:
                         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties,
                         bool bWithDataSourceBrowser = false);
 
-    void            InsertText(SwWrtShell& rSh,
+    static void     InsertText(SwWrtShell& rSh,
                         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties);
 
     /// check if a data source is open
@@ -322,7 +322,7 @@ public:
     sal_uInt32      GetSelectedRecordId();
     bool            ToRecordId(sal_Int32 nSet);
 
-    const SwDBData& GetAddressDBName();
+    static const SwDBData& GetAddressDBName();
 
     static OUString GetDBField(
                     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xColumnProp,
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index f49c491..01298ee 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -375,7 +375,7 @@ class SwDrawContact : public SwContact
 
         /// method for adding/removing 'virtual' drawing object.
         SwDrawVirtObj* CreateVirtObj();
-        void DestroyVirtObj( SwDrawVirtObj* pVirtObj );
+        static void DestroyVirtObj( SwDrawVirtObj* pVirtObj );
         void RemoveAllVirtObjs();
 
         void _InvalidateObjs( const bool _bUpdateSortedObjsList = false );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2dab95b..0bb1c87 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -412,7 +412,7 @@ private:
                         FNCopyFmt fnCopyFmt, SwFmt& rDfltFmt );
     void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
                                 const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt );
-    SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName ) const;
+    static SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName );
 
     SwDoc( const SwDoc &) SAL_DELETED_FUNCTION;
 
@@ -420,11 +420,11 @@ private:
     void AddUsedDBToList( std::vector<OUString>& rDBNameList,
                           const std::vector<OUString>& rUsedDBNames );
     void AddUsedDBToList( std::vector<OUString>& rDBNameList, const OUString& rDBName );
-    bool IsNameInArray( const std::vector<OUString>& rOldNames, const OUString& rName );
+    static bool IsNameInArray( const std::vector<OUString>& rOldNames, const OUString& rName );
     void GetAllDBNames( std::vector<OUString>& rAllDBNames );
-    OUString ReplaceUsedDBs( const std::vector<OUString>& rUsedDBNames,
+    static OUString ReplaceUsedDBs( const std::vector<OUString>& rUsedDBNames,
                              const OUString& rNewName, const OUString& rFormula );
-    std::vector<OUString>& FindUsedDBs( const std::vector<OUString>& rAllDBNames,
+    static std::vector<OUString>& FindUsedDBs( const std::vector<OUString>& rAllDBNames,
                                 const OUString& rFormula,
                                 std::vector<OUString>& rUsedDBNames );
 
@@ -440,7 +440,7 @@ private:
     // Update charts of given table.
     void _UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const;
 
-    bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
+    static bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
                                 sal_uInt16 nMode );
 
     // CharTimer calls this method.
@@ -710,7 +710,7 @@ public:
                          sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
 
     // count words in pam
-    void CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const;
+    static void CountWords( const SwPaM& rPaM, SwDocStat& rStat );
 
     // Glossary Document
     void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; }
@@ -752,7 +752,7 @@ public:
     void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName );
     const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
 
-    void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName ) const;
+    static void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName );
 
     // Set a valid name for all Flys that have none (Called by Readers after reading).
     void SetAllUniqueFlyNames();
@@ -912,7 +912,7 @@ public:
 
     // Query if style (paragraph- / character- / frame- / page-) is used.
     bool IsUsed( const SwModify& ) const;
-    bool IsUsed( const SwNumRule& ) const;
+    static bool IsUsed( const SwNumRule& );
 
     // Set name of newly loaded document template.
     sal_uInt16 SetDocPattern( const OUString& rPatternName );
@@ -936,11 +936,11 @@ public:
 
     /** get the set of printable pages for the XRenderable API by
      evaluating the respective settings (see implementation) */
-    void CalculatePagesForPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+    static void CalculatePagesForPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
             sal_Int32 nDocPageCount );
-    void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+    static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
             sal_Int32 nDocPageCount );
-    void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions,
+    static void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions,
             sal_Int32 nDocPageCount );
 
     // PageDescriptor interface.
@@ -985,7 +985,7 @@ public:
     void CheckDefaultPageFmt();
 
     // Methods for tables/indices
-    sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ) const;
+    static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& );
     void DeleteTOXMark( const SwTOXMark* pTOXMark );
     const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark,
                                 SwTOXSearch eDir, bool bInReadOnly );
@@ -998,8 +998,8 @@ public:
     const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
                                             const SwTOXBase& rTOX,
                                             const SfxItemSet* pSet = 0 );
-    SwTOXBase* GetCurTOX( const SwPosition& rPos );
-    const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX) const;
+    static SwTOXBase* GetCurTOX( const SwPosition& rPos );
+    static const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX);
 
     bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes = false );
     OUString GetUniqueTOXBaseName( const SwTOXType& rType,
@@ -1061,14 +1061,14 @@ public:
         bool bMoveCrsr = false );
 
     // Set everything in the range of [rStartNode, rEndNode] to rNewPos.
-    void CorrAbs(
+    static void CorrAbs(
         const SwNodeIndex& rStartNode,
         const SwNodeIndex& rEndNode,
         const SwPosition& rNewPos,
         bool bMoveCrsr = false );
 
     // Set everything in this range from rRange to rNewPos.
-    void CorrAbs(
+    static void CorrAbs(
         const SwPaM& rRange,
         const SwPosition& rNewPos,
         bool bMoveCrsr = false );
@@ -1121,7 +1121,7 @@ public:
     void SetNumRuleStart( const SwPosition& rPos, bool bFlag = true );
     void SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt );
 
-    SwNumRule* GetNumRuleAtPos( const SwPosition& rPos ) const;
+    static SwNumRule* GetNumRuleAtPos( const SwPosition& rPos );
 
     const SwNumRuleTbl& GetNumRuleTbl() const { return *mpNumRuleTbl; }
 
@@ -1153,9 +1153,9 @@ public:
                         const OUString& rNewRule );
 
     // Goto next/previous on same level.
-    bool GotoNextNum( SwPosition&, bool bOverUpper = true,
+    static bool GotoNextNum( SwPosition&, bool bOverUpper = true,
                         sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 );
-    bool GotoPrevNum( SwPosition&, bool bOverUpper = true,
+    static bool GotoPrevNum( SwPosition&, bool bOverUpper = true,
                         sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 );
 
     /** Searches for a text node with a numbering rule.
@@ -1268,12 +1268,12 @@ public:
     bool IsInsTblAlignNum() const;
 
     // From FEShell (for Undo and BModified).
-    void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
-                    const SwCellFrm* pBoxFrm = 0 ) const;
+    static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
+                    const SwCellFrm* pBoxFrm = 0 );
     void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
                     const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 );
-    void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr,
-                    const SwCellFrm* pBoxFrm = 0 ) const;
+    static void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr,
+                    const SwCellFrm* pBoxFrm = 0 );
     void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCrsr,
                      const SwCellFrm* pBoxFrm = 0 );
 
@@ -1368,9 +1368,9 @@ public:
     SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
             SwTOXBase const*const pTOXBase = 0,
             SfxItemSet const*const pAttr = 0, bool const bUpdate = true);
-    sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
-                                const SwNode** ppSttNd = 0 ) const;
-    SwSection* GetCurrSection( const SwPosition& rPos ) const;
+    static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
+                                const SwNode** ppSttNd = 0 );
+    static SwSection* GetCurrSection( const SwPosition& rPos );
     SwSectionFmts& GetSections() { return *mpSectionFmtTbl; }
     const SwSectionFmts& GetSections() const { return *mpSectionFmtTbl; }
     SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom );
@@ -1509,17 +1509,17 @@ public:
                         const bool _bPosCorr );
 
     void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew );
-    void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const;
+    static void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz );
     void SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew );
-    void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ) const;
+    static void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz );
     bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true );
     void SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew );
-    bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const;
+    static bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill );
     void SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet );
     void SetTabLineStyle( const SwCursor& rCursor,
                           const Color* pColor, bool bSetLine,
                           const editeng::SvxBorderLine* pBorderLine );
-    void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const;
+    static void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet );
     void SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew );
     /**
     Retrieves a box attribute from the given cursor.
@@ -1531,9 +1531,9 @@ public:
     the values of the same property over any other boxes in the selection; if any value is different from
     that of the first box, the property is unset (and false is returned).
     */
-    bool GetBoxAttr( const SwCursor& rCursor, SfxPoolItem &rToFill ) const;
+    static bool GetBoxAttr( const SwCursor& rCursor, SfxPoolItem &rToFill );
     void SetBoxAlign( const SwCursor& rCursor, sal_uInt16 nAlign );
-    sal_uInt16 GetBoxAlign( const SwCursor& rCursor ) const;
+    static sal_uInt16 GetBoxAlign( const SwCursor& rCursor );
     void AdjustCellWidth( const SwCursor& rCursor, bool bBalance = false );
 
     SwChainRet Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest );
@@ -1560,7 +1560,7 @@ public:
     void SetContainsMSVBasic( bool bFlag )  { mbContains_MSVBasic = bFlag; }
 
     // Interface for the list of Ruby - texts/attributes
-    sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList,
+    static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList,
                         sal_uInt16 nMode );
     sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
                         sal_uInt16 nMode );
@@ -1599,7 +1599,7 @@ public:
         @param bValue     - true  mark the level
                           - false unmark the level
      */
-    void MarkListLevel( SwList& rList,
+    static void MarkListLevel( SwList& rList,
                         const int nListLevel,
                         const bool bValue );
 
@@ -1629,9 +1629,9 @@ public:
 
        @return the textual description of rPaM
      */
-    OUString GetPaMDescr(const SwPaM & rPaM) const;
+    static OUString GetPaMDescr(const SwPaM & rPaM);
 
-    bool IsFirstOfNumRuleAtPos( const SwPosition & rPos );
+    static bool IsFirstOfNumRuleAtPos( const SwPosition & rPos );
 
     // access methods for XForms model(s)
 
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 386bf51..c671a69 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -108,7 +108,7 @@ public:
     bool Contains(Value const& p) const
         { return std::find(begin(), end(), p) != end(); }
 
-    void dumpAsXml(struct _xmlTextWriter* /*pWriter*/) const {};
+    static void dumpAsXml(struct _xmlTextWriter* /*pWriter*/) {};
 };
 
 template<typename Value>
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 4129d33..5bb9264 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -182,7 +182,7 @@ class SwAuthorFieldType : public SwFieldType
 public:
     SwAuthorFieldType();
 
-    OUString                Expand(sal_uLong) const;
+    static OUString         Expand(sal_uLong);
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
@@ -331,8 +331,8 @@ public:
     void                Evaluate(SwDoc*);
 
     inline void         SetValue(bool bHidden)  { bIsHidden = bHidden; }
-    OUString            GetColumnName(const OUString& rName);
-    OUString            GetDBName(const OUString& rName, SwDoc *pDoc);
+    static OUString     GetColumnName(const OUString& rName);
+    static OUString     GetDBName(const OUString& rName, SwDoc *pDoc);
 
     /// Condition
     virtual void        SetPar1(const OUString& rStr) SAL_OVERRIDE;
@@ -531,7 +531,7 @@ public:
 
     inline void             SetData(const OUString& rStr)     { aData = rStr; }
 
-    OUString                Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const;
+    static OUString         Expand(sal_uInt16 nSubType, sal_uInt32 nFormat);
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index cca79a1..c95e682 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -423,7 +423,7 @@ public:
     const SwTOXBase*    GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false );
     void                SetDefaultTOXBase(const SwTOXBase& rBase);
 
-    bool                IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
+    static bool         IsTOXBaseReadonly(const SwTOXBase& rTOXBase);
     void                SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly);
 
     sal_uInt16              GetTOXCount() const;
@@ -673,7 +673,7 @@ public:
     void HyphIgnore();
 
     /// For Inserting SoftHyphen. Position is offset within the syllabificated word.
-    void InsertSoftHyph( const sal_Int32 nHyphPos );
+    static void InsertSoftHyph( const sal_Int32 nHyphPos );
 
     const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts,  ///< ALL_TBL_INS_ATTR
                                 sal_uInt16 nRows, sal_uInt16 nCols,
@@ -735,22 +735,22 @@ public:
     bool SpellSentence(svx::SpellPortions& rToFill, bool bIsGrammarCheck );
 
     /// Make SpellIter start with the current sentence when called next time.
-    void PutSpellingToSentenceStart();
+    static void PutSpellingToSentenceStart();
 
     /// Moves the continuation position to the end of the currently checked sentence.
-    void MoveContinuationPosToEndOfCheckedSentence();
+    static void MoveContinuationPosToEndOfCheckedSentence();
 
     /// Applies a changed sentence.
     void ApplyChangedSentence(const svx::SpellPortions& rNewPortions, bool bRecheck);
 
     /// Check SwSpellIter data to see if the last sentence got grammar checked.
-    bool HasLastSentenceGotGrammarChecked() const;
+    static bool HasLastSentenceGotGrammarChecked();
 
     /// Is text conversion active somewhere else?
-    bool HasConvIter() const;
+    static bool HasConvIter();
 
     /// Is hyphenation active somewhere else?
-    bool HasHyphIter() const;
+    static bool HasHyphIter();
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XSpellAlternatives >
@@ -762,7 +762,7 @@ public:
             ::com::sun::star::uno::Sequence< OUString > /*out*/ &rSuggestions,
             const Point* pPt, SwRect& rSelectRect );
 
-    void IgnoreGrammarErrorAt( SwPaM& rErrorPosition );
+    static void IgnoreGrammarErrorAt( SwPaM& rErrorPosition );
     void SetLinguRange( SwDocPositions eStart, SwDocPositions eEnd );
 
     /// @return reference set in document according to given name.
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 0a54a79..69a2b65 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -772,8 +772,8 @@ public:
     SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
     bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
 
-    bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
-                                   const Point& _rDocPos ) const;
+    static bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
+                                   const Point& _rDocPos );
 
     void ToggleHeaderFooterEdit( );
 };
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index a0a4195..bf4089a 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -42,7 +42,7 @@ class SwList
 
         void InsertListItem( SwNodeNum& rNodeNum,
                              const int nLevel );
-        void RemoveListItem( SwNodeNum& rNodeNum );
+        static void RemoveListItem( SwNodeNum& rNodeNum );
 
         void InvalidateListTree();
         void ValidateListTree();
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index e79c236..7088f27 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -73,7 +73,7 @@ class SwRevisionConfig : public utl::ConfigItem
     sal_uInt16          nMarkAlign;     //Revision/LinesChanged/Mark
     Color           aMarkColor;     //Revision/LinesChanged/Color
 
-    const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+    static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
 
     virtual void            ImplCommit() SAL_OVERRIDE;
 
@@ -97,7 +97,7 @@ class SwCompareConfig : public utl::ConfigItem
     bool            bIgnorePieces;  //Compare/Settings/Ignore pieces of length
     sal_uInt16      nPieceLen;		//Compare/Settings/Ignore pieces of length
 
-    const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+    static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
 
     virtual void    ImplCommit() SAL_OVERRIDE;
 
@@ -152,7 +152,7 @@ class SwTableConfig : public utl::ConfigItem
     bool    bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition  // Automatic recognition of number formats.
     bool    bInsTblAlignNum;        // Table/Input/Alignment                // Align numbers.
 
-    const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+    static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
 
     virtual void    ImplCommit() SAL_OVERRIDE;
 
@@ -182,7 +182,7 @@ class SwMiscConfig : public utl::ConfigItem
     OUString    sMailingPath;               // FormLetter/FileOutput/Path
     OUString    sMailName;                  // FormLetter/FileOutput/FileName/FromManualSetting (string!)
 
-    const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+    static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
 
     virtual void    ImplCommit() SAL_OVERRIDE;
 
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 4384bcf..158b8dc 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -117,7 +117,7 @@ class SW_DLLPUBLIC SwNodes
     bool bInDelUpdNum : 1;          ///< Flag for updating of Outline.
 
     // Actions on the nodes.
-    void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd );
+    static void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd );
     void DelNodes( const SwNodeIndex& rStart, sal_uLong nCnt = 1 );
 
     void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize,
@@ -167,7 +167,7 @@ public:
        Implementation in doc.hxx (because one needs to know Doc for it) ! */
     bool IsDocNodes() const;
 
-    sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex) const;
+    static sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex);
     void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1);
 
     bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&,
@@ -183,11 +183,11 @@ public:
 
     bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const;
 
-    void GoStartOfSection(SwNodeIndex *) const;
-    void GoEndOfSection(SwNodeIndex *) const;
+    static void GoStartOfSection(SwNodeIndex *);
+    static void GoEndOfSection(SwNodeIndex *);
 
     SwCntntNode* GoNext(SwNodeIndex *) const;
-    SwCntntNode* GoPrevious(SwNodeIndex *) const;
+    static SwCntntNode* GoPrevious(SwNodeIndex *);
 
     /** Go to next/previous Cntnt/Table-node for which LayoutFrames exist.
      While doing this do not leave Header/Footer/Frame etc. */
@@ -198,13 +198,13 @@ public:
        (Both set FALSE ==> GoNext/GoPrevious!!!). */
     SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden  = true,
                                            bool bSkipProtect = true ) const;
-    SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden  = true,
-                                           bool bSkipProtect = true ) const;
+    static SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden  = true,
+                                           bool bSkipProtect = true );
 
     /** Create an empty section of Start- and EndNote. It may be called
        only if a new section with content is to be created,
        e.g. at filters/Undo/... */
-    SwStartNode* MakeEmptySection( const SwNodeIndex& rIdx,
+    static SwStartNode* MakeEmptySection( const SwNodeIndex& rIdx,
                                     SwStartNodeType = SwNormalStartNode );
 
     /// Implementations of "Make...Node" are in the given .cxx-files.
@@ -216,7 +216,7 @@ public:
                             SwTxtFmtColl *pColl,
                             SwAttrSet* pAutoAttr = 0 );
 
-    SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
+    static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
                             const OUString& rGrfName,
                             const OUString& rFltName,
                             const Graphic* pGraphic,
@@ -224,7 +224,7 @@ public:
                             SwAttrSet* pAutoAttr = 0,
                             bool bDelayed = false );    ///< in ndgrf.cxx
 
-    SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
+    static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
                             const GraphicObject& rGrfObj,
                             SwGrfFmtColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndgrf.cxx
@@ -253,7 +253,7 @@ public:
        adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item
        overrides the item in pAttrSet. */
 
-    SwTableNode* InsertTable( const SwNodeIndex& rNdIdx,
+    static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx,
                         sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl,
                         sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0,
                         SwTxtFmtColl* pHeadlineTxtColl = 0,
@@ -267,7 +267,7 @@ public:
                                 SwTxtFmtColl* pTxtColl,
                                 SwUndoTxtToTbl* pUndo = 0 );
 
-    SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange);
+    static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange);
 
     /// create a table from a vector of NodeRanges - API support
     SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 740a561..058d57d 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -91,9 +91,9 @@ private:
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
     // #i81002#
-    OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
+    static OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
                           const SwTxtNode& rTxtNodeOfReferencedItem,
-                          const sal_uInt32 nRefNumFormat ) const;
+                          const sal_uInt32 nRefNumFormat );
 
 public:
     SwGetRefField( SwGetRefFieldType*, const OUString& rSetRef,
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index a3080ab..6dc7d17 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -236,7 +236,7 @@ public:
 
     void CreateLink( LinkCreateType eType );
 
-    void MakeChildLinksVisible( const SwSectionNode& rSectNd );
+    static void MakeChildLinksVisible( const SwSectionNode& rSectNd );
 
     bool IsLinkType() const { return m_Data.IsLinkType(); }
 
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index f62df9a..83aff3c 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -447,8 +447,8 @@ public:
     // Stream-specific routines. Do not use in storage-writer!
 
     // Optimizing output on stream.
-    SvStream& OutLong( SvStream& rStrm, long nVal );
-    SvStream& OutULong( SvStream& rStrm, sal_uLong nVal );
+    static SvStream& OutLong( SvStream& rStrm, long nVal );
+    static SvStream& OutULong( SvStream& rStrm, sal_uLong nVal );
 
     inline SvStream& OutLong( long nVal )       { return OutLong( Strm(), nVal ); }
     inline SvStream& OutULong( sal_uLong nVal )     { return OutULong( Strm(), nVal ); }
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index f016ac3..0b5504a 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -181,7 +181,7 @@ public:
     bool IsEmbeddedLoadSave() const         { return bEmbeddedLoadSave; }
     void SetEmbeddedLoadSave( bool bFlag )  { bEmbeddedLoadSave = bFlag; }
 
-    void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false);
+    static void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false);
 
     // Table modi.
     bool            IsInsTblFormatNum(bool bHTML) const;
@@ -227,7 +227,7 @@ public:
     void    RemoveAttrPool();
 
     // Invalidates online spell-wrong-lists if necessary.
-    void    CheckSpellChanges( bool bOnlineSpelling,
+    static void  CheckSpellChanges( bool bOnlineSpelling,
                     bool bIsSpellWrongAgain, bool bIsSpellAllAgain, bool bSmartTags );
 
     inline ::com::sun::star::uno::Reference<
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index eb303d6..ac000d8 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -296,8 +296,8 @@ public:
     // rBoxes as a return value for immediate use.
     // steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen
     // bToTop = true -> up to base line, false-> else only line of box.
-    SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
-                            SwSelBoxes& rBoxes, bool bToTop = true ) const;
+    static SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
+                            SwSelBoxes& rBoxes, bool bToTop = true );
 
     // Get information from client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -392,7 +392,7 @@ class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrmFmt.
 
     // In case Format contains formulas/values already,
     // a new one must be created for the new box.
-    SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* );
+    static SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* );
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index a27ce71..9ec5e4d 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -56,9 +56,9 @@ protected:
     bool bCacheComment;
     mutable OUString * pComment;
 
-    void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 );
-    void RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext );
-    void RemoveIdxRel( sal_uLong, const SwPosition& );
+    static void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 );
+    static void RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext );
+    static void RemoveIdxRel( sal_uLong, const SwPosition& );
 
     static bool CanRedlineGroup( SwRedlineSaveDatas& rCurr,
                                 const SwRedlineSaveDatas& rCheck,
@@ -150,10 +150,10 @@ protected:
     // content. So the attributes do not get expanded.
     // MoveTo:      moves from the NodesArray into the UndoNodesArray.
     // MoveFrom:    moves from the UndoNodesArray into the NodesArray.
-    void MoveToUndoNds( SwPaM& rPam,
+    static void MoveToUndoNds( SwPaM& rPam,
                         SwNodeIndex* pNodeIdx = 0,
                         sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 );
-    void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
+    static void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
                           SwPosition& rInsPos,
                           sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 );
 
@@ -161,8 +161,8 @@ protected:
     // a range can be spanned for Undo/Redo. (In this case the SPoint
     // is before the manipulated range!!)
     // The flag indicates if there is content before the SPoint.
-    bool MovePtBackward( SwPaM& rPam );
-    void MovePtForward( SwPaM& rPam, bool bMvBkwrd );
+    static bool MovePtBackward( SwPaM& rPam );
+    static void MovePtForward( SwPaM& rPam, bool bMvBkwrd );
 
     // Before moving stuff into UndoNodes-Array care has to be taken that
     // the content-bearing attributes are removed from the nodes-array.
@@ -190,8 +190,8 @@ public:
     SwUndoSaveSection();
     ~SwUndoSaveSection();
 
-    void SaveSection( SwDoc* pDoc, const SwNodeIndex& rSttIdx );
-    void SaveSection( SwDoc* pDoc, const SwNodeRange& rRange );
+    void SaveSection( const SwNodeIndex& rSttIdx );
+    void SaveSection( const SwNodeRange& rRange );
     void RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, sal_uInt16 nSectType );
     void RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos );
 
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 7c85f9b..60282bf 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -150,7 +150,7 @@ class SwChartDataProvider :
                ::com::sun::star::uno::RuntimeException,
                std::exception);
 
-    OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation );
+    static OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation );
 
 protected:
     //SwClient
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 33c7bd9..68e4d40 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -60,7 +60,7 @@ public:
     SdrView*            GetDrawView() {return mpView;}
     SdrPageView*        GetPageView();
     void                RemovePageView();
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >       GetInterface( SdrObject* pObj );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >       GetInterface( SdrObject* pObj );
 
     // The following method is called when a SvxShape-object is to be created.
     // Derived classes may obtain at this point a derivation or an object
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 20c9403..ffe6985 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -428,7 +428,7 @@ public:
 
     sal_uInt16          getRowCount();
     sal_uInt16          getColumnCount();
-    ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >     GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
+    static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >     GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
                         const OUString& sTLName, const OUString& sBRName,
                         SwRangeDescriptor& rDesc);
 
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 87dc830..8f10c19 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -178,9 +178,9 @@ public:
             SwViewOption(const SwViewOption&);
             ~SwViewOption();
 
-    void   Init( vcl::Window *pWin );        // Initializing of static data.
+    static void Init( vcl::Window *pWin );        // Initializing of static data.
 
-    sal_uInt16 GetPixelTwips() const { return nPixelTwips; }
+    static sal_uInt16 GetPixelTwips() { return nPixelTwips; }
 
     inline sal_uInt32   GetCoreOptions() const {return nCoreOptions;}
     inline void     SetUIOptions( const SwViewOption& );
@@ -244,9 +244,9 @@ public:
         { return (nCoreOptions & VIEWOPT_1_POSTITS) != 0; }
     inline void SetPostIts( bool b )
         { b ? (nCoreOptions |= VIEWOPT_1_POSTITS ) : ( nCoreOptions &= ~VIEWOPT_1_POSTITS); }
-           void PaintPostIts( OutputDevice *pOut, const SwRect &rRect,
-                              bool bIsScript ) const;
-           sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ) const;
+    static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect,
+                              bool bIsScript );
+    static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 );
 
     inline bool IsShowHiddenChar(bool bHard = false) const
         { return !bReadonly && (nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) &&
@@ -388,7 +388,7 @@ public:
     inline bool  IsPagePrevBookview() const { return mbBookView; }
     inline void  SetPagePrevBookview(bool bSet) { mbBookView = bSet; }
 
-    bool IsAutoCompleteWords() const;
+    static bool IsAutoCompleteWords();
 
     bool   IsViewLayoutBookMode() const { return mbViewLayoutBookMode; }
     void   SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; }
@@ -422,8 +422,8 @@ public:
     inline sal_uInt16 GetZoom() const    { return nZoom; }
     inline void   SetZoom( sal_uInt16 n ){ nZoom = n; }
 
-    void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ) const;
-    void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ) const;
+    static void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol );
+    static void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect );
 
     SwViewOption& operator=( const SwViewOption &rOpt );
 
@@ -584,7 +584,7 @@ public:
 
     static void     SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInConfig = false);
 
-    void    SetDocBoundaries(bool bSet)   {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);}
+    static void     SetDocBoundaries(bool bSet)   {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);}
 
     static void     ApplyColorConfigValues(const svtools::ColorConfig& rConfig);
 };
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 71c4a1e..b4c0782 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -673,7 +673,7 @@ class SwAccPreviewData
         input parameter - constant reference to the preview window size in TWIP;
         needed to determine the visible part of the logic page rectangle
     */
-    void AdjustLogicPgRectToVisibleArea( SwRect&         _iorLogicPgSwRect,
+    static void AdjustLogicPgRectToVisibleArea( SwRect&         _iorLogicPgSwRect,
                                          const SwRect&   _rPreviewPgSwRect,
                                          const Size&     _rPreviewWinSize );
 
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 52f3a2e..d0e53dc 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -96,7 +96,7 @@ class SwAccessibleParagraph :
     /// get the (accessible) text string (requires frame; check before)
     OUString GetString();
 
-    OUString GetDescription();
+    static OUString GetDescription();
 
     // get the current care position
     sal_Int32 GetCaretPos();
@@ -121,16 +121,16 @@ class SwAccessibleParagraph :
     // methods for checking the parameter range:
 
     // does nPos point to a char?
-    bool IsValidChar(sal_Int32 nPos, sal_Int32 nLength);
+    static bool IsValidChar(sal_Int32 nPos, sal_Int32 nLength);
 
     // does nPos point to a position? (may be behind the last character)
-    bool IsValidPosition(sal_Int32 nPos, sal_Int32 nLength);
+    static bool IsValidPosition(sal_Int32 nPos, sal_Int32 nLength);
 
     // is nBegin...nEnd a valid range? (nEnd points past the last character)
-    bool IsValidRange(sal_Int32 nBegin, sal_Int32 nEnd, sal_Int32 nLength);
+    static bool IsValidRange(sal_Int32 nBegin, sal_Int32 nEnd, sal_Int32 nLength);
 
     // Ensure ordered range (i.e. nBegin is smaller then nEnd)
-    void OrderRange(sal_Int32& nBegin, sal_Int32& nEnd)
+    static void OrderRange(sal_Int32& nBegin, sal_Int32& nEnd)
     {
         if( nBegin > nEnd )
         {
@@ -214,7 +214,7 @@ protected:
     bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound,
                               const OUString& rText,
                               sal_Int32 nPos );
-    bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound,
+    static bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound,
                                    const OUString& rText,
                                    sal_Int32 nPos );
     bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound,
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 8eadf58..f9359fe 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -397,7 +397,7 @@ sal_Int32 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const
 void SwAccessiblePortionData::FillBoundary(
     Boundary& rBound,
     const Positions_t& rPositions,
-    size_t nPos ) const
+    size_t nPos )
 {
     rBound.startPos = rPositions[nPos];
     rBound.endPos = rPositions[nPos+1];
@@ -405,7 +405,7 @@ void SwAccessiblePortionData::FillBoundary(
 
 size_t SwAccessiblePortionData::FindBreak(
     const Positions_t& rPositions,
-    sal_Int32 nValue ) const
+    sal_Int32 nValue )
 {
     OSL_ENSURE( rPositions.size() >= 2, "need min + max value" );
     OSL_ENSURE( rPositions[0] <= nValue, "need min value" );
@@ -462,7 +462,7 @@ size_t SwAccessiblePortionData::FindBreak(
 
 size_t SwAccessiblePortionData::FindLastBreak(
     const Positions_t& rPositions,
-    sal_Int32 nValue ) const
+    sal_Int32 nValue )
 {
     size_t nResult = FindBreak( rPositions, nValue );
 
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index 3db82a6..d3f8798 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -71,15 +71,15 @@ class SwAccessiblePortionData : public SwPortionHandler
 
     /// returns the index of the first position whose value is smaller
     /// or equal, and whose following value is equal or larger
-    size_t FindBreak( const Positions_t& rPositions, sal_Int32 nValue ) const;
+    static size_t FindBreak( const Positions_t& rPositions, sal_Int32 nValue );
 
     /// like FindBreak, but finds the last equal or larger position
-    size_t FindLastBreak( const Positions_t& rPositions, sal_Int32 nValue ) const;
+    static size_t FindLastBreak( const Positions_t& rPositions, sal_Int32 nValue );
 
     /// fill the boundary with the values from rPositions[nPos]
-    void FillBoundary(com::sun::star::i18n::Boundary& rBound,
+    static void FillBoundary(com::sun::star::i18n::Boundary& rBound,
                       const Positions_t& rPositions,
-                      size_t nPos ) const;
+                      size_t nPos );
 
     /// Access to portion attributes
     bool IsPortionAttrSet( size_t nPortionNo, sal_uInt8 nAttr ) const;
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index 7781c80..468bd72 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -53,7 +53,7 @@ void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeExcep
     SolarMutexGuard aGuard;
 
     // Installed recognizers have changed. We remove all existing smart tags:
-    SW_MOD()->CheckSpellChanges( false, true, true, true );
+    SwModule::CheckSpellChanges( false, true, true, true );
 
     SmartTagMgr::modified( rEO );
 }
@@ -63,7 +63,7 @@ void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( R
     SolarMutexGuard aGuard;
 
     // Configuration has changed. We remove all existing smart tags:
-    SW_MOD()->CheckSpellChanges( false, true, true, true );
+    SwModule::CheckSpellChanges( false, true, true, true );
 
     SmartTagMgr::changesOccurred( rEvent );
 }
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 2085aaa..98e3360 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -605,7 +605,7 @@ void SwCrsrShell::ExtendedSelectAll(bool bFootnotes)
     pPos->nContent.Assign( rNodes.GoNext( &pPos->nNode ), 0 );
     pPos = m_pCurCrsr->GetMark();
     pPos->nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pCNd = rNodes.GoPrevious( &pPos->nNode );
+    SwCntntNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
     pPos->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 }
 
@@ -616,7 +616,7 @@ bool SwCrsrShell::ExtendedSelectedAll(bool bFootnotes)
     SwCntntNode* pStart = rNodes.GoNext(&nNode);
 
     nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pEnd = rNodes.GoPrevious(&nNode);
+    SwCntntNode* pEnd = SwNodes::GoPrevious(&nNode);
 
     if (!pStart || !pEnd)
         return false;
@@ -2435,7 +2435,7 @@ bool SwCrsrShell::IsEndOfDoc() const
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfContent(), -1 );
     SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
     if( !pCNd )
-        pCNd = GetDoc()->GetNodes().GoPrevious( &aIdx );
+        pCNd = SwNodes::GoPrevious( &aIdx );
 
     return aIdx == m_pCurCrsr->GetPoint()->nNode &&
             pCNd->Len() == m_pCurCrsr->GetPoint()->nContent.GetIndex();
@@ -2883,19 +2883,22 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
         ( !IsReadOnlyAvailable() &&
            pSectNd->GetSection().IsProtectFlag() )) )
     {
-        typedef SwCntntNode* (SwNodes:: *FNGoSection)( SwNodeIndex *, bool, bool ) const;
-        FNGoSection funcGoSection = &SwNodes::GoNextSection;
-
         bOk = false;
-
+        bool bGoNextSection = true;
         for( int nLoopCnt = 0; !bOk && nLoopCnt < 2; ++nLoopCnt )
         {
             bool bContinue;
             do {
                 bContinue = false;
-                while( 0 != ( pCNd = (rNds.*funcGoSection)( &rNdIdx,
-                                            true, !IsReadOnlyAvailable() )) )
+                for (;;)
                 {
+                    if (bGoNextSection)
+                        pCNd = rNds.GoNextSection( &rNdIdx,
+                                            true, !IsReadOnlyAvailable() );
+                    else
+                        pCNd = SwNodes::GoPrevSection( &rNdIdx,
+                                            true, !IsReadOnlyAvailable() );
+                    if ( pCNd == 0) break;
                     // moved inside a table -> check if it is protected
                     if( pCNd->FindTableNode() )
                     {
@@ -2939,7 +2942,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
             if( !bOk )
             {
                 if( !nLoopCnt )
-                    funcGoSection = &SwNodes::GoPrevSection;
+                    bGoNextSection = false;
                 rNdIdx = nNdIdx;
             }
         }
@@ -3272,7 +3275,7 @@ void SwCrsrShell::ClearUpCrsrs()
         SwNodes & aNodes = GetDoc()->GetNodes();
         const SwNode* pStart = lcl_NodeContext( pStartCrsr->GetPoint()->nNode.GetNode() );
         SwNodeIndex aIdx( pStartCrsr->GetPoint()->nNode );
-        SwNode * pNode = aNodes.GoPrevious(&aIdx);
+        SwNode * pNode = SwNodes::GoPrevious(&aIdx);
         if( pNode == NULL || lcl_NodeContext( *pNode ) != pStart )
             aNodes.GoNext( &aIdx );
         if( pNode == NULL || lcl_NodeContext( *pNode ) != pStart )
@@ -3309,7 +3312,7 @@ OUString SwCrsrShell::GetCrsrDescr() const
     if (IsMultiSelection())
         aResult += SW_RES(STR_MULTISEL);
     else
-        aResult = GetDoc()->GetPaMDescr(*GetCrsr());
+        aResult = SwDoc::GetPaMDescr(*GetCrsr());
 
     return aResult;
 }
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index b0caa56..32ceba6 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -107,7 +107,7 @@ void SwCrsrShell::MoveCrsrToNum()
 /// go to next/previous point on the same level
 bool SwCrsrShell::GotoNextNum()
 {
-    if (!GetDoc()->GotoNextNum( *m_pCurCrsr->GetPoint() ))
+    if (!SwDoc::GotoNextNum( *m_pCurCrsr->GetPoint() ))
         return false;
     MoveCrsrToNum();
     return true;
@@ -115,7 +115,7 @@ bool SwCrsrShell::GotoNextNum()
 
 bool SwCrsrShell::GotoPrevNum()
 {
-    if (!GetDoc()->GotoPrevNum( *m_pCurCrsr->GetPoint() ))
+    if (!SwDoc::GotoPrevNum( *m_pCurCrsr->GetPoint() ))
         return false;
     MoveCrsrToNum();
     return true;
@@ -364,7 +364,7 @@ bool SwCrsrShell::GotoTOXMarkBase()
     bool bRet = false;
 
     SwTOXMarks aMarks;
-    sal_uInt16 nCnt = GetDoc()->GetCurTOXMark( *m_pCurCrsr->GetPoint(), aMarks );
+    sal_uInt16 nCnt = SwDoc::GetCurTOXMark( *m_pCurCrsr->GetPoint(), aMarks );
     if( nCnt )
     {
         // Take the 1. and get the index type. Search in its dependency list
@@ -802,7 +802,7 @@ bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
 
 SwTxtFld * SwCrsrShell::GetTxtFldAtPos(
     const SwPosition* pPos,
-    const bool bIncludeInputFldAtStart ) const
+    const bool bIncludeInputFldAtStart )
 {
     SwTxtFld* pTxtFld = NULL;
 
@@ -817,7 +817,7 @@ SwTxtFld * SwCrsrShell::GetTxtFldAtPos(
 
 SwField* SwCrsrShell::GetFieldAtCrsr(
     const SwPaM* pCrsr,
-    const bool bIncludeInputFldAtStart ) const
+    const bool bIncludeInputFldAtStart )
 {
     SwField* pFieldAtCrsr = NULL;
 
@@ -869,7 +869,7 @@ bool SwCrsrShell::CrsrInsideInputFld() const
     return false;
 }
 
-bool SwCrsrShell::PosInsideInputFld( const SwPosition& rPos ) const
+bool SwCrsrShell::PosInsideInputFld( const SwPosition& rPos )
 {
     return dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, false )) != NULL;
 }
@@ -885,7 +885,7 @@ bool SwCrsrShell::DocPtInsideInputFld( const Point& rDocPt ) const
     return false;
 }
 
-sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos ) const
+sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos )
 {
     const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
     if ( pTxtInputFld == NULL )
@@ -896,7 +896,7 @@ sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos ) const
     return pTxtInputFld->GetStart();
 }
 
-sal_Int32 SwCrsrShell::EndOfInputFldAtPos( const SwPosition& rPos ) const
+sal_Int32 SwCrsrShell::EndOfInputFldAtPos( const SwPosition& rPos )
 {
     const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
     if ( pTxtInputFld == NULL )
@@ -2034,7 +2034,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
 
             pIdx = &m_pCurCrsr->GetPoint()->nNode;
             if( !pIdx->GetNode().IsCntntNode() &&
-                0 != ( pCNd = GetDoc()->GetNodes().GoPrevSection( pIdx,
+                0 != ( pCNd = SwNodes::GoPrevSection( pIdx,
                                             true, IsReadOnlyAvailable() )) )
             {
                 if( *pIdx >= m_pCurCrsr->GetMark()->nNode )
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index be811b4..d09e1f3 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -309,7 +309,7 @@ SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
 SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
 {
     SwNodeIndex aIdx( *pIdx );
-    SwCntntNode* pNd = aIdx.GetNodes().GoPrevious( &aIdx );
+    SwCntntNode* pNd = SwNodes::GoPrevious( &aIdx );
     if( pNd )
     {
         if( bChk && 1 != pIdx->GetIndex() - aIdx.GetIndex() &&
@@ -790,7 +790,7 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
             {
                 pNd = bSrchForward
                         ? rNodes.GoNextSection( &aPos.nNode, true, !bInReadOnly )
-                        : rNodes.GoPrevSection( &aPos.nNode, true, !bInReadOnly );
+                        : SwNodes::GoPrevSection( &aPos.nNode, true, !bInReadOnly );
                 if( pNd )
                 {
                     aPos.nContent.Assign( pNd, ::GetSttOrEnd( bSrchForward,*pNd ));
@@ -842,10 +842,10 @@ void GoStartSection( SwPosition * pPos )
 {
     // jump to section's beginning
     SwNodes& rNodes = pPos->nNode.GetNodes();
-    sal_uInt16 nLevel = rNodes.GetSectionLevel( pPos->nNode );
+    sal_uInt16 nLevel = SwNodes::GetSectionLevel( pPos->nNode );
     if( pPos->nNode < rNodes.GetEndOfContent().StartOfSectionIndex() )
         nLevel--;
-    do { rNodes.GoStartOfSection( &pPos->nNode ); } while( nLevel-- );
+    do { SwNodes::GoStartOfSection( &pPos->nNode ); } while( nLevel-- );
 
     // already on a CntntNode
     pPos->nNode.GetNode().GetCntntNode()->MakeStartIndex( &pPos->nContent );
@@ -856,10 +856,10 @@ void GoEndSection( SwPosition * pPos )
 {
     // jump to section's beginning/end
     SwNodes& rNodes = pPos->nNode.GetNodes();
-    sal_uInt16 nLevel = rNodes.GetSectionLevel( pPos->nNode );
+    sal_uInt16 nLevel = SwNodes::GetSectionLevel( pPos->nNode );
     if( pPos->nNode < rNodes.GetEndOfContent().StartOfSectionIndex() )
         nLevel--;
-    do { rNodes.GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
+    do { SwNodes::GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
 
     // now on a EndNode, thus to the previous CntntNode
     if( GoPreviousNds( &pPos->nNode, true ) )
@@ -979,8 +979,7 @@ bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
 {
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
-    SwNodes& rNds = aSavePos.nNode.GetNodes();
-    (rNds.*fnMove->fnSection)( &rPos.nNode );
+    (fnMove->fnSection)( &rPos.nNode );
     SwCntntNode *pNd;
     if( 0 == ( pNd = rPos.nNode.GetNode().GetCntntNode()) &&
         0 == ( pNd = (*fnMove->fnNds)( &rPos.nNode, true )) )
@@ -998,8 +997,7 @@ bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
 {
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
-    SwNodes& rNds = aSavePos.nNode.GetNodes();
-    rNds.GoEndOfSection( &rPos.nNode );
+    SwNodes::GoEndOfSection( &rPos.nNode );
 
     // no other CntntNode existent?
     if( !GoInCntnt( rPam, fnMoveForward ) )
@@ -1007,7 +1005,7 @@ bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
         rPos = aSavePos; // do not change cursor
         return false;
     }
-    (rNds.*fnMove->fnSection)( &rPos.nNode );
+    (fnMove->fnSection)( &rPos.nNode );
     SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
     rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
@@ -1018,8 +1016,7 @@ bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
 {
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
-    SwNodes& rNds = aSavePos.nNode.GetNodes();
-    rNds.GoStartOfSection( &rPos.nNode );
+    SwNodes::GoStartOfSection( &rPos.nNode );
 
     // no further CntntNode existent?
     if( !GoInCntnt( rPam, fnMoveBackward ))
@@ -1027,7 +1024,7 @@ bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
         rPos = aSavePos; // do not change cursor
         return false;
     }
-    (rNds.*fnMove->fnSection)( &rPos.nNode );
+    (fnMove->fnSection)( &rPos.nNode );
     SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
     rPos.nContent.Assign( pNd,
                             ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ));
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index dcca20d..0000eb9 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -265,12 +265,12 @@ bool SwCursor::IsSelOvr( int eFlags )
             bool bGoNxt = m_pSavePos->nNode < rPtIdx.GetIndex();
             SwCntntNode* pCNd = bGoNxt
                 ? rNds.GoNextSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections)
-                : rNds.GoPrevSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections);
+                : SwNodes::GoPrevSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections);
             if( !pCNd && ( nsSwCursorSelOverFlags::SELOVER_ENABLEREVDIREKTION & eFlags ))
             {
                 bGoNxt = !bGoNxt;
                 pCNd = bGoNxt ? rNds.GoNextSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections)
-                    : rNds.GoPrevSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections);
+                    : SwNodes::GoPrevSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections);
             }
 
             bool bIsValidPos = 0 != pCNd;
@@ -504,7 +504,7 @@ bool SwCursor::IsSelOvr( int eFlags )
                 pMyNd->StartOfSectionNode()->IsSectionNode() ) )
             {
                 pMyNd = bSelTop
-                    ? rNds.GoPrevSection( &GetPoint()->nNode,true,false )
+                    ? SwNodes::GoPrevSection( &GetPoint()->nNode,true,false )
                     : rNds.GoNextSection( &GetPoint()->nNode,true,false );
 
                 /* #i12312# Handle failure of Go{Prev|Next}Section */
@@ -883,7 +883,7 @@ static bool lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
 
     rPam.SetMark();
     rPam.GetPoint()->nNode = rEndNd;
-    pCNd = rNds.GoPrevious( &rPam.GetPoint()->nNode );
+    pCNd = SwNodes::GoPrevious( &rPam.GetPoint()->nNode );
     if( !pCNd )
         return false;
     pCNd->MakeEndIndex( &rPam.GetPoint()->nContent );
@@ -903,7 +903,7 @@ static bool lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
     if( !bFirst )
     {
         rPam.GetPoint()->nNode = rSttNd;
-        pCNd = rNds.GoPrevious( &rPam.GetPoint()->nNode );
+        pCNd = SwNodes::GoPrevious( &rPam.GetPoint()->nNode );
         if( !pCNd )
             return false;
         pCNd->MakeEndIndex( &rPam.GetPoint()->nContent );
@@ -1092,7 +1092,7 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
         break;
     case DOCPOS_END:
         rPos.nNode = rNds.GetEndOfContent();
-        pCNd = rNds.GoPrevious( &rPos.nNode );
+        pCNd = SwNodes::GoPrevious( &rPos.nNode );
         bIsStart = false;
         break;
     case DOCPOS_OTHERSTART:
@@ -1101,7 +1101,7 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
         break;
     case DOCPOS_OTHEREND:
         rPos.nNode = *rNds.GetEndOfContent().StartOfSectionNode();
-        pCNd = rNds.GoPrevious( &rPos.nNode );
+        pCNd = SwNodes::GoPrevious( &rPos.nNode );
         bIsStart = false;
         break;
     default:
@@ -2195,7 +2195,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
 
                 aIdx.Assign( *pSttNd->EndOfSectionNode(), - 1 );
                 if( !( pNd = &aIdx.GetNode())->IsCntntNode() )
-                    pNd = rNds.GoPrevSection( &aIdx, true, false );
+                    pNd = SwNodes::GoPrevSection( &aIdx, true, false );
 
                 pPos = pCur->GetPoint();
                 if (pNd && pNd != &pPos->nNode.GetNode())
@@ -2240,7 +2240,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
             SwPosition* pPos = pNew->GetPoint();
             pPos->nNode.Assign( *pSttNd->EndOfSectionNode(), - 1 );
             if( !( pNd = &pPos->nNode.GetNode())->IsCntntNode() )
-                pNd = rNds.GoPrevSection( &pPos->nNode, true, false );
+                pNd = SwNodes::GoPrevSection( &pPos->nNode, true, false );
 
             pPos->nContent.Assign(static_cast<SwCntntNode*>(pNd), pNd ? static_cast<SwCntntNode*>(pNd)->Len() : 0);
         }
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 09bf2b5..92d40ed 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -65,7 +65,7 @@ bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else
             {
                 aIdx = *pNd->EndOfSectionNode();
-                SwCntntNode* pCNd = pNd->GetNodes().GoPrevSection( &aIdx,
+                SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -119,7 +119,7 @@ bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else
             {
                 aIdx = *pNd->EndOfSectionNode();
-                SwCntntNode* pCNd = pNd->GetNodes().GoPrevSection( &aIdx,
+                SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -149,7 +149,7 @@ bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
     if( bMoveBackward )
     {
         SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
-        pCNd = pNd->GetNodes().GoPrevSection( &aIdx, true, !bInReadOnly );
+        pCNd = SwNodes::GoPrevSection( &aIdx, true, !bInReadOnly );
     }
     else
     {
@@ -182,7 +182,7 @@ bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
         if( bMoveBackward ) // to the end of the section
         {
             SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
-            pCNd = pNd->GetNodes().GoPrevSection( &aIdx, true, !bInReadOnly );
+            pCNd = SwNodes::GoPrevSection( &aIdx, true, !bInReadOnly );
             if( !pCNd )
                 return false;
             pPos->nNode = aIdx;
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index d545fd8..33d2914 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -92,8 +92,7 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
 
                 // the document might change; w/o Action views would not be notified
                 static_cast<SwEditShell*>(this)->StartAllAction();
-                bRet = mpDoc->InsertRow( pTblNd->GetTable().
-                                    SelLineFromBox( pTableBox, aBoxes, false ));
+                bRet = mpDoc->InsertRow( SwTable::SelLineFromBox( pTableBox, aBoxes, false ));
                 static_cast<SwEditShell*>(this)->EndAllAction();
             }
         }
@@ -434,11 +433,10 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
         return false;
     }
 
-    SwNodes& rNds = aTmp.GetNode().GetNodes();
     SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
 
     if( !pCNd )
-        pCNd = rNds.GoPrevious( &aTmp );
+        pCNd = SwNodes::GoPrevious( &aTmp );
 
     if ( !pCNd )
         return false;
@@ -459,7 +457,7 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
 
             pCNd = aTmp.GetNode().GetCntntNode();
             if( 0 == pCNd )
-                pCNd = rNds.GoPrevious( &aTmp );
+                pCNd = SwNodes::GoPrevious( &aTmp );
 
             if ( !pCNd )
                 return false;
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index a67aa88..b30639d 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -391,7 +391,7 @@ void SwSelPaintRects::HighlightInputFld()
     if (m_bShowTxtInputFldOverlay)
     {
         SwTxtInputFld* pCurTxtInputFldAtCrsr =
-            dynamic_cast<SwTxtInputFld*>(GetShell()->GetTxtFldAtPos( GetShell()->GetCrsr()->Start(), false ));
+            dynamic_cast<SwTxtInputFld*>(SwCrsrShell::GetTxtFldAtPos( GetShell()->GetCrsr()->Start(), false ));
         if ( pCurTxtInputFldAtCrsr != NULL )
         {
             SwTxtNode* pTxtNode = pCurTxtInputFldAtCrsr->GetpTxtNode();
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 25d4ca3..79bf10c 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -183,9 +183,9 @@ namespace
             inline void RestoreUnoCrsrs(updater_t& rUpdater);
             inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
             inline void RestoreShellCrsrs(updater_t& rUpdater);
-            inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
+            static inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
                 { return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); };
-            inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
+            static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
                 { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); };
     };
     static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM, const bool bPoint)
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index e940caf..562b54e 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1653,7 +1653,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
         {
             ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-            SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
+            SwStartNode* pSttNd = SwNodes::MakeEmptySection(
                                 SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ));
             aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
             // copy without Frames
@@ -1661,8 +1661,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
             aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
             aPam.SetMark();
-            SwCntntNode* pNode =
-                pDoc->GetNodes().GoPrevious( &aPam.GetMark()->nNode );
+            SwCntntNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
             pNode->MakeEndIndex( &aPam.GetMark()->nContent );
 
             aPam.GetPoint()->nNode = *aPam.GetNode().StartOfSectionNode();
@@ -1727,7 +1726,7 @@ void DocumentContentOperationsManager::DeleteSection( SwNode *pNode )
     {
         // move all Crsr/StkCrsr/UnoCrsr out of the to-be-deleted area
         SwNodeIndex aMvStt( aSttIdx, 1 );
-        m_rDoc.CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), true );
+        SwDoc::CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), true );
     }
 
     m_rDoc.GetNodes().DelNodes( aSttIdx, aEndIdx.GetIndex() - aSttIdx.GetIndex() + 1 );
@@ -1841,7 +1840,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
         }
         else
         {
-            m_rDoc.CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), true );
+            SwDoc::CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), true );
         }
 
             // What's with Flys?
@@ -2571,7 +2570,7 @@ SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
 {
     if( !pFrmFmt )
         pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
-    SwGrfNode* pSwGrfNode = m_rDoc.GetNodes().MakeGrfNode(
+    SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfName, rFltName, pGraphic,
                             m_rDoc.GetDfltGrfFmtColl() );
@@ -2587,7 +2586,7 @@ SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const G
 {
     if( !pFrmFmt )
         pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
-    SwGrfNode* pSwGrfNode = m_rDoc.GetNodes().MakeGrfNode(
+    SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfObj, m_rDoc.GetDfltGrfFmtColl() );
     SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 847a96b..a3fe650 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1330,9 +1330,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
                     {
                         bChgd = true;
                         SwAuthorField* pAuthorFld = static_cast<SwAuthorField*>(pFmtFld->GetField());
-                        pAuthorFld->SetExpansion( static_cast<SwAuthorFieldType*>(
-                                    pAuthorFld->GetTyp())->Expand(
-                                                pAuthorFld->GetFormat() ) );
+                        pAuthorFld->SetExpansion( SwAuthorFieldType::Expand( pAuthorFld->GetFormat() ) );
                     }
                     break;
 
@@ -1341,8 +1339,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
                     {
                         bChgd = true;
                         SwExtUserField* pExtUserFld = static_cast<SwExtUserField*>(pFmtFld->GetField());
-                        pExtUserFld->SetExpansion( static_cast<SwExtUserFieldType*>(
-                                    pExtUserFld->GetTyp())->Expand(
+                        pExtUserFld->SetExpansion( SwExtUserFieldType::Expand(
                                             pExtUserFld->GetSubType(),
                                             pExtUserFld->GetFormat()));
                     }
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index fbb2646..ad23762 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -399,7 +399,7 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
         SwNodeRange aRg( rCSttNd, 1, *rCSttNd.EndOfSectionNode() );
 
         SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
-        SwStartNode* pSttNd = m_rDoc.GetNodes().MakeEmptySection( aIdx, SwFlyStartNode );
+        SwStartNode* pSttNd = SwNodes::MakeEmptySection( aIdx, SwFlyStartNode );
 
         // Set the Anchor/CntntIndex first.
         // Within the copying part, we can access the values (DrawFmt in Headers and Footers)
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 38918b0..eda5205 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2347,7 +2347,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
         if( !pEnd->nNode.GetNode().IsCntntNode() )
         {
             SwNodeIndex aTmp( pEnd->nNode );
-            SwCntntNode* pCNd = m_rDoc.GetNodes().GoPrevSection( &aTmp );
+            SwCntntNode* pCNd = SwNodes::GoPrevSection( &aTmp );
             if( !pCNd || ( aTmp == rSttPos.nNode &&
                 pCNd->Len() == rSttPos.nContent.GetIndex() ))
                 pFnd = 0;
@@ -2416,7 +2416,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
             {
                 pIdx = &rPam.GetPoint()->nNode;
                 if( !pIdx->GetNode().IsCntntNode() &&
-                    0 != ( pCNd = m_rDoc.GetNodes().GoPrevSection( pIdx )) )
+                    0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
                 {
                     if( *pIdx >= rPam.GetMark()->nNode )
                         rPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
@@ -2525,7 +2525,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
             SwCntntNode* pCNd;
             SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
             if( !pIdx->GetNode().IsCntntNode() &&
-                0 != ( pCNd = m_rDoc.GetNodes().GoPrevSection( pIdx )) )
+                0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
             {
                 if( *pIdx >= rPam.GetPoint()->nNode )
                     rPam.GetMark()->nContent.Assign( pCNd, pCNd->Len() );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index eaf0410..80de11e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1406,7 +1406,7 @@ bool SwDoc::RemoveInvisibleContent()
                         aPam.GetPoint()->nContent.Assign( pCNd, 0 );
                         aPam.SetMark();
                         aPam.GetPoint()->nNode = *pSectNd->EndOfSectionNode();
-                        pCNd = GetNodes().GoPrevious(
+                        pCNd = SwNodes::GoPrevious(
                                                 &aPam.GetPoint()->nNode );
                         aPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
 
@@ -1539,7 +1539,7 @@ bool SwDoc::ConvertFieldsToText()
                     if (pTxtField && pTxtField->Which() == RES_TXTATR_INPUTFIELD)
                     {
                         SwPosition &rEndPos = *aInsertPam.GetPoint();
-                        rEndPos.nContent = GetDocShell()->GetWrtShell()->EndOfInputFldAtPos( *aInsertPam.End() );
+                        rEndPos.nContent = SwCrsrShell::EndOfInputFldAtPos( *aInsertPam.End() );
                     }
                     else
                     {
@@ -1637,7 +1637,7 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew)
     }
 }
 
-OUString SwDoc::GetPaMDescr(const SwPaM & rPam) const
+OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
 {
     if (&rPam.GetNode(true) == &rPam.GetNode(false))
     {
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index a7ed67a..ea6621c 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -131,7 +131,7 @@ namespace
         if ( pNode == NULL )
         {
             SwNodeIndex aStt = SwNodeIndex(rStt);
-            pNode = rStt.GetNodes().GoPrevious(&aStt);
+            pNode = SwNodes::GoPrevious(&aStt);
             bPosAtEndOfNode = true;
         }
         if ( pNode != NULL )
@@ -1344,7 +1344,7 @@ void _DelBookmarks(
                 {
                     bStt = false;
                     pRStt->nNode = rStt;
-                    if( 0 == ( pCNd = pDoc->GetNodes().GoPrevious( &pRStt->nNode )) )
+                    if( 0 == ( pCNd = SwNodes::GoPrevious( &pRStt->nNode )) )
                     {
                         pRStt->nNode = pREnd->nNode;
                         pCNd = pRStt->nNode.GetNode().GetCntntNode();
@@ -1362,7 +1362,7 @@ void _DelBookmarks(
             {
                 bool bStt = false;
                 SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
-                if( !pCNd && 0 == ( pCNd = pDoc->GetNodes().GoPrevious( &pREnd->nNode )) )
+                if( !pCNd && 0 == ( pCNd = SwNodes::GoPrevious( &pREnd->nNode )) )
                 {
                     bStt = true;
                     pREnd->nNode = rEnd;
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index c9d59c9..e53e37c 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -74,8 +74,8 @@ private:
 
     SwPaM *pInsRing, *pDelRing;
 
-    sal_uLong PrevIdx( const SwNode* pNd );
-    sal_uLong NextIdx( const SwNode* pNd );
+    static sal_uLong PrevIdx( const SwNode* pNd );
+    static sal_uLong NextIdx( const SwNode* pNd );
 
     vector< CompareLine* > aLines;
     bool m_bRecordDiff;
@@ -265,7 +265,7 @@ private:
     int *pPos1, *pPos2;
     int nCnt1, nCnt2;		// number of words
 
-    void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
+    static void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
 
 public:
     WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 );
@@ -326,7 +326,7 @@ protected:
                     int nEnd1 = 0, int nStt2 = 0, int nEnd2 = 0 );
 
 public:
-    int IgnoreIsolatedPieces( int *pLcs1, int *pLcs2, int nLen1, int nLen2,
+    static int IgnoreIsolatedPieces( int *pLcs1, int *pLcs2, int nLen1, int nLen2,
                                 int nLcsLen, int nPieceLen );
 };
 
@@ -1319,7 +1319,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
 
             if( CmpOptions.nIgnoreLen )
             {
-                nLcsLen = aSeq.IgnoreIsolatedPieces( &aTmpLcsDst[0], &aTmpLcsSrc[0],
+                nLcsLen = CommonSubseq::IgnoreIsolatedPieces( &aTmpLcsDst[0], &aTmpLcsSrc[0],
                                                 aCmp.GetLen1(), aCmp.GetLen2(),
                                                 nLcsLen, CmpOptions.nIgnoreLen );
             }
@@ -1336,7 +1336,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
 
             if( CmpOptions.nIgnoreLen )
             {
-                nLcsLen = aSeq.IgnoreIsolatedPieces( &aLcsDst[0], &aLcsSrc[0], nDstLen,
+                nLcsLen = CommonSubseq::IgnoreIsolatedPieces( &aLcsDst[0], &aLcsSrc[0], nDstLen,
                                                     nSrcLen, nLcsLen,
                                                     CmpOptions.nIgnoreLen );
             }
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 17f2748..a92b2d24 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -286,7 +286,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
                 // is copied, and the Index to the StartNode is set to
                 // the left or first header attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
-                SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmp, SwHeaderStartNode );
+                SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwHeaderStartNode );
                 SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
                             *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
@@ -358,7 +358,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
                 // is copied, and the Index to the StartNode is set to
                 // the left footer attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
-                SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmp, SwFooterStartNode );
+                SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwFooterStartNode );
                 SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
                             *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 9095f52..287c8d1 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -795,7 +795,7 @@ void SwDoc::DeleteAutoCorrExceptWord()
     mpACEWord = 0;
 }
 
-void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const
+void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat )
 {
     // This is a modified version of SwDoc::TransliterateText
     const SwPosition* pStt = rPaM.Start();
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 0bfeee4..f3b6fe6 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -396,7 +396,7 @@ const SwDBData& SwDoc::GetDBDesc()
         }
     }
     if(maDBData.sDataSource.isEmpty())
-        maDBData = GetDBManager()->GetAddressDBName();
+        maDBData = SwDBManager::GetAddressDBName();
 #endif
     return maDBData;
 }
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index a7a4adf..53edd19 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -671,7 +671,7 @@ bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
 }
 
 void SwDoc::GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName,
-                       OUString* pFltName ) const
+                       OUString* pFltName )
 {
     SwNodeIndex aIdx( *rFmt.GetCntnt().GetCntntIdx(), 1 );
     const SwGrfNode* pGrfNd = aIdx.GetNode().GetGrfNode();
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 1dbcb13..227b053 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1371,7 +1371,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader,
             {
                 SwNodeIndex aTmpIdx( GetNodes().GetEndOfAutotext() );
                 const SwNodes& rSrcNds = rSrcFmt.GetDoc()->GetNodes();
-                SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmpIdx,
+                SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmpIdx,
                                                 bCpyHeader
                                                     ? SwHeaderStartNode
                                                     : SwFooterStartNode );
@@ -1598,7 +1598,7 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
 }
 
 SwFmt* SwDoc::FindFmtByName( const SwFmtsBase& rFmtArr,
-                             const OUString& rName ) const
+                             const OUString& rName )
 {
     SwFmt* pFnd = 0;
     for( size_t n = 0; n < rFmtArr.GetFmtCount(); ++n )
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index aeff01c..9b4e5ef 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1919,7 +1919,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             {
                 // We need to remove the last empty Node again
                 aIdx = aInsPos.nNode;
-                SwCntntNode* pCNd = GetNodes().GoPrevious( &aInsPos.nNode );
+                SwCntntNode* pCNd = SwNodes::GoPrevious( &aInsPos.nNode );
                 aInsPos.nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 
                 // All, that are in the to-be-deleted Node, need to be
@@ -2074,7 +2074,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
     return bResult;
 }
 
-SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos ) const
+SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos )
 {
     SwNumRule* pRet = NULL;
     SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 20db662..4213331 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1170,7 +1170,7 @@ void SwRangeRedline::MoveToSection()
         }
         else
         {
-            pSttNd = rNds.MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
+            pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode );
 
             SwPosition aPos( *pSttNd->EndOfSectionNode() );
@@ -1243,7 +1243,7 @@ void SwRangeRedline::CopyToSection()
         }
         else
         {
-            pSttNd = rNds.MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
+            pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode );
 
             if( pCEndNd )
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 7999816..3637d34 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -103,7 +103,7 @@ SwSortElement::~SwSortElement()
 {
 }
 
-double SwSortElement::StrToDouble( const OUString& rStr ) const
+double SwSortElement::StrToDouble( const OUString& rStr )
 {
     if( !pLclData )
         pLclData = new LocaleDataWrapper( LanguageTag( *pLocale ));
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 8b6ff31..e26b20f 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -111,7 +111,7 @@ sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) c
 
 /// Get current table of contents Mark.
 sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
-                                SwTOXMarks& rArr ) const
+                                SwTOXMarks& rArr )
 {
     // search on Position rPos for all SwTOXMarks
     SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
@@ -434,7 +434,7 @@ SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos )
     return 0;
 }
 
-const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
+const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase)
 {
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = static_cast<const SwTOXBaseSection&>(rTOXBase);
@@ -740,7 +740,7 @@ bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, bool bAtStart ) const
         else
         {
             rPos.nNode = *pSectNd->EndOfSectionNode();
-            pCNd = pSectNd->GetDoc()->GetNodes().GoPrevious( &rPos.nNode );
+            pCNd = SwNodes::GoPrevious( &rPos.nNode );
             if( pCNd ) nC = pCNd->Len();
         }
         rPos.nContent.Assign( pCNd, nC );
@@ -818,7 +818,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
             // determine page description of content before table-of-content
             SwNodeIndex aIdx( *pSectNd );
             pDefaultPageDesc =
-                pSectNd->GetNodes().GoPrevious( &aIdx )->FindPageDesc( false );
+                SwNodes::GoPrevious( &aIdx )->FindPageDesc( false );
 
         }
         if ( !pDefaultPageDesc )
@@ -875,7 +875,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         }
         --aEndIdx;
         SwPosition aPos( aEndIdx, SwIndex( pFirstEmptyNd, 0 ));
-        pDoc->CorrAbs( aSttIdx, aEndIdx, aPos, true );
+        SwDoc::CorrAbs( aSttIdx, aEndIdx, aPos, true );
 
         // delete flys in whole range including start node which requires
         // giving the node before start node as Mark parameter, hence -1.
@@ -1005,7 +1005,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         if( !aCorPam.Move( fnMoveForward ) )
             aCorPam.Move( fnMoveBackward );
         SwNodeIndex aEndIdx( aInsPos, 1 );
-        pDoc->CorrAbs( aInsPos, aEndIdx, *aCorPam.GetPoint(), true );
+        SwDoc::CorrAbs( aInsPos, aEndIdx, *aCorPam.GetPoint(), true );
 
         // Task 70995 - save and restore PageDesc and Break Attributes
         if( pFirstEmptyNd->HasSwAttrSet() )
@@ -1886,10 +1886,10 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
             {
                 // Own entry for double entries or keywords
                 if( pOld->GetType() == TOX_SORT_CUSTOM &&
-                    pNew->GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY)
+                    SwTOXSortTabBase::GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY)
                     continue;
 
-                if(!(pNew->GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
+                if(!(SwTOXSortTabBase::GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
                 {   // Own entry
                     aSortArr.insert(aSortArr.begin() + i, pNew);
                     return;
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index 276def0..a35d90e 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -41,7 +41,7 @@ class SwListImpl
 
         void InsertListItem( SwNodeNum& rNodeNum,
                              const int nLevel );
-        void RemoveListItem( SwNodeNum& rNodeNum );
+        static void RemoveListItem( SwNodeNum& rNodeNum );
 
         void InvalidateListTree();
         void ValidateListTree();
@@ -241,7 +241,7 @@ void SwList::InsertListItem( SwNodeNum& rNodeNum,
 
 void SwList::RemoveListItem( SwNodeNum& rNodeNum )
 {
-    mpListImpl->RemoveListItem( rNodeNum );
+    SwListImpl::RemoveListItem( rNodeNum );
 }
 
 void SwList::InvalidateListTree()
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 667d165..8a01ce7 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1104,7 +1104,7 @@ namespace numfunc
             void SetToDefault();
 
             /** returns sequence of default bullet configuration property names */
-            uno::Sequence<OUString> GetPropNames() const;
+            static uno::Sequence<OUString> GetPropNames();
 
             /** loads default bullet configuration properties and applies
                 values to internal data */
@@ -1180,7 +1180,7 @@ namespace numfunc
         mnLevelChars[9] = 0x2022;
     }
 
-    uno::Sequence<OUString> SwDefBulletConfig::GetPropNames() const
+    uno::Sequence<OUString> SwDefBulletConfig::GetPropNames()
     {
         uno::Sequence<OUString> aPropNames(13);
         OUString* pNames = aPropNames.getArray();
@@ -1323,7 +1323,7 @@ namespace numfunc
             void SetToDefault();
 
             /** returns sequence of configuration property names */
-            com::sun::star::uno::Sequence<OUString> GetPropNames() const;
+            static com::sun::star::uno::Sequence<OUString> GetPropNames();
 
             /** loads configuration properties and applies values to internal data */
             void LoadConfig();
@@ -1362,7 +1362,7 @@ namespace numfunc
         mbChangeIndentOnTabAtFirstPosOfFirstListItem = true;
     }
 
-    com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames() const
+    com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames()
     {
         com::sun::star::uno::Sequence<OUString> aPropNames(1);
         OUString* pNames = aPropNames.getArray();
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 2af0575..8165c82 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -123,7 +123,7 @@ bool SwDoc::IsUsed( const SwModify& rModify ) const
 }
 
 // See if the NumRule is used
-bool SwDoc::IsUsed( const SwNumRule& rRule ) const
+bool SwDoc::IsUsed( const SwNumRule& rRule )
 {
     bool bUsed = rRule.GetTxtNodeListSize() > 0 ||
                      rRule.GetParagraphStyleListSize() > 0;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index f3a732c..a260ddf 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -878,7 +878,7 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
 
     SwEditShell *pShell = pDoc->GetEditShell();
     SwFmtRowSplit *pRowSplit = 0;
-    pDoc->GetRowSplit(*pShell->getShellCrsr(false), pRowSplit);
+    SwDoc::GetRowSplit(*pShell->getShellCrsr(false), pRowSplit);
     m_bRowSplit = pRowSplit && pRowSplit->GetValue();
     delete pRowSplit;
     pRowSplit = 0;
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 8dbd572..8d0d7d7 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -551,9 +551,9 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         // Move Bookmarks
         {
             SwPosition aMvPos( aInsIdx );
-            SwCntntNode* pCNd = pDoc->GetNodes().GoPrevious( &aMvPos.nNode );
+            SwCntntNode* pCNd = SwNodes::GoPrevious( &aMvPos.nNode );
             aMvPos.nContent.Assign( pCNd, pCNd->Len() );
-            pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false );
+            SwDoc::CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false );
         }
 
         // If we still have FlyFrames hanging around, delete them too
@@ -1041,7 +1041,7 @@ static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara )
 
 // Find all Boxes with content in this Box
 SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
-                                    SwSelBoxes& rBoxes, bool bToTop ) const
+                                    SwSelBoxes& rBoxes, bool bToTop )
 {
     SwTableLine* pLine = const_cast<SwTableLine*>(pBox->GetUpper());
     if( bToTop )
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 9bb5888..5f7b6df 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -84,7 +84,7 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds,
         do
         {
             if ( _bPrev
-                 ? !_rNds.GoPrevSection( &aChkIdx, false, false )
+                 ? !SwNodes::GoPrevSection( &aChkIdx, false, false )
                  : !_rNds.GoNextSection( &aChkIdx, false, false ) )
             {
                 OSL_FAIL( "<lcl_IsInSameTblBox(..)> - no previous/next!" );
@@ -134,7 +134,7 @@ static void lcl_CheckEmptyLayFrm( SwNodes& rNds, SwSectionData& rSectionData,
                         const SwNode& rStt, const SwNode& rEnd )
 {
     SwNodeIndex aIdx( rStt );
-    if( !rNds.GoPrevSection( &aIdx, true, false ) ||
+    if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
         !CheckNodesRange( rStt, aIdx, true ) ||
         // #i21457#
         !lcl_IsInSameTblBox( rNds, rStt, true ))
@@ -386,7 +386,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
 }
 
 sal_uInt16 SwDoc::IsInsRegionAvailable( const SwPaM& rRange,
-                                const SwNode** ppSttNd ) const
+                                const SwNode** ppSttNd )
 {
     sal_uInt16 nRet = 1;
     if( rRange.HasMark() )
@@ -498,7 +498,7 @@ sal_uInt16 SwDoc::IsInsRegionAvailable( const SwPaM& rRange,
     return nRet;
 }
 
-SwSection* SwDoc::GetCurrSection( const SwPosition& rPos ) const
+SwSection* SwDoc::GetCurrSection( const SwPosition& rPos )
 {
     const SwSectionNode* pSectNd = rPos.nNode.GetNode().FindSectionNode();
     if( pSectNd )
@@ -1067,7 +1067,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
             if( !pCNd )
             {
                 aIdx = *this;
-                pCNd = rNds.GoPrevSection(&aIdx, true, false);
+                pCNd = SwNodes::GoPrevSection(&aIdx, true, false);
                 if (!pCNd)
                     return;
             }
@@ -1203,7 +1203,7 @@ void SwSectionNode::DelFrms()
     // Or else the Fly/TblBox Frame does not have a Lower!
     {
         SwNodeIndex aIdx( *this );
-        if( !rNds.GoPrevSection( &aIdx, true, false ) ||
+        if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
             !CheckNodesRange( *this, aIdx, true ) ||
             // #i21457#
             !lcl_IsInSameTblBox( rNds, *this, true ))
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 78afb54..208aefc 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -381,7 +381,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list