summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/access/acccell.hxx54
-rw-r--r--sw/source/core/access/acccontext.hxx50
-rw-r--r--sw/source/core/access/accdoc.hxx68
-rw-r--r--sw/source/core/access/accembedded.hxx16
-rw-r--r--sw/source/core/access/accfield.hxx46
-rw-r--r--sw/source/core/access/accfootnote.hxx10
-rw-r--r--sw/source/core/access/accframebase.hxx14
-rw-r--r--sw/source/core/access/accgraphic.hxx10
-rw-r--r--sw/source/core/access/accheaderfooter.hxx12
-rw-r--r--sw/source/core/access/acchyperlink.hxx18
-rw-r--r--sw/source/core/access/accmap.cxx6
-rw-r--r--sw/source/core/access/accnotextframe.hxx66
-rw-r--r--sw/source/core/access/accnotexthyperlink.hxx18
-rw-r--r--sw/source/core/access/accpage.hxx18
-rw-r--r--sw/source/core/access/accpara.hxx142
-rw-r--r--sw/source/core/access/accportions.hxx12
-rw-r--r--sw/source/core/access/accpreview.hxx14
-rw-r--r--sw/source/core/access/acctable.cxx4
-rw-r--r--sw/source/core/access/acctable.hxx112
-rw-r--r--sw/source/core/access/acctextframe.hxx36
-rw-r--r--sw/source/core/crsr/BlockCursor.cxx12
-rw-r--r--sw/source/core/crsr/findattr.cxx4
-rw-r--r--sw/source/core/crsr/findcoll.cxx4
-rw-r--r--sw/source/core/crsr/findtxt.cxx4
-rw-r--r--sw/source/core/crsr/overlayrangesoutline.hxx2
-rw-r--r--sw/source/core/doc/acmplwrd.cxx2
-rw-r--r--sw/source/core/doc/doccomp.cxx30
-rw-r--r--sw/source/core/doc/number.cxx8
-rw-r--r--sw/source/core/doc/swstylemanager.cxx10
-rw-r--r--sw/source/core/docnode/cancellablejob.hxx2
-rw-r--r--sw/source/core/docnode/finalthreadmanager.cxx6
-rw-r--r--sw/source/core/docnode/section.cxx8
-rw-r--r--sw/source/core/draw/dcontact.cxx4
-rw-r--r--sw/source/core/draw/dflyobj.cxx12
-rw-r--r--sw/source/core/draw/dview.cxx2
-rw-r--r--sw/source/core/fields/ddefld.cxx8
-rw-r--r--sw/source/core/frmedt/feshview.cxx2
-rw-r--r--sw/source/core/inc/MarkManager.hxx64
-rw-r--r--sw/source/core/inc/SwGrammarMarkUp.hxx4
-rw-r--r--sw/source/core/inc/SwUndoFmt.hxx78
-rw-r--r--sw/source/core/inc/SwUndoPageDesc.hxx22
-rw-r--r--sw/source/core/inc/SwUndoTOXChange.hxx6
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx16
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx6
-rw-r--r--sw/source/core/inc/SwXMLBlockListContext.hxx10
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx38
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx28
-rw-r--r--sw/source/core/inc/UndoAttribute.hxx56
-rw-r--r--sw/source/core/inc/UndoBookmark.hxx6
-rw-r--r--sw/source/core/inc/UndoCore.hxx22
-rw-r--r--sw/source/core/inc/UndoDelete.hxx8
-rw-r--r--sw/source/core/inc/UndoDraw.hxx22
-rw-r--r--sw/source/core/inc/UndoInsert.hxx26
-rw-r--r--sw/source/core/inc/UndoManager.hxx54
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx38
-rw-r--r--sw/source/core/inc/UndoOverwrite.hxx14
-rw-r--r--sw/source/core/inc/UndoRedline.hxx26
-rw-r--r--sw/source/core/inc/UndoSection.hxx6
-rw-r--r--sw/source/core/inc/UndoSort.hxx6
-rw-r--r--sw/source/core/inc/UndoSplitMove.hxx10
-rw-r--r--sw/source/core/inc/UndoTable.hxx66
-rw-r--r--sw/source/core/inc/acorrect.hxx18
-rw-r--r--[-rwxr-xr-x]sw/source/core/inc/annotationmark.hxx2
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/bodyfrm.hxx4
-rw-r--r--sw/source/core/inc/bookmrk.hxx66
-rw-r--r--sw/source/core/inc/cellfrm.hxx12
-rw-r--r--sw/source/core/inc/cntfrm.hxx14
-rw-r--r--sw/source/core/inc/colfrm.hxx4
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx14
-rw-r--r--sw/source/core/inc/dflyobj.hxx52
-rw-r--r--sw/source/core/inc/docsort.hxx6
-rw-r--r--sw/source/core/inc/dumpfilter.hxx14
-rw-r--r--sw/source/core/inc/dview.hxx24
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx20
-rw-r--r--sw/source/core/inc/flyfrm.hxx48
-rw-r--r--sw/source/core/inc/flyfrms.hxx32
-rw-r--r--sw/source/core/inc/fntcache.hxx2
-rw-r--r--sw/source/core/inc/frame.hxx2
-rw-r--r--sw/source/core/inc/frmtool.hxx2
-rw-r--r--sw/source/core/inc/ftnfrm.hxx20
-rw-r--r--sw/source/core/inc/hffrm.hxx8
-rw-r--r--sw/source/core/inc/layfrm.hxx18
-rw-r--r--sw/source/core/inc/notxtfrm.hxx12
-rw-r--r--sw/source/core/inc/observablethread.hxx8
-rw-r--r--sw/source/core/inc/pagefrm.hxx20
-rw-r--r--sw/source/core/inc/retrieveinputstream.hxx2
-rw-r--r--sw/source/core/inc/rolbck.hxx40
-rw-r--r--sw/source/core/inc/rootfrm.hxx18
-rw-r--r--sw/source/core/inc/rowfrm.hxx12
-rw-r--r--sw/source/core/inc/sectfrm.hxx20
-rw-r--r--sw/source/core/inc/swfntcch.hxx2
-rw-r--r--sw/source/core/inc/tabfrm.hxx24
-rw-r--r--sw/source/core/inc/textapi.hxx6
-rw-r--r--sw/source/core/inc/threadlistener.hxx2
-rw-r--r--sw/source/core/inc/threadmanager.hxx4
-rw-r--r--sw/source/core/inc/tocntntanchoredobjectposition.hxx10
-rw-r--r--sw/source/core/inc/tolayoutanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/txmsrt.hxx48
-rw-r--r--sw/source/core/inc/txtfrm.hxx32
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx6
-rw-r--r--sw/source/core/inc/unobookmark.hxx70
-rw-r--r--sw/source/core/inc/unoevent.hxx18
-rw-r--r--sw/source/core/inc/unofield.hxx78
-rw-r--r--sw/source/core/inc/unoflatpara.hxx48
-rw-r--r--sw/source/core/inc/unofootnote.hxx60
-rw-r--r--sw/source/core/inc/unoidx.hxx86
-rw-r--r--sw/source/core/inc/unometa.hxx86
-rw-r--r--sw/source/core/inc/unoparaframeenum.hxx10
-rw-r--r--sw/source/core/inc/unoport.hxx80
-rw-r--r--sw/source/core/inc/unorefmark.hxx36
-rw-r--r--sw/source/core/inc/unosection.hxx62
-rw-r--r--sw/source/core/inc/unotextmarkup.hxx22
-rw-r--r--sw/source/core/inc/visiturl.hxx2
-rw-r--r--sw/source/core/layout/dbg_lay.cxx10
-rw-r--r--sw/source/core/layout/frmtool.cxx2
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.hxx6
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx6
-rw-r--r--sw/source/core/layout/paintfrm.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx14
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/pordrop.hxx10
-rw-r--r--sw/source/core/text/porexp.hxx38
-rw-r--r--sw/source/core/text/porfld.hxx52
-rw-r--r--sw/source/core/text/porfly.hxx14
-rw-r--r--sw/source/core/text/porftn.hxx32
-rw-r--r--sw/source/core/text/porglue.hxx14
-rw-r--r--sw/source/core/text/porhyph.hxx34
-rw-r--r--sw/source/core/text/porlay.hxx10
-rw-r--r--sw/source/core/text/porlin.hxx2
-rw-r--r--sw/source/core/text/pormulti.hxx16
-rw-r--r--sw/source/core/text/porref.hxx16
-rw-r--r--sw/source/core/text/porrst.hxx40
-rw-r--r--sw/source/core/text/portab.hxx20
-rw-r--r--sw/source/core/text/portox.hxx16
-rw-r--r--sw/source/core/text/portxt.hxx46
-rw-r--r--sw/source/core/text/txtcache.hxx4
-rw-r--r--sw/source/core/text/xmldump.cxx10
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx8
-rw-r--r--sw/source/core/txtnode/fntcap.cxx18
-rw-r--r--sw/source/core/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/core/uibase/dbui/dbtree.cxx8
-rw-r--r--sw/source/core/uibase/dbui/mailmergechildwindow.cxx10
-rw-r--r--sw/source/core/uibase/dbui/mmconfigitem.cxx4
-rw-r--r--sw/source/core/uibase/dochdl/swdtflvr.cxx4
-rw-r--r--sw/source/core/uibase/docvw/AnchorOverlayObject.cxx4
-rw-r--r--sw/source/core/uibase/docvw/AnchorOverlayObject.hxx2
-rw-r--r--sw/source/core/uibase/docvw/AnnotationMenuButton.hxx8
-rw-r--r--[-rwxr-xr-x]sw/source/core/uibase/docvw/OverlayRanges.hxx2
-rw-r--r--sw/source/core/uibase/docvw/PageBreakWin.cxx2
-rw-r--r--sw/source/core/uibase/docvw/ShadowOverlayObject.cxx4
-rw-r--r--sw/source/core/uibase/docvw/ShadowOverlayObject.hxx2
-rw-r--r--sw/source/core/uibase/docvw/SidebarTxtControl.hxx24
-rw-r--r--sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx20
-rw-r--r--sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx2
-rw-r--r--sw/source/core/uibase/docvw/SidebarWinAcc.cxx4
-rw-r--r--sw/source/core/uibase/docvw/SidebarWinAcc.hxx2
-rw-r--r--sw/source/core/uibase/docvw/srcedtw.cxx4
-rw-r--r--sw/source/core/uibase/inc/DashedLine.hxx2
-rw-r--r--sw/source/core/uibase/inc/DropDownFieldDialog.hxx2
-rw-r--r--sw/source/core/uibase/inc/HeaderFooterWin.hxx12
-rw-r--r--sw/source/core/uibase/inc/PageBreakWin.hxx14
-rw-r--r--sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx18
-rw-r--r--sw/source/core/uibase/inc/SwXFilterOptions.hxx18
-rw-r--r--sw/source/core/uibase/inc/actctrl.hxx8
-rw-r--r--sw/source/core/uibase/inc/annotsh.hxx2
-rw-r--r--sw/source/core/uibase/inc/autoedit.hxx2
-rw-r--r--sw/source/core/uibase/inc/barcfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/bmpwin.hxx4
-rw-r--r--sw/source/core/uibase/inc/bookctrl.hxx6
-rw-r--r--sw/source/core/uibase/inc/bookmark.hxx4
-rw-r--r--sw/source/core/uibase/inc/break.hxx2
-rw-r--r--sw/source/core/uibase/inc/cfgitems.hxx20
-rw-r--r--sw/source/core/uibase/inc/changedb.hxx2
-rw-r--r--sw/source/core/uibase/inc/chrdlg.hxx6
-rw-r--r--sw/source/core/uibase/inc/colex.hxx8
-rw-r--r--sw/source/core/uibase/inc/column.hxx12
-rw-r--r--sw/source/core/uibase/inc/conarc.hxx8
-rw-r--r--sw/source/core/uibase/inc/concustomshape.hxx10
-rw-r--r--sw/source/core/uibase/inc/condedit.hxx4
-rw-r--r--sw/source/core/uibase/inc/conform.hxx6
-rw-r--r--sw/source/core/uibase/inc/conpoly.hxx8
-rw-r--r--sw/source/core/uibase/inc/conrect.hxx6
-rw-r--r--sw/source/core/uibase/inc/content.hxx6
-rw-r--r--sw/source/core/uibase/inc/conttree.hxx82
-rw-r--r--sw/source/core/uibase/inc/cption.hxx4
-rw-r--r--sw/source/core/uibase/inc/dbconfig.hxx4
-rw-r--r--sw/source/core/uibase/inc/dbinsdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/dbtree.hxx8
-rw-r--r--sw/source/core/uibase/inc/docfnote.hxx2
-rw-r--r--sw/source/core/uibase/inc/docstdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/drpcps.hxx6
-rw-r--r--sw/source/core/uibase/inc/drwtxtsh.hxx2
-rw-r--r--sw/source/core/uibase/inc/dselect.hxx4
-rw-r--r--sw/source/core/uibase/inc/edtwin.hxx34
-rw-r--r--sw/source/core/uibase/inc/envimg.hxx12
-rw-r--r--sw/source/core/uibase/inc/envlop.hxx18
-rw-r--r--sw/source/core/uibase/inc/fldedt.hxx2
-rw-r--r--sw/source/core/uibase/inc/fldtdlg.hxx8
-rw-r--r--sw/source/core/uibase/inc/fldwrap.hxx4
-rw-r--r--sw/source/core/uibase/inc/fontcfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/formedt.hxx2
-rw-r--r--sw/source/core/uibase/inc/frmdlg.hxx2
-rw-r--r--sw/source/core/uibase/inc/frmpage.hxx24
-rw-r--r--sw/source/core/uibase/inc/glosbib.hxx6
-rw-r--r--sw/source/core/uibase/inc/gloslst.hxx2
-rw-r--r--sw/source/core/uibase/inc/glossary.hxx14
-rw-r--r--sw/source/core/uibase/inc/glshell.hxx4
-rw-r--r--sw/source/core/uibase/inc/hyp.hxx10
-rw-r--r--sw/source/core/uibase/inc/inpdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/inputwin.hxx8
-rw-r--r--sw/source/core/uibase/inc/insfnote.hxx2
-rw-r--r--sw/source/core/uibase/inc/javaedit.hxx2
-rw-r--r--sw/source/core/uibase/inc/label.hxx2
-rw-r--r--sw/source/core/uibase/inc/labelcfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/labimg.hxx8
-rw-r--r--sw/source/core/uibase/inc/mailconfigpage.hxx4
-rw-r--r--sw/source/core/uibase/inc/maildispatcher.hxx4
-rw-r--r--sw/source/core/uibase/inc/mailmergechildwindow.hxx2
-rw-r--r--sw/source/core/uibase/inc/mailmergehelper.hxx74
-rw-r--r--sw/source/core/uibase/inc/mailmergewizard.hxx10
-rw-r--r--sw/source/core/uibase/inc/mailmrge.hxx4
-rw-r--r--sw/source/core/uibase/inc/mergetbl.hxx2
-rw-r--r--sw/source/core/uibase/inc/multmrk.hxx2
-rw-r--r--sw/source/core/uibase/inc/navicfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/navipi.hxx12
-rw-r--r--sw/source/core/uibase/inc/num.hxx12
-rw-r--r--sw/source/core/uibase/inc/numberingtypelistbox.hxx2
-rw-r--r--sw/source/core/uibase/inc/numpara.hxx4
-rw-r--r--sw/source/core/uibase/inc/numprevw.hxx2
-rw-r--r--sw/source/core/uibase/inc/optcomp.hxx4
-rw-r--r--sw/source/core/uibase/inc/optload.hxx14
-rw-r--r--sw/source/core/uibase/inc/optpage.hxx46
-rw-r--r--sw/source/core/uibase/inc/outline.hxx12
-rw-r--r--sw/source/core/uibase/inc/pgfnote.hxx8
-rw-r--r--sw/source/core/uibase/inc/pggrid.hxx8
-rw-r--r--sw/source/core/uibase/inc/popbox.hxx6
-rw-r--r--sw/source/core/uibase/inc/pview.hxx26
-rw-r--r--sw/source/core/uibase/inc/redlndlg.hxx6
-rw-r--r--sw/source/core/uibase/inc/regionsw.hxx18
-rw-r--r--sw/source/core/uibase/inc/rowht.hxx2
-rw-r--r--sw/source/core/uibase/inc/scroll.hxx2
-rw-r--r--sw/source/core/uibase/inc/splittbl.hxx2
-rw-r--r--sw/source/core/uibase/inc/srcedtw.hxx26
-rw-r--r--sw/source/core/uibase/inc/srcview.hxx6
-rw-r--r--sw/source/core/uibase/inc/srtdlg.hxx2
-rw-r--r--sw/source/core/uibase/inc/swdtflvr.hxx12
-rw-r--r--sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx2
-rw-r--r--sw/source/core/uibase/inc/swruler.hxx10
-rw-r--r--sw/source/core/uibase/inc/swuiccoll.hxx6
-rw-r--r--sw/source/core/uibase/inc/swuicnttab.hxx36
-rw-r--r--sw/source/core/uibase/inc/swuiidxmrk.hxx8
-rw-r--r--sw/source/core/uibase/inc/swuipardlg.hxx2
-rw-r--r--sw/source/core/uibase/inc/swvset.hxx2
-rw-r--r--sw/source/core/uibase/inc/swwrtshitem.hxx4
-rw-r--r--sw/source/core/uibase/inc/tabledlg.hxx2
-rw-r--r--sw/source/core/uibase/inc/tblctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/tbxanchr.hxx6
-rw-r--r--sw/source/core/uibase/inc/tmpdlg.hxx6
-rw-r--r--sw/source/core/uibase/inc/tmplctrl.hxx6
-rw-r--r--sw/source/core/uibase/inc/uiitems.hxx28
-rw-r--r--sw/source/core/uibase/inc/uinums.hxx2
-rw-r--r--sw/source/core/uibase/inc/uivwimp.hxx6
-rw-r--r--sw/source/core/uibase/inc/unoatxt.hxx114
-rw-r--r--sw/source/core/uibase/inc/unodispatch.hxx26
-rw-r--r--sw/source/core/uibase/inc/unomailmerge.hxx34
-rw-r--r--sw/source/core/uibase/inc/unomod.hxx46
-rw-r--r--sw/source/core/uibase/inc/unotools.hxx6
-rw-r--r--sw/source/core/uibase/inc/unotxvw.hxx160
-rw-r--r--sw/source/core/uibase/inc/usrpref.hxx20
-rw-r--r--sw/source/core/uibase/inc/view.hxx44
-rw-r--r--sw/source/core/uibase/inc/viewlayoutctrl.hxx6
-rw-r--r--sw/source/core/uibase/inc/wordcountdialog.hxx2
-rw-r--r--sw/source/core/uibase/inc/workctrl.hxx34
-rw-r--r--sw/source/core/uibase/inc/wrap.hxx10
-rw-r--r--sw/source/core/uibase/inc/wrtsh.hxx14
-rw-r--r--sw/source/core/uibase/inc/wview.hxx2
-rw-r--r--sw/source/core/uibase/inc/zoomctrl.hxx6
-rw-r--r--sw/source/core/uibase/lingu/sdrhhcwrap.hxx2
-rw-r--r--sw/source/core/uibase/ribbar/workctrl.cxx4
-rw-r--r--sw/source/core/uibase/shells/grfsh.cxx2
-rw-r--r--sw/source/core/uibase/sidebar/PagePropertyPanel.hxx2
-rw-r--r--sw/source/core/uibase/sidebar/SwPanelFactory.cxx2
-rw-r--r--sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx2
-rw-r--r--sw/source/core/uibase/table/tablepg.hxx20
-rw-r--r--sw/source/core/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/core/uibase/uno/SwXDocumentSettings.hxx28
-rw-r--r--sw/source/core/uibase/uno/unomailmerge.cxx6
-rw-r--r--sw/source/core/uibase/uno/unomodule.hxx18
-rw-r--r--sw/source/core/uibase/utlui/bookctrl.cxx2
-rw-r--r--sw/source/core/uibase/utlui/content.cxx2
-rw-r--r--sw/source/core/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/core/uibase/utlui/tmplctrl.cxx2
-rw-r--r--sw/source/core/uibase/wrtsh/wrtsh2.cxx2
-rw-r--r--sw/source/core/undo/unsect.cxx8
-rw-r--r--sw/source/core/unocore/unobkm.cxx2
-rw-r--r--sw/source/core/unocore/unocoll.cxx40
-rw-r--r--sw/source/core/unocore/unodraw.cxx10
-rw-r--r--sw/source/core/unocore/unofield.cxx6
-rw-r--r--sw/source/core/unocore/unoframe.cxx6
-rw-r--r--sw/source/core/unocore/unoftn.cxx2
-rw-r--r--sw/source/core/unocore/unoidx.cxx36
-rw-r--r--sw/source/core/unocore/unoobj.cxx2
-rw-r--r--sw/source/core/unocore/unoobj2.cxx8
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx2
-rw-r--r--sw/source/core/unocore/unorefmk.cxx22
-rw-r--r--sw/source/core/unocore/unosect.cxx2
-rw-r--r--sw/source/core/unocore/unotext.cxx2
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx12
-rw-r--r--sw/source/filter/html/htmltabw.cxx2
-rw-r--r--sw/source/filter/html/htmlvsh.hxx2
-rw-r--r--sw/source/filter/html/svxcss1.hxx4
-rw-r--r--sw/source/filter/html/swcss1.hxx10
-rw-r--r--sw/source/filter/html/swhtml.hxx12
-rw-r--r--sw/source/filter/html/wrthtml.hxx2
-rw-r--r--sw/source/filter/inc/fltini.hxx14
-rw-r--r--sw/source/filter/inc/fltshell.hxx78
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/ww1/w1class.hxx76
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx292
-rw-r--r--sw/source/filter/ww8/docxexport.hxx62
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx16
-rw-r--r--sw/source/filter/ww8/escher.hxx16
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx278
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx58
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx8
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx94
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx286
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.hxx42
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx104
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx4
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx78
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx4
-rw-r--r--sw/source/filter/xml/xmlexp.hxx34
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx30
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmlimp.hxx24
-rw-r--r--sw/source/filter/xml/xmlitem.hxx2
-rw-r--r--sw/source/filter/xml/xmliteme.cxx4
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx10
-rw-r--r--sw/source/filter/xml/xmltbli.cxx14
-rw-r--r--sw/source/filter/xml/xmltbli.hxx6
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx10
-rw-r--r--sw/source/filter/xml/xmltexti.hxx30
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx8
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx20
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx6
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx6
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx304
-rw-r--r--sw/source/ui/envelp/envfmt.hxx8
-rw-r--r--sw/source/ui/envelp/envprt.hxx8
-rw-r--r--sw/source/ui/envelp/labfmt.hxx12
-rw-r--r--sw/source/ui/envelp/labprt.hxx8
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx4
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx32
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx2
-rw-r--r--sw/source/ui/fldui/flddb.hxx8
-rw-r--r--sw/source/ui/fldui/flddinf.hxx8
-rw-r--r--sw/source/ui/fldui/flddok.hxx8
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx8
-rw-r--r--sw/source/ui/fldui/fldpage.hxx2
-rw-r--r--sw/source/ui/fldui/fldref.hxx8
-rw-r--r--sw/source/ui/fldui/fldvar.hxx10
-rw-r--r--sw/source/ui/frmdlg/cption.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx32
-rw-r--r--sw/source/ui/misc/impfnote.hxx4
-rw-r--r--sw/source/ui/table/tautofmt.cxx4
-rw-r--r--sw/source/ui/uno/swdetect.hxx2
-rw-r--r--sw/source/ui/vba/vbaaddin.hxx16
-rw-r--r--sw/source/ui/vba/vbaaddins.hxx10
-rw-r--r--sw/source/ui/vba/vbaapplication.hxx38
-rw-r--r--sw/source/ui/vba/vbaautotextentry.hxx16
-rw-r--r--sw/source/ui/vba/vbabookmark.hxx14
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx16
-rw-r--r--sw/source/ui/vba/vbabookmarks.hxx22
-rw-r--r--sw/source/ui/vba/vbaborders.cxx20
-rw-r--r--sw/source/ui/vba/vbaborders.hxx16
-rw-r--r--sw/source/ui/vba/vbacell.hxx20
-rw-r--r--sw/source/ui/vba/vbacells.cxx14
-rw-r--r--sw/source/ui/vba/vbacells.hxx26
-rw-r--r--sw/source/ui/vba/vbacolumn.hxx10
-rw-r--r--sw/source/ui/vba/vbacolumns.cxx4
-rw-r--r--sw/source/ui/vba/vbacolumns.hxx20
-rw-r--r--sw/source/ui/vba/vbadialog.hxx6
-rw-r--r--sw/source/ui/vba/vbadialogs.hxx6
-rw-r--r--sw/source/ui/vba/vbadocument.hxx84
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx90
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.hxx16
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx2
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx16
-rw-r--r--sw/source/ui/vba/vbaeventshelper.hxx8
-rw-r--r--sw/source/ui/vba/vbafield.cxx14
-rw-r--r--sw/source/ui/vba/vbafield.hxx20
-rw-r--r--sw/source/ui/vba/vbafind.hxx52
-rw-r--r--sw/source/ui/vba/vbafont.hxx24
-rw-r--r--sw/source/ui/vba/vbaformfields.hxx10
-rw-r--r--sw/source/ui/vba/vbaframe.hxx6
-rw-r--r--sw/source/ui/vba/vbaframes.cxx4
-rw-r--r--sw/source/ui/vba/vbaframes.hxx10
-rw-r--r--sw/source/ui/vba/vbaglobals.hxx30
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.hxx14
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.cxx12
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.hxx14
-rw-r--r--sw/source/ui/vba/vbalistformat.hxx8
-rw-r--r--sw/source/ui/vba/vbalistgalleries.cxx4
-rw-r--r--sw/source/ui/vba/vbalistgalleries.hxx14
-rw-r--r--sw/source/ui/vba/vbalistgallery.hxx6
-rw-r--r--sw/source/ui/vba/vbalistlevel.hxx50
-rw-r--r--sw/source/ui/vba/vbalistlevels.cxx4
-rw-r--r--sw/source/ui/vba/vbalistlevels.hxx14
-rw-r--r--sw/source/ui/vba/vbalisttemplate.hxx6
-rw-r--r--sw/source/ui/vba/vbalisttemplates.cxx4
-rw-r--r--sw/source/ui/vba/vbalisttemplates.hxx14
-rw-r--r--sw/source/ui/vba/vbaoptions.hxx62
-rw-r--r--sw/source/ui/vba/vbapagesetup.hxx24
-rw-r--r--sw/source/ui/vba/vbapalette.cxx8
-rw-r--r--sw/source/ui/vba/vbapane.hxx8
-rw-r--r--sw/source/ui/vba/vbapanes.cxx12
-rw-r--r--sw/source/ui/vba/vbapanes.hxx10
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx10
-rw-r--r--sw/source/ui/vba/vbaparagraph.hxx20
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx68
-rw-r--r--sw/source/ui/vba/vbarange.hxx54
-rw-r--r--sw/source/ui/vba/vbareplacement.hxx10
-rw-r--r--sw/source/ui/vba/vbarevision.hxx8
-rw-r--r--sw/source/ui/vba/vbarevisions.cxx16
-rw-r--r--sw/source/ui/vba/vbarevisions.hxx14
-rw-r--r--sw/source/ui/vba/vbarow.hxx16
-rw-r--r--sw/source/ui/vba/vbarows.cxx4
-rw-r--r--sw/source/ui/vba/vbarows.hxx32
-rw-r--r--sw/source/ui/vba/vbasection.hxx14
-rw-r--r--sw/source/ui/vba/vbasections.cxx16
-rw-r--r--sw/source/ui/vba/vbasections.hxx12
-rw-r--r--sw/source/ui/vba/vbaselection.hxx100
-rw-r--r--sw/source/ui/vba/vbastyle.hxx38
-rw-r--r--sw/source/ui/vba/vbastyles.cxx20
-rw-r--r--sw/source/ui/vba/vbastyles.hxx12
-rw-r--r--sw/source/ui/vba/vbasystem.hxx14
-rw-r--r--sw/source/ui/vba/vbatable.hxx18
-rw-r--r--sw/source/ui/vba/vbatableofcontents.hxx24
-rw-r--r--sw/source/ui/vba/vbatables.cxx18
-rw-r--r--sw/source/ui/vba/vbatables.hxx12
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.cxx14
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.hxx12
-rw-r--r--sw/source/ui/vba/vbatabstop.hxx4
-rw-r--r--sw/source/ui/vba/vbatabstops.cxx14
-rw-r--r--sw/source/ui/vba/vbatabstops.hxx14
-rw-r--r--sw/source/ui/vba/vbatemplate.hxx10
-rw-r--r--sw/source/ui/vba/vbavariable.hxx14
-rw-r--r--sw/source/ui/vba/vbavariables.hxx12
-rw-r--r--sw/source/ui/vba/vbaview.hxx20
-rw-r--r--sw/source/ui/vba/vbawindow.hxx20
-rw-r--r--sw/source/ui/vba/vbawrapformat.hxx30
465 files changed, 4506 insertions, 4504 deletions
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index b513c055508b..0920579e087d 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -47,45 +47,45 @@ class SwAccessibleCell : public SwAccessibleContext,
protected:
// Set states for getAccessibleStateSet.
// This drived class additionally sets SELECTABLE(1) and SELECTED(+)
- virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
+ virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
- virtual void _InvalidateCursorPos();
+ virtual void _InvalidateCursorPos() SAL_OVERRIDE;
virtual ~SwAccessibleCell();
public:
SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm );
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object
// XAccessibleContext
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void Dispose( sal_Bool bRecursive = sal_False );
+ virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
- virtual void InvalidatePosOrSize( const SwRect& rFrm );
+ virtual void InvalidatePosOrSize( const SwRect& rFrm ) SAL_OVERRIDE;
// XInterface
@@ -95,68 +95,68 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw ()
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw ()
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleValue
//===== XAccessibleExtendedAttributes ================================================
::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
private:
SwFrmFmt* GetTblBoxFormat() const;
public:
virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setCurrentValue(
const ::com::sun::star::uno::Any& aNumber )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleComponent ============================================
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleSelection ============================================
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 0165b438da57..0e3201ee6532 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -204,123 +204,123 @@ public:
// Return the XAccessibleContext.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
- getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception);
+ getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleContext
// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException, std::exception);
+ ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE;
// Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleParent (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return this objects index among the parents children.
virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return this object's role.
virtual sal_Int16 SAL_CALL
getAccessibleRole (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return NULL to indicate that an empty relation set.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return the parents locale or throw exception if this object has no
parent yet/anymore. */
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale (void)
- throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleEventBroadcaster
virtual void SAL_CALL addAccessibleEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeAccessibleEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint(
const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL grabFocus()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getForeground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// thread safe C++ interface
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 07481af9b194..e1559e5b9ea7 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -55,51 +55,51 @@ public:
// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException, std::exception);
+ ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE;
// Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleParent (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return this objects index among the parents children.
virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return this object's description.
virtual OUString SAL_CALL
- getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception);
+ getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint(
const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
/**
@@ -117,7 +117,7 @@ class SwAccessibleDocument : public SwAccessibleDocumentBase,
protected:
// Set states for getAccessibleStateSet.
// This drived class additinaly sets MULTISELECTABLE(1)
- virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
+ virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
virtual ~SwAccessibleDocument();
@@ -127,27 +127,27 @@ public:
DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
//===== XEventListener====================================================
virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Event )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInterface
@@ -157,65 +157,65 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw ()
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw ()
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// index has to be treated as global child index.
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
// thread safe C++ interface
// The object is not visible an longer and should be destroyed
- virtual void Dispose( sal_Bool bRecursive = sal_False );
+ virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
// XAccessibleComponent
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleGetAccFlowTo
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index 4d21c981dd94..7a23512d3c53 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -39,40 +39,40 @@ public:
virtual com::sun::star::uno::Any SAL_CALL
queryInterface (const com::sun::star::uno::Type & rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
acquire (void)
- throw ();
+ throw () SAL_OVERRIDE;
virtual void SAL_CALL
release (void)
- throw ();
+ throw () SAL_OVERRIDE;
// XServiceInfo
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleExtendedAttributes
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
};
#endif
diff --git a/sw/source/core/access/accfield.hxx b/sw/source/core/access/accfield.hxx
index 2c11371ee659..fdc10f2189eb 100644
--- a/sw/source/core/access/accfield.hxx
+++ b/sw/source/core/access/accfield.hxx
@@ -65,103 +65,103 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw () ;
- virtual void SAL_CALL release( ) throw () ;
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE ;
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE ;
public:
//===== XAccessible =====================================================
/// Return the XAccessibleContext.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
- getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception);
+ getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException, std::exception);
+ ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE;
/// Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleParent (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return this objects index among the parents children.
virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return this object's role.
virtual sal_Int16 SAL_CALL
getAccessibleRole (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return NULL to indicate that an empty relation set.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return the parents locale or throw exception if this object has no
parent yet/anymore.
*/
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale (void)
- throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleComponent ============================================
virtual sal_Bool SAL_CALL containsPoint(
const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL grabFocus()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getForeground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL
getBoundsImpl(sal_Bool bRelative)
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index 5e22361eba9c..e6cd36b938d4 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -41,28 +41,28 @@ public:
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static sal_Bool IsEndnote( const SwFtnFrm *pFrm );
};
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index d73b3de0ac47..a43aed8c987a 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -36,29 +36,29 @@ protected:
// Set states for getAccessibleStateSet.
// This drived class additionally sets SELECTABLE(1), SELECTED(+),
// FOCUSABLE(1) and FOCUSED(+)
- virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
+ virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
SwFlyFrm* getFlyFrm() const;
sal_Bool GetSelectedState( );
SwPaM* GetCrsr();
- virtual void _InvalidateCursorPos();
- virtual void _InvalidateFocus();
+ virtual void _InvalidateCursorPos() SAL_OVERRIDE;
+ virtual void _InvalidateFocus() SAL_OVERRIDE;
virtual ~SwAccessibleFrameBase();
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwAccessibleFrameBase( SwAccessibleMap* pInitMap,
sal_Int16 nInitRole,
const SwFlyFrm *pFlyFrm );
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object
static sal_uInt8 GetNodeType( const SwFlyFrm *pFlyFrm );
// The object is not visible an longer and should be destroyed
- virtual void Dispose( sal_Bool bRecursive = sal_False );
- virtual sal_Bool SetSelectedState( sal_Bool bSeleted );
+ virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
+ virtual sal_Bool SetSelectedState( sal_Bool bSeleted ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index c042bf29cf1f..b986b250d222 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -36,23 +36,23 @@ public:
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return this object's role.
- virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 5395e68faae9..b0a53e6eea15 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -41,31 +41,31 @@ public:
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleComponent ============================================
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index b5ea3952b207..c7e62e896734 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -49,35 +49,35 @@ class SwAccessibleHyperlink :
public:
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getAccessibleActionDescription(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL
getAccessibleActionKeyBinding( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleHyperlink
virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getStartIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getEndIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isValid( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 423e9265ef7e..0cdde33b8405 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -115,10 +115,10 @@ protected:
public:
SwDrawModellListener_Impl( SdrModel *pDrawModel );
- virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception);
- virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception);
+ virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
void Dispose();
};
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index ff7a02847ffb..d4c961a8c10c 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -49,7 +49,7 @@ protected:
const SwNoTxtNode *GetNoTxtNode() const;
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwAccessibleNoTextFrame( SwAccessibleMap* pInitMap,
@@ -61,12 +61,12 @@ public:
// #i73249# - Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInterface methods need to be implemented to disambiguate
// between those inherited through SwAcessibleContext and
@@ -74,62 +74,62 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw ()
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw ()
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleImage
virtual OUString SAL_CALL
getAccessibleImageDescription( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL
getAccessibleImageHeight( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL
getAccessibleImageWidth( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// The object is not visible an longer and should be destroyed
- virtual void Dispose( sal_Bool bRecursive = sal_False );
-
- virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);//Shen Zhen Jie changed sal_Unicode to sal_uInt32
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
+
+ virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;//Shen Zhen Jie changed sal_Unicode to sal_uInt32
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleHypertext ============================================
virtual sal_Int32 SAL_CALL getHyperLinkCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleHyperlink >
SAL_CALL getHyperLink( sal_Int32 nLinkIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SwAccessibleMap *GetAccessibleMap(){ return GetMap();}
@@ -137,7 +137,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index b6387b63800e..7c641c4ed4a2 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -47,35 +47,35 @@ public:
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL
getAccessibleActionKeyBinding( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleHyperlink
virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getStartIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getEndIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isValid( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index 452bad4bd506..56cb0c7a9014 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -44,10 +44,10 @@ protected:
// Set states for getAccessibleStateSet.
// This drived class additionally sets
// FOCUSABLE(1) and FOCUSED(+)
- virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
+ virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
- virtual void _InvalidateCursorPos();
- virtual void _InvalidateFocus();
+ virtual void _InvalidateCursorPos() SAL_OVERRIDE;
+ virtual void _InvalidateFocus() SAL_OVERRIDE;
virtual ~SwAccessiblePage();
@@ -59,23 +59,23 @@ public:
// XAccessibleContext methods that need to be overridden
virtual OUString SAL_CALL getAccessibleDescription (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService (
const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object
};
#endif
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 0c7b3dc2f5d3..c9fb45e609b7 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -170,12 +170,12 @@ protected:
// Set states for getAccessibleStateSet.
// This drived class additinaly sets MULTILINE(1), MULTISELECTABLE(+),
// FOCUSABLE(+) and FOCUSED(+)
- virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
+ virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
- virtual void _InvalidateContent( sal_Bool bVisibleDataFired );
+ virtual void _InvalidateContent( sal_Bool bVisibleDataFired ) SAL_OVERRIDE;
- virtual void _InvalidateCursorPos();
- virtual void _InvalidateFocus();
+ virtual void _InvalidateCursorPos() SAL_OVERRIDE;
+ virtual void _InvalidateFocus() SAL_OVERRIDE;
virtual ~SwAccessibleParagraph();
@@ -235,7 +235,7 @@ protected:
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) SAL_OVERRIDE;
public:
@@ -244,57 +244,57 @@ public:
inline operator ::com::sun::star::accessibility::XAccessibleText *();
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex );
- virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleContext
// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return the parents locale or throw exception if this object has no
// parent yet/anymore.
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale (void)
- throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleComponent
virtual void SAL_CALL grabFocus()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// #i71385#
virtual sal_Int32 SAL_CALL getForeground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInterface
@@ -304,140 +304,140 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw ()
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw ()
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleText
virtual sal_Int32 SAL_CALL getCaretPosition()
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getSelectedText( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectionStart()
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectionEnd()
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleEditableText
- virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// index has to be treated as global child index.
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XAccessibleHypertext
virtual sal_Int32 SAL_CALL getHyperLinkCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleHyperlink >
SAL_CALL getHyperLink( sal_Int32 nLinkIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// #i71360#
// XAccesibleTextMarkup
virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType )
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL
getTextMarkup( sal_Int32 nTextMarkupIndex,
sal_Int32 nTextMarkupType )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment > SAL_CALL
getTextMarkupAtIndex( sal_Int32 nCharIndex,
sal_Int32 nTextMarkupType )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleTextSelection
virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectedPortionCount( )
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset)
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
// XAccessibleExtendedAttributes
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
sal_Bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd);
sal_Int32 GetRealHeadingLevel();
// XAccessibleComponent
@@ -447,24 +447,24 @@ public:
// XAccessibleMultiLineText
virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL
getTextAtLineNumber( sal_Int32 nLineNo )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL
getTextAtLineWithCaret()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// #i63870#
// XAccesibleTextAttributes
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *()
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index c550ff1ac502..8ec578128279 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -97,13 +97,13 @@ public:
virtual ~SwAccessiblePortionData();
// SwPortionHandler methods
- virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0);
- virtual void Special(sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0);
- virtual void LineBreak(KSHORT nWidth);
- virtual void Skip(sal_uInt16 nLength);
- virtual void Finish();
+ virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
+ virtual void Special(sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
+ virtual void LineBreak(KSHORT nWidth) SAL_OVERRIDE;
+ virtual void Skip(sal_uInt16 nLength) SAL_OVERRIDE;
+ virtual void Finish() SAL_OVERRIDE;
- virtual void SetAttrFieldType( sal_uInt16 nAttrFldType );
+ virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE;
sal_Bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
sal_Bool IsIndexInFootnode(sal_Int32 nIndex);
sal_Bool IsInGrayPortion( sal_Int32 nPos );
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index b2f9d3171f62..dda722e50d5c 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -43,27 +43,27 @@ public:
*/
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//====== XTypeProvider ====================================================
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception);
- OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void _InvalidateFocus();
+ OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void _InvalidateFocus() SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 4a973a00d2bd..e092c50c7cfc 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -585,7 +585,7 @@ public:
inline sal_Bool IsSelected() const { return bSelected; }
- virtual void Unselect( sal_Int32, sal_Int32 );
+ virtual void Unselect( sal_Int32, sal_Int32 ) SAL_OVERRIDE;
};
inline SwAccSingleTableSelHander_Impl::SwAccSingleTableSelHander_Impl() :
@@ -609,7 +609,7 @@ public:
uno::Sequence < sal_Int32 > GetSelSequence();
- virtual void Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt );
+ virtual void Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt ) SAL_OVERRIDE;
virtual ~SwAccAllTableSelHander_Impl();
};
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index f70e15c54ace..45db34cd2044 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -59,7 +59,7 @@ class SwAccessibleTable :
protected:
// Set states for getAccessibleStateSet.
// This drived class additinaly sets MULTISELECTABLE(+)
- virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
+ virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
virtual ~SwAccessibleTable();
@@ -83,7 +83,7 @@ protected:
// Is table data evailable?
sal_Bool HasTableData() const { return (mpTableData != 0); }
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrm* pTableFrm );
@@ -96,176 +96,176 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw ()
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw ()
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::release(); };
//====== XTypeProvider ====================================================
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleContext ==============================================
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleTable ================================================
virtual sal_Int32 SAL_CALL getAccessibleRowCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAccessibleColumnCount( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getAccessibleRowDescription(
sal_Int32 nRow )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getAccessibleColumnDescription(
sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt(
sal_Int32 nRow, sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt(
sal_Int32 nRow, sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleTable >
SAL_CALL getAccessibleRowHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleTable >
SAL_CALL getAccessibleColumnHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
getSelectedAccessibleRows( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
getSelectedAccessibleColumns( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleCaption( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleSummary( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleSelected(
sal_Int32 nRow, sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAccessibleIndex(
sal_Int32 nRow, sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleTableSelection ============================================
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
//===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
*/
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== C++ interface ======================================================
// The object has been moved by the layout
- virtual void InvalidatePosOrSize( const SwRect& rOldBox );
+ virtual void InvalidatePosOrSize( const SwRect& rOldBox ) SAL_OVERRIDE;
// The object is not visible an longer and should be destroyed
- virtual void Dispose( sal_Bool bRecursive = sal_False );
+ virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj,
- sal_Bool bRecursive );
+ sal_Bool bRecursive ) SAL_OVERRIDE;
virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj,
- const SwRect& rFrm );
+ const SwRect& rFrm ) SAL_OVERRIDE;
//===== XAccessibleSelection ============================================
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// index has to be treated as global child index.
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//===== XAccessibleComponent ============================================
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
typedef std::vector<const SwAccessibleContext*> VEC_CELL;
VEC_CELL m_vecCellAdd;
VEC_CELL m_vecCellRemove;
@@ -287,8 +287,8 @@ protected:
virtual ~SwAccessibleTableColHeaders()
{}
- virtual SwAccessibleTableData_Impl* CreateNewTableData();
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual SwAccessibleTableData_Impl* CreateNewTableData() SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwAccessibleTableColHeaders( SwAccessibleMap *pMap, const SwTabFrm *pTabFrm );
@@ -297,36 +297,36 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw ()
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw ()
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE
{ SwAccessibleContext::release(); };
//===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException, std::exception);
+ ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE;
//===== XAccessibleTable ================================================
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleTable >
SAL_CALL getAccessibleRowHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleTable >
SAL_CALL getAccessibleColumnHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XServiceInfo ====================================================
@@ -334,7 +334,7 @@ public:
*/
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index 580ccadc7e98..20e621fece53 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -40,56 +40,56 @@ private:
protected:
virtual ~SwAccessibleTextFrame();
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm& rFlyFrm );
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL acquire() throw ();
- virtual void SAL_CALL release() throw ();
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
+ virtual void SAL_CALL release() throw () SAL_OVERRIDE;
//===== XAccessibleSelection ============================================
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//===== XAccessibleContext ==============================================
// #i73249# - Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XServiceInfo ====================================================
@@ -97,23 +97,23 @@ public:
*/
virtual OUString SAL_CALL
getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//====== XTypeProvider ====================================================
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//===== XAccessibleContext::getAccessibleRelationSet ====================
@@ -131,7 +131,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx
index 9c7f44359041..992d29b673c7 100644
--- a/sw/source/core/crsr/BlockCursor.cxx
+++ b/sw/source/core/crsr/BlockCursor.cxx
@@ -35,12 +35,12 @@ class SwBlockCursor : public IBlockCursor
public:
SwBlockCursor( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ) :
aCursor( rCrsrSh, rPos ), pStartPt(0), pEndPt(0) {}
- virtual SwShellCrsr& getShellCrsr();
- virtual void setStartPoint( const Point &rPt );
- virtual void setEndPoint( const Point &rPt );
- virtual const Point* getStartPoint() const;
- virtual const Point* getEndPoint() const;
- virtual void clearPoints();
+ virtual SwShellCrsr& getShellCrsr() SAL_OVERRIDE;
+ virtual void setStartPoint( const Point &rPt ) SAL_OVERRIDE;
+ virtual void setEndPoint( const Point &rPt ) SAL_OVERRIDE;
+ virtual const Point* getStartPoint() const SAL_OVERRIDE;
+ virtual const Point* getEndPoint() const SAL_OVERRIDE;
+ virtual void clearPoints() SAL_OVERRIDE;
virtual ~SwBlockCursor();
};
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 963d929b2460..5ad51819ee66 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1065,8 +1065,8 @@ struct SwFindParaAttr : public SwFindParas
virtual ~SwFindParaAttr() { delete pSTxt; }
- virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly );
- virtual bool IsReplaceMode() const;
+ virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE;
+ virtual bool IsReplaceMode() const SAL_OVERRIDE;
};
int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index 17ba627e2813..5cd0cc2f8cae 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -36,8 +36,8 @@ struct SwFindParaFmtColl : public SwFindParas
: pFmtColl( &rFmtColl ), pReplColl( pRpColl ), rCursor( rCrsr )
{}
virtual ~SwFindParaFmtColl() {}
- virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly );
- virtual bool IsReplaceMode() const;
+ virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE;
+ virtual bool IsReplaceMode() const SAL_OVERRIDE;
};
int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 9b1a90793f04..b64b7749c2c1 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -549,8 +549,8 @@ struct SwFindParaText : public SwFindParas
SwFindParaText( const SearchOptions& rOpt, sal_Bool bSearchNotes, int bRepl, SwCursor& rCrsr )
: rSearchOpt( rOpt ), rCursor( rCrsr ), aSTxt( rOpt ), bReplace( 0 != bRepl ), bSearchInNotes( bSearchNotes )
{}
- virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly );
- virtual bool IsReplaceMode() const;
+ virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE;
+ virtual bool IsReplaceMode() const SAL_OVERRIDE;
virtual ~SwFindParaText();
};
diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx
index d5a6e1eddf83..0779da304af1 100644
--- a/sw/source/core/crsr/overlayrangesoutline.hxx
+++ b/sw/source/core/crsr/overlayrangesoutline.hxx
@@ -34,7 +34,7 @@ namespace sw
std::vector< basegfx::B2DRange > maRanges;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayRangesOutline(
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 3bbcdf1bc2de..68950f3ece85 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -58,7 +58,7 @@ public:
static sal_uLong GetElementCount() {return nSwAutoCompleteClientCount;}
#endif
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
typedef std::vector<SwAutoCompleteClient> SwAutoCompleteClientVector;
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index d36b16c0b616..55cf11d4ec1c 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -206,9 +206,9 @@ public:
LineArrayComparator( const CompareData &rD1, const CompareData &rD2,
int nStt1, int nEnd1, int nStt2, int nEnd2 );
- virtual bool Compare( int nIdx1, int nIdx2 ) const;
- virtual int GetLen1() const { return nLen1; }
- virtual int GetLen2() const { return nLen2; }
+ virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
+ virtual int GetLen1() const SAL_OVERRIDE { return nLen1; }
+ virtual int GetLen2() const SAL_OVERRIDE { return nLen2; }
};
class WordArrayComparator : public ArrayComparator
@@ -224,9 +224,9 @@ public:
WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 );
~WordArrayComparator();
- virtual bool Compare( int nIdx1, int nIdx2 ) const;
- virtual int GetLen1() const { return nCnt1; }
- virtual int GetLen2() const { return nCnt2; }
+ virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
+ virtual int GetLen1() const SAL_OVERRIDE { return nCnt1; }
+ virtual int GetLen2() const SAL_OVERRIDE { return nCnt2; }
int GetCharSequence( const int *pWordLcs1, const int *pWordLcs2,
int *pSubseq1, int *pSubseq2, int nLcsLen );
};
@@ -242,9 +242,9 @@ public:
{
}
- virtual bool Compare( int nIdx1, int nIdx2 ) const;
- virtual int GetLen1() const { return pTxtNd1->GetTxt().getLength(); }
- virtual int GetLen2() const { return pTxtNd2->GetTxt().getLength(); }
+ virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
+ virtual int GetLen1() const SAL_OVERRIDE { return pTxtNd1->GetTxt().getLength(); }
+ virtual int GetLen2() const SAL_OVERRIDE { return pTxtNd2->GetTxt().getLength(); }
};
/// Options set in Tools->Options->Writer->Comparison
@@ -952,8 +952,8 @@ public:
SwCompareLine( const SwNode& rNd );
virtual ~SwCompareLine();
- virtual sal_uLong GetHashValue() const;
- virtual bool Compare( const CompareLine& rLine ) const;
+ virtual sal_uLong GetHashValue() const SAL_OVERRIDE;
+ virtual bool Compare( const CompareLine& rLine ) const SAL_OVERRIDE;
static sal_uLong GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal );
static bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd );
@@ -979,14 +979,14 @@ class SwCompareData : public CompareData
sal_uLong PrevIdx( const SwNode* pNd );
sal_uLong NextIdx( const SwNode* pNd );
- virtual void CheckRanges( CompareData& );
- virtual void ShowInsert( sal_uLong nStt, sal_uLong nEnd );
+ virtual void CheckRanges( CompareData& ) SAL_OVERRIDE;
+ virtual void ShowInsert( sal_uLong nStt, sal_uLong nEnd ) SAL_OVERRIDE;
virtual void ShowDelete( const CompareData& rData, sal_uLong nStt,
- sal_uLong nEnd, sal_uLong nInsPos );
+ sal_uLong nEnd, sal_uLong nInsPos ) SAL_OVERRIDE;
virtual void CheckForChangesInLine( const CompareData& rData,
sal_uLong& nStt, sal_uLong& nEnd,
- sal_uLong& nThisStt, sal_uLong& nThisEnd );
+ sal_uLong& nThisStt, sal_uLong& nThisEnd ) SAL_OVERRIDE;
public:
SwCompareData( SwDoc& rD ) : rDoc( rD ), pInsRing(0), pDelRing(0) {}
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 89163eb48c55..5fc09774342c 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1110,8 +1110,8 @@ namespace numfunc
void InitFont();
/** catches notification about changed default bullet configuration data */
- virtual void Notify( const uno::Sequence<OUString>& aPropertyNames );
- virtual void Commit();
+ virtual void Notify( const uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Commit() SAL_OVERRIDE;
// default bullet list configuration data
OUString msFontname;
@@ -1325,8 +1325,8 @@ namespace numfunc
void LoadConfig();
/** catches notification about changed configuration data */
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames );
- virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Commit() SAL_OVERRIDE;
// configuration data
sal_Bool mbChangeIndentOnTabAtFirstPosOfFirstListItem;
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index 0ad79d78649c..cbca9bdb4bd0 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -72,14 +72,14 @@ public:
{}
virtual ~SwStyleManager();
virtual StylePool::SfxItemSet_Pointer_t getAutomaticStyle( const SfxItemSet& rSet,
- IStyleAccess::SwAutoStyleFamily eFamily );
+ IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE;
virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName,
- IStyleAccess::SwAutoStyleFamily eFamily );
+ IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE;
virtual void getAllStyles( std::vector<StylePool::SfxItemSet_Pointer_t> &rStyles,
- IStyleAccess::SwAutoStyleFamily eFamily );
+ IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE;
virtual StylePool::SfxItemSet_Pointer_t cacheAutomaticStyle( const SfxItemSet& rSet,
- SwAutoStyleFamily eFamily );
- virtual void clearCaches();
+ SwAutoStyleFamily eFamily ) SAL_OVERRIDE;
+ virtual void clearCaches() SAL_OVERRIDE;
};
IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems )
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index fe706ae8767a..cac64f2f357c 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -35,7 +35,7 @@ public:
~CancellableJob() {}
// ::com::sun::star::util::XCancellable:
- virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
CancellableJob( CancellableJob& ); // not defined
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 451c5b104474..746059d4545b 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -56,7 +56,7 @@ class CancelJobsThread : public osl::Thread
css::uno::Reference< css::util::XCancellable > getNextJob();
bool stopped() const;
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
mutable osl::Mutex maMutex;
std::list< css::uno::Reference< css::util::XCancellable > > maJobs;
@@ -161,8 +161,8 @@ class TerminateOfficeThread : public osl::Thread
void StopOfficeTermination();
private:
- virtual void SAL_CALL run();
- virtual void SAL_CALL onTerminated();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
+ virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
bool OfficeTerminationStopped();
void PerformOfficeTermination();
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 1104a073c7f3..499fe8a4d353 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -71,13 +71,13 @@ public:
rSectFmt( rFmt )
{}
- virtual void Closed();
+ virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
- virtual const SwNode* GetAnchor() const;
+ virtual const SwNode* GetAnchor() const SAL_OVERRIDE;
virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
- sal_Int32 nEnd = -1 ) const;
+ sal_Int32 nEnd = -1 ) const SAL_OVERRIDE;
inline SwSectionNode* GetSectNode()
{
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index a1714b03b419..a696fb4c8c5c 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1983,7 +1983,7 @@ namespace sdr
*
* This method will not handle included hierarchies and not check geometric visibility.
*/
- virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
+ virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
public:
VOCOfDrawVirtObj(ObjectContact& rObjectContact, ViewContact& rViewContact)
@@ -2002,7 +2002,7 @@ namespace sdr
* Always needs to return something. Default is to create a standard ViewObjectContact
* containing the given ObjectContact and *this.
*/
- virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact);
+ virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
public:
/// basic constructor, used from SdrObject.
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index d02a4c79bfee..002dbe5d909c 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -82,7 +82,7 @@ namespace sdr
*
* @note ONLY based on model data
*/
- virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const;
+ virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
public:
/// basic constructor, used from SdrObject.
@@ -152,7 +152,7 @@ namespace drawinglayer
protected:
/// method which is to be used to implement the local decomposition of a 2D primitive
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
SwVirtFlyDrawObjPrimitive(
@@ -164,12 +164,12 @@ namespace drawinglayer
{
}
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
- virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
// overloaded to allow callbacks to wrap_DoPaintObject
- virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
// data read access
const SwVirtFlyDrawObj& getSwVirtFlyDrawObj() const { return mrSwVirtFlyDrawObj; }
@@ -261,7 +261,7 @@ namespace sdr
*
* @note ONLY based on model data
*/
- virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const;
+ virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
public:
/// basic constructor, used from SdrObject.
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index eeeb492ff799..c002b04e8b1e 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -62,7 +62,7 @@ class SwSdrHdl : public SdrHdl
public:
SwSdrHdl(const Point& rPnt, bool bTopRight ) :
SdrHdl( rPnt, bTopRight ? HDL_ANCHOR_TR : HDL_ANCHOR ) {}
- virtual bool IsFocusHdl() const;
+ virtual bool IsFocusHdl() const SAL_OVERRIDE;
};
bool SwSdrHdl::IsFocusHdl() const
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index ff8956cc37e7..3aa9947058b9 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -44,13 +44,13 @@ public:
rFldType( rType )
{}
- virtual void Closed();
+ virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
- virtual const SwNode* GetAnchor() const;
+ virtual const SwNode* GetAnchor() const SAL_OVERRIDE;
virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
- sal_Int32 nEnd = -1 ) const;
+ sal_Int32 nEnd = -1 ) const SAL_OVERRIDE;
};
::sfx2::SvBaseLink::UpdateResult SwIntrnlRefLink::DataChanged( const OUString& rMimeType,
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 6c0103f01d0e..5cc02c120053 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1286,7 +1286,7 @@ namespace
{
}
- virtual bool includeObject( const SdrObject& i_rObject ) const
+ virtual bool includeObject( const SdrObject& i_rObject ) const SAL_OVERRIDE
{
return m_pPV && m_pPV->GetView().IsObjMarkable( const_cast< SdrObject* >( &i_rObject ), m_pPV );
}
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index ed4afd7b6ad9..0d9dc6f0e1cd 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -36,66 +36,66 @@ namespace sw {
public:
MarkManager(/*[in/out]*/ SwDoc& rDoc);
// IDocumentMarkAccess
- virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark);
+ virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE;
virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
const OUString& rName,
- const OUString& rType);
+ const OUString& rType) SAL_OVERRIDE;
virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM,
const OUString& rName,
- const OUString& rType);
+ const OUString& rType) SAL_OVERRIDE;
- virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark);
+ virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE;
virtual sw::mark::IMark* makeAnnotationMark(
const SwPaM& rPaM,
- const ::rtl::OUString& rName );
+ const ::rtl::OUString& rName ) SAL_OVERRIDE;
- virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM);
- virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName);
- virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset);
- virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset);
+ virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM) SAL_OVERRIDE;
+ virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) SAL_OVERRIDE;
+ virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE;
+ virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE;
- virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx);
+ virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) SAL_OVERRIDE;
// deleters
virtual ::boost::shared_ptr<ILazyDeleter>
- deleteMark(const const_iterator_t ppMark);
- virtual void deleteMark(const ::sw::mark::IMark* const pMark);
- virtual void clearAllMarks();
+ deleteMark(const const_iterator_t ppMark) SAL_OVERRIDE;
+ virtual void deleteMark(const ::sw::mark::IMark* const pMark) SAL_OVERRIDE;
+ virtual void clearAllMarks() SAL_OVERRIDE;
// marks
- virtual const_iterator_t getAllMarksBegin() const;
- virtual const_iterator_t getAllMarksEnd() const;
- virtual sal_Int32 getAllMarksCount() const;
- virtual const_iterator_t findMark(const OUString& rName) const;
+ virtual const_iterator_t getAllMarksBegin() const SAL_OVERRIDE;
+ virtual const_iterator_t getAllMarksEnd() const SAL_OVERRIDE;
+ virtual sal_Int32 getAllMarksCount() const SAL_OVERRIDE;
+ virtual const_iterator_t findMark(const OUString& rName) const SAL_OVERRIDE;
virtual bool hasMark(const OUString& rName) const;
// bookmarks
- virtual const_iterator_t getBookmarksBegin() const;
- virtual const_iterator_t getBookmarksEnd() const;
- virtual sal_Int32 getBookmarksCount() const;
- virtual const_iterator_t findBookmark(const OUString& rName) const;
+ virtual const_iterator_t getBookmarksBegin() const SAL_OVERRIDE;
+ virtual const_iterator_t getBookmarksEnd() const SAL_OVERRIDE;
+ virtual sal_Int32 getBookmarksCount() const SAL_OVERRIDE;
+ virtual const_iterator_t findBookmark(const OUString& rName) const SAL_OVERRIDE;
// Fieldmarks
- virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const;
- virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const;
- virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const;
+ virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const SAL_OVERRIDE;
+ virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const SAL_OVERRIDE;
+ virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const SAL_OVERRIDE;
void dumpAsXml(xmlTextWriterPtr w);
// Marks exclusive annotation marks
- virtual const_iterator_t getCommonMarksBegin() const;
- virtual const_iterator_t getCommonMarksEnd() const;
- virtual sal_Int32 getCommonMarksCount() const;
+ virtual const_iterator_t getCommonMarksBegin() const SAL_OVERRIDE;
+ virtual const_iterator_t getCommonMarksEnd() const SAL_OVERRIDE;
+ virtual sal_Int32 getCommonMarksCount() const SAL_OVERRIDE;
// Annotation Marks
- virtual const_iterator_t getAnnotationMarksBegin() const;
- virtual const_iterator_t getAnnotationMarksEnd() const;
- virtual sal_Int32 getAnnotationMarksCount() const;
- virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const;
+ virtual const_iterator_t getAnnotationMarksBegin() const SAL_OVERRIDE;
+ virtual const_iterator_t getAnnotationMarksEnd() const SAL_OVERRIDE;
+ virtual sal_Int32 getAnnotationMarksCount() const SAL_OVERRIDE;
+ virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const SAL_OVERRIDE;
- virtual void assureSortedMarkContainers() const;
+ virtual void assureSortedMarkContainers() const SAL_OVERRIDE;
private:
// make names
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx
index 25c5991857c4..17c566b6a430 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -42,8 +42,8 @@ public:
SwGrammarMarkUp( const SwGrammarMarkUp* );
virtual ~SwGrammarMarkUp();
- virtual SwWrongList* Clone();
- virtual void CopyFrom( const SwWrongList& rCopy );
+ virtual SwWrongList* Clone() SAL_OVERRIDE;
+ virtual void CopyFrom( const SwWrongList& rCopy ) SAL_OVERRIDE;
/* SwWrongList::Move() + handling of maSentence */
void MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff );
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index 808b6b30da75..a76ed647e6e3 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -45,10 +45,10 @@ public:
SwDoc * pDoc);
virtual ~SwUndoFmtCreate();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0;
virtual void Delete() = 0;
@@ -69,10 +69,10 @@ public:
SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc);
~SwUndoFmtDelete();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0;
virtual void Delete(SwFmt * pFmt) = 0;
@@ -91,10 +91,10 @@ public:
SwDoc * pDoc);
~SwUndoRenameFmt();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- SwRewriter GetRewriter() const;
+ SwRewriter GetRewriter() const SAL_OVERRIDE;
virtual SwFmt * Find(const OUString & rName) const = 0;
};
@@ -105,9 +105,9 @@ public:
SwUndoTxtFmtCollCreate(SwTxtFmtColl * pNew, SwTxtFmtColl * pDerivedFrom,
SwDoc * pDoc);
- virtual SwFmt * Create(SwFmt * pDerivedFrom);
- virtual void Delete();
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+ virtual void Delete() SAL_OVERRIDE;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete
@@ -115,9 +115,9 @@ class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete
public:
SwUndoTxtFmtCollDelete(SwTxtFmtColl * pOld, SwDoc * pDoc);
- virtual SwFmt * Create(SwFmt * pDerivedFrom);
- virtual void Delete(SwFmt * pFmt);
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+ virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoRenameFmtColl : public SwUndoRenameFmt
@@ -127,7 +127,7 @@ public:
const OUString & sNewName,
SwDoc * pDoc);
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoCharFmtCreate : public SwUndoFmtCreate
@@ -136,9 +136,9 @@ public:
SwUndoCharFmtCreate(SwCharFmt * pNew, SwCharFmt * pDerivedFrom,
SwDoc * pDoc);
- virtual SwFmt * Create(SwFmt * pDerivedFrom);
- virtual void Delete();
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+ virtual void Delete() SAL_OVERRIDE;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoCharFmtDelete : public SwUndoFmtDelete
@@ -146,9 +146,9 @@ class SwUndoCharFmtDelete : public SwUndoFmtDelete
public:
SwUndoCharFmtDelete(SwCharFmt * pOld, SwDoc * pDoc);
- virtual SwFmt * Create(SwFmt * pDerivedFrom);
- virtual void Delete(SwFmt * pFmt);
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+ virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoRenameCharFmt : public SwUndoRenameFmt
@@ -158,7 +158,7 @@ public:
const OUString & sNewName,
SwDoc * pDoc);
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoFrmFmtCreate : public SwUndoFmtCreate
@@ -169,9 +169,9 @@ public:
SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom,
SwDoc * pDoc);
- virtual SwFmt * Create(SwFmt * pDerivedFrom);
- virtual void Delete();
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+ virtual void Delete() SAL_OVERRIDE;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoFrmFmtDelete : public SwUndoFmtDelete
@@ -179,9 +179,9 @@ class SwUndoFrmFmtDelete : public SwUndoFmtDelete
public:
SwUndoFrmFmtDelete(SwFrmFmt * pOld, SwDoc * pDoc);
- virtual SwFmt * Create(SwFmt * pDerivedFrom);
- virtual void Delete(SwFmt * pFmt);
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+ virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoRenameFrmFmt : public SwUndoRenameFmt
@@ -191,7 +191,7 @@ public:
const OUString & sNewName,
SwDoc * pDoc);
- virtual SwFmt * Find(const OUString & rName) const;
+ virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
};
class SwUndoNumruleCreate : public SwUndo
@@ -204,10 +204,10 @@ class SwUndoNumruleCreate : public SwUndo
public:
SwUndoNumruleCreate(const SwNumRule * pNew, SwDoc * pDoc);
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- SwRewriter GetRewriter() const;
+ SwRewriter GetRewriter() const SAL_OVERRIDE;
};
class SwUndoNumruleDelete : public SwUndo
@@ -218,10 +218,10 @@ class SwUndoNumruleDelete : public SwUndo
public:
SwUndoNumruleDelete(const SwNumRule & aRule, SwDoc * pDoc);
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- SwRewriter GetRewriter() const;
+ SwRewriter GetRewriter() const SAL_OVERRIDE;
};
class SwUndoNumruleRename : public SwUndo
@@ -233,10 +233,10 @@ class SwUndoNumruleRename : public SwUndo
SwUndoNumruleRename(const OUString & aOldName, const OUString & aNewName,
SwDoc * pDoc);
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- SwRewriter GetRewriter() const;
+ SwRewriter GetRewriter() const SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX
diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx b/sw/source/core/inc/SwUndoPageDesc.hxx
index 6efaf6d32b56..a8c7c13668a6 100644
--- a/sw/source/core/inc/SwUndoPageDesc.hxx
+++ b/sw/source/core/inc/SwUndoPageDesc.hxx
@@ -40,10 +40,10 @@ public:
SwDoc * pDoc);
virtual ~SwUndoPageDesc();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
};
class SwUndoPageDescCreate : public SwUndo
@@ -58,11 +58,11 @@ public:
SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc);
virtual ~SwUndoPageDescCreate();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
};
class SwUndoPageDescDelete : public SwUndo
@@ -76,11 +76,11 @@ public:
SwUndoPageDescDelete(const SwPageDesc & aOld, SwDoc * pDoc);
virtual ~SwUndoPageDescDelete();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
};
#endif // _SW_UNDO_PAGE_DESC_CHANGE_HXX
diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx
index 08cc3e15c852..ed6aeca07608 100644
--- a/sw/source/core/inc/SwUndoTOXChange.hxx
+++ b/sw/source/core/inc/SwUndoTOXChange.hxx
@@ -34,9 +34,9 @@ public:
SwUndoTOXChange(SwTOXBase * pTOX, const SwTOXBase & rNew);
virtual ~SwUndoTOXChange();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index c3901088273b..ff62ced64fd8 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -37,10 +37,10 @@ public:
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
virtual ~SwXMLBlockListExport ( void ) {}
- sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass);
- void _ExportAutoStyles() {}
- void _ExportMasterStyles () {}
- void _ExportContent() {}
+ sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
+ void _ExportAutoStyles() SAL_OVERRIDE {}
+ void _ExportMasterStyles () SAL_OVERRIDE {}
+ void _ExportContent() SAL_OVERRIDE {}
};
class SwXMLTextBlockExport : public SvXMLExport
@@ -56,11 +56,11 @@ public:
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
virtual ~SwXMLTextBlockExport ( void ) {}
- sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) {return 0;}
+ sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) SAL_OVERRIDE {return 0;}
sal_uInt32 exportDoc(const OUString & rText);
- void _ExportAutoStyles() {}
- void _ExportMasterStyles () {}
- void _ExportContent() {}
+ void _ExportAutoStyles() SAL_OVERRIDE {}
+ void _ExportMasterStyles () SAL_OVERRIDE {}
+ void _ExportContent() SAL_OVERRIDE {}
};
#endif
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 81801c413ea3..726db195a613 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -34,7 +34,7 @@ protected:
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
public:
SwXMLBlockListImport(
@@ -60,7 +60,7 @@ protected:
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
public:
sal_Bool bTextOnly;
@@ -76,7 +76,7 @@ public:
virtual ~SwXMLTextBlockImport ( void )
throw();
virtual void SAL_CALL endDocument(void)
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx
index 52605b31dda1..6577c81c80b1 100644
--- a/sw/source/core/inc/SwXMLBlockListContext.hxx
+++ b/sw/source/core/inc/SwXMLBlockListContext.hxx
@@ -40,7 +40,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
};
@@ -69,7 +69,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
~SwXMLTextBlockDocumentContext ( void );
};
@@ -87,7 +87,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
~SwXMLTextBlockBodyContext ( void );
};
@@ -105,7 +105,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
~SwXMLTextBlockTextContext ( void );
};
@@ -120,7 +120,7 @@ public:
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
- virtual void Characters( const OUString& rChars );
+ virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
~SwXMLTextBlockParContext ( void );
};
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 5afd8f1b4d08..df3c20ffa9fa 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -54,41 +54,41 @@ public:
SwXMLTextBlocks( const OUString& rFile );
SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile );
void AddName( const OUString&, const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False );
- virtual void AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False );
+ virtual void AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ) SAL_OVERRIDE;
OUString GeneratePackageName ( const OUString& rShort );
virtual ~SwXMLTextBlocks();
//virtual sal_Bool IsOld() const;
- virtual sal_uLong Delete( sal_uInt16 );
- virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& );
- virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong);
- virtual void ClearDoc();
- virtual sal_uLong GetDoc( sal_uInt16 );
- virtual sal_uLong BeginPutDoc( const OUString&, const OUString& );
- virtual sal_uLong PutDoc();
- virtual sal_uLong GetText( sal_uInt16, OUString& );
- virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& );
- virtual sal_uLong MakeBlockList();
-
- virtual short GetFileType ( void ) const;
- virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True );
- virtual void CloseFile();
+ virtual sal_uLong Delete( sal_uInt16 ) SAL_OVERRIDE;
+ virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ) SAL_OVERRIDE;
+ virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong) SAL_OVERRIDE;
+ virtual void ClearDoc() SAL_OVERRIDE;
+ virtual sal_uLong GetDoc( sal_uInt16 ) SAL_OVERRIDE;
+ virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) SAL_OVERRIDE;
+ virtual sal_uLong PutDoc() SAL_OVERRIDE;
+ virtual sal_uLong GetText( sal_uInt16, OUString& ) SAL_OVERRIDE;
+ virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) SAL_OVERRIDE;
+ virtual sal_uLong MakeBlockList() SAL_OVERRIDE;
+
+ virtual short GetFileType ( void ) const SAL_OVERRIDE;
+ virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ) SAL_OVERRIDE;
+ virtual void CloseFile() SAL_OVERRIDE;
static sal_Bool IsFileUCBStorage( const OUString & rFileName);
// Methods for the new Autocorrecter
sal_uLong GetText( const OUString& rShort, OUString& );
- virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const;
+ virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE;
virtual sal_Bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
virtual void SetIsTextOnly( const OUString& rShort, sal_Bool bNewValue );
virtual void SetIsTextOnly( sal_uInt16 nIdx, sal_Bool bNewValue );
virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl,
- sal_Bool bFileAlreadyOpen = sal_False );
+ sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE;
virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
const SvxMacroTableDtor& rMacroTable,
- sal_Bool bFileAlreadyOpen = sal_False );
- virtual sal_Bool PutMuchEntries( sal_Bool bOn );
+ sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE;
+ virtual sal_Bool PutMuchEntries( sal_Bool bOn ) SAL_OVERRIDE;
public:
SwDoc* GetDoc() const { return pDoc; }
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 4aeb9161e0f6..c70565a7cd19 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -43,34 +43,34 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertyState
virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index e2336e9860d2..f55513fe75f1 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -52,9 +52,9 @@ public:
virtual ~SwUndoAttr();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SaveRedlineData( const SwPaM& rPam, sal_Bool bInsCntnt );
@@ -75,9 +75,9 @@ public:
virtual ~SwUndoResetAttr();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SetAttrs( const std::set<sal_uInt16> &rAttrs );
@@ -121,11 +121,11 @@ public:
virtual ~SwUndoFmtAttr();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
void PutAttr( const SfxPoolItem& rItem );
SwFmt* GetFmt( SwDoc& rDoc ); // checks if it is still in the Doc!
@@ -139,8 +139,8 @@ class SwUndoFmtResetAttr : public SwUndo
const sal_uInt16 nWhichId );
~SwUndoFmtResetAttr();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
private:
// format at which a certain attribute is reset.
@@ -161,9 +161,9 @@ class SwUndoDontExpandFmt : public SwUndo
public:
SwUndoDontExpandFmt( const SwPosition& rPos );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
// helper class to receive changed attribute sets
@@ -177,7 +177,7 @@ class SwUndoFmtAttrHelper : public SwClient
public:
SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true );
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
SwUndoFmtAttr* GetUndo() const { return m_pUndo.get(); }
// release the undo object (so it is not deleted here), and return it
@@ -196,9 +196,9 @@ public:
virtual ~SwUndoMoveLeftMargin();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
SwHistory& GetHistory() { return *m_pHistory; }
@@ -217,8 +217,8 @@ public:
virtual ~SwUndoDefaultAttr();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
class SwUndoChangeFootNote : public SwUndo, private SwUndRng
@@ -235,9 +235,9 @@ public:
sal_uInt16 nNum, bool bIsEndNote );
virtual ~SwUndoChangeFootNote();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
SwHistory& GetHistory() { return *m_pHistory; }
};
@@ -253,8 +253,8 @@ public:
virtual ~SwUndoFootNoteInfo();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
class SwUndoEndNoteInfo : public SwUndo
@@ -268,8 +268,8 @@ public:
virtual ~SwUndoEndNoteInfo();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX
diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx
index e910ecba3e8c..0d2234f64825 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -55,7 +55,7 @@ public:
@return the rewriter for this undo object
*/
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
};
class SwUndoInsBookmark : public SwUndoBookmark
@@ -63,8 +63,8 @@ class SwUndoInsBookmark : public SwUndoBookmark
public:
SwUndoInsBookmark( const ::sw::mark::IMark& );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 5f85dda679b0..64b2b95fd222 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -127,9 +127,9 @@ public:
const bool bResetListAttrs );
virtual ~SwUndoFmtColl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
/**
Returns the rewriter for this undo object.
@@ -144,7 +144,7 @@ public:
@return the rewriter for this undo object
*/
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
SwHistory* GetHistory() { return pHistory; }
@@ -162,17 +162,17 @@ class SwUndoSetFlyFmt : public SwUndo, public SwClient
bool bAnchorChgd;
void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem );
- void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
void GetAnchor( SwFmtAnchor& rAnhor, sal_uLong nNode, sal_Int32 nCntnt );
public:
SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt );
virtual ~SwUndoSetFlyFmt();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
void DeRegisterFromFormat( SwFmt& );
};
@@ -183,9 +183,9 @@ class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng
public:
SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
const int nUndoStringLength = 20;
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index 7a13c427d5e9..719bd53f0cb2 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -70,9 +70,9 @@ public:
sal_Bool bCalledByTblCpy = sal_False );
virtual ~SwUndoDelete();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
/**
Returns rewriter for this undo object.
@@ -84,7 +84,7 @@ public:
@return rewriter for this undo object
*/
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
sal_Bool CanGrouping( SwDoc*, const SwPaM& );
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index b9d9c3ae063e..632fd5ec682b 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -42,10 +42,10 @@ public:
virtual ~SwSdrUndo();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual OUString GetComment() const;
+ virtual OUString GetComment() const SAL_OVERRIDE;
};
class SwUndoDrawGroup : public SwUndo
@@ -59,8 +59,8 @@ public:
virtual ~SwUndoDrawGroup();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, SdrObject* );
void SetGroupFmt( SwDrawFrmFmt* );
@@ -88,8 +88,8 @@ public:
virtual ~SwUndoDrawUnGroup();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void AddObj( sal_uInt16 nPos, SwDrawFrmFmt* );
};
@@ -104,8 +104,8 @@ public:
virtual ~SwUndoDrawUnGroupConnectToLayout();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
SdrObject* pDrawObject );
@@ -123,8 +123,8 @@ public:
virtual ~SwUndoDrawDelete();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& );
};
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 7ce1169531e7..2c4c797bfc35 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -61,9 +61,9 @@ public:
SwUndoInsert( const SwNodeIndex& rNode );
virtual ~SwUndoInsert();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
/**
Returns rewriter for this undo object.
@@ -76,7 +76,7 @@ public:
@return rewriter for this undo object
*/
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
void SetWithRsid() { m_bWithRsid = true; }
@@ -96,8 +96,8 @@ public:
virtual ~SwUndoReplace();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
/**
Returns the rewriter of this undo object.
@@ -118,7 +118,7 @@ public:
@return the rewriter of this undo object
*/
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
void SetEnd( const SwPaM& rPam );
@@ -143,8 +143,8 @@ public:
virtual ~SwUndoReRead();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
class SwUndoInsertLabel : public SwUndo
@@ -185,9 +185,9 @@ public:
const sal_Bool bCpyBrd );
virtual ~SwUndoInsertLabel();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
/**
Returns the rewriter of this undo object.
@@ -201,7 +201,7 @@ public:
@return the rewriter of this undo object
*/
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
void SetNodePos( sal_uLong nNd )
{ if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; }
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index 4514b2895668..65d3b03422c1 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -41,42 +41,42 @@ public:
IDocumentState & rState);
/** IDocumentUndoRedo */
- virtual void DoUndo(bool const bDoUndo);
- virtual bool DoesUndo() const;
- virtual void DoGroupUndo(bool const bDoUndo);
- virtual bool DoesGroupUndo() const;
- virtual void DoDrawUndo(bool const bDoUndo);
- virtual bool DoesDrawUndo() const;
- virtual void SetUndoNoModifiedPosition();
- virtual void LockUndoNoModifiedPosition();
- virtual void UnLockUndoNoModifiedPosition();
- virtual void SetUndoNoResetModified();
- virtual bool IsUndoNoResetModified() const;
+ virtual void DoUndo(bool const bDoUndo) SAL_OVERRIDE;
+ virtual bool DoesUndo() const SAL_OVERRIDE;
+ virtual void DoGroupUndo(bool const bDoUndo) SAL_OVERRIDE;
+ virtual bool DoesGroupUndo() const SAL_OVERRIDE;
+ virtual void DoDrawUndo(bool const bDoUndo) SAL_OVERRIDE;
+ virtual bool DoesDrawUndo() const SAL_OVERRIDE;
+ virtual void SetUndoNoModifiedPosition() SAL_OVERRIDE;
+ virtual void LockUndoNoModifiedPosition() SAL_OVERRIDE;
+ virtual void UnLockUndoNoModifiedPosition() SAL_OVERRIDE;
+ virtual void SetUndoNoResetModified() SAL_OVERRIDE;
+ virtual bool IsUndoNoResetModified() const SAL_OVERRIDE;
virtual SwUndoId StartUndo(SwUndoId const eUndoId,
- SwRewriter const*const pRewriter);
+ SwRewriter const*const pRewriter) SAL_OVERRIDE;
virtual SwUndoId EndUndo(SwUndoId const eUndoId,
- SwRewriter const*const pRewriter);
- virtual void DelAllUndoObj();
+ SwRewriter const*const pRewriter) SAL_OVERRIDE;
+ virtual void DelAllUndoObj() SAL_OVERRIDE;
virtual bool GetLastUndoInfo(OUString *const o_pStr,
- SwUndoId *const o_pId) const;
- virtual SwUndoComments_t GetUndoComments() const;
+ SwUndoId *const o_pId) const SAL_OVERRIDE;
+ virtual SwUndoComments_t GetUndoComments() const SAL_OVERRIDE;
virtual bool GetFirstRedoInfo(OUString *const o_pStr,
- SwUndoId *const o_pId = 0) const;
- virtual SwUndoComments_t GetRedoComments() const;
+ SwUndoId *const o_pId = 0) const SAL_OVERRIDE;
+ virtual SwUndoComments_t GetRedoComments() const SAL_OVERRIDE;
virtual bool Repeat(::sw::RepeatContext & rContext,
- sal_uInt16 const nRepeatCnt);
- virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const;
- virtual void AppendUndo(SwUndo *const pUndo);
- virtual void ClearRedo();
- virtual bool IsUndoNodes(SwNodes const& rNodes) const;
+ sal_uInt16 const nRepeatCnt) SAL_OVERRIDE;
+ virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const SAL_OVERRIDE;
+ virtual void AppendUndo(SwUndo *const pUndo) SAL_OVERRIDE;
+ virtual void ClearRedo() SAL_OVERRIDE;
+ virtual bool IsUndoNodes(SwNodes const& rNodes) const SAL_OVERRIDE;
// ::svl::IUndoManager
virtual void AddUndoAction(SfxUndoAction *pAction,
- bool bTryMerg = false);
- virtual bool Undo();
- virtual bool Redo();
- virtual void EnableUndo(bool bEnable);
+ bool bTryMerg = false) SAL_OVERRIDE;
+ virtual bool Undo() SAL_OVERRIDE;
+ virtual bool Redo() SAL_OVERRIDE;
+ virtual void EnableUndo(bool bEnable) SAL_OVERRIDE;
SwUndo * RemoveLastUndo();
SwUndo * GetLastUndo();
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index bf92ea626613..53614c4f9fe2 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -45,11 +45,11 @@ public:
virtual ~SwUndoInsNum();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
SwHistory* GetHistory(); // will be created if necessary
void SetSttNum( sal_uLong nNdIdx ) { nSttSet = nNdIdx; }
@@ -75,9 +75,9 @@ public:
virtual ~SwUndoDelNum();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void AddNode( const SwTxtNode& rNd, sal_Bool bResetLRSpace );
SwHistory* GetHistory() { return pHistory; }
@@ -91,9 +91,9 @@ class SwUndoMoveNum : public SwUndo, private SwUndRng
public:
SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv = false );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; }
};
@@ -105,9 +105,9 @@ class SwUndoNumUpDown : public SwUndo, private SwUndRng
public:
SwUndoNumUpDown( const SwPaM& rPam, short nOffset );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
class SwUndoNumOrNoNum : public SwUndo
@@ -119,9 +119,9 @@ public:
SwUndoNumOrNoNum( const SwNodeIndex& rIdx, sal_Bool mbOldNum,
sal_Bool mbNewNum );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
class SwUndoNumRuleStart : public SwUndo
@@ -135,9 +135,9 @@ public:
SwUndoNumRuleStart( const SwPosition& rPos, sal_Bool bDelete );
SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 91f9c1aa0bc3..639ee22d72f6 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -45,9 +45,9 @@ public:
virtual ~SwUndoOverwrite();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
/**
Returns the rewriter of this undo object.
@@ -60,7 +60,7 @@ public:
@return the rewriter of this undo object
*/
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
sal_Bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
};
@@ -79,9 +79,9 @@ public:
virtual ~SwUndoTransliterate();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void AddChanges( SwTxtNode& rTNd, sal_Int32 nStart, sal_Int32 nLen,
::com::sun::star::uno::Sequence <sal_Int32>& rOffsets );
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index 0a943276d98f..1b5ed47b923e 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -43,8 +43,8 @@ public:
virtual ~SwUndoRedline();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
SwUndoId GetUserId() const { return mnUserId; }
sal_uInt16 GetRedlSaveCount() const;
@@ -56,8 +56,8 @@ class SwUndoRedlineDelete : public SwUndoRedline
sal_Bool bIsDelim : 1;
sal_Bool bIsBackspace : 1;
- virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
- virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
+ virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
+ virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
public:
SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY );
@@ -75,15 +75,15 @@ class SwUndoRedlineSort : public SwUndoRedline
sal_uLong nSaveEndNode, nOffset;
sal_Int32 nSaveEndCntnt;
- virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
- virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
+ virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
+ virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
public:
SwUndoRedlineSort( const SwPaM& rRange, const SwSortOptions& rOpt );
virtual ~SwUndoRedlineSort();
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SetSaveRange( const SwPaM& rRange );
void SetOffset( const SwNodeIndex& rIdx );
@@ -92,23 +92,23 @@ public:
class SwUndoAcceptRedline : public SwUndoRedline
{
private:
- virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
+ virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
public:
SwUndoAcceptRedline( const SwPaM& rRange );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
class SwUndoRejectRedline : public SwUndoRedline
{
private:
- virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
+ virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
public:
SwUndoRejectRedline( const SwPaM& rRange );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
class SwUndoCompDoc : public SwUndo, public SwUndRng
@@ -124,8 +124,8 @@ public:
virtual ~SwUndoCompDoc();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index ea681525192f..478161cb78f8 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -52,9 +52,9 @@ public:
virtual ~SwUndoInsSection();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SetSectNdPos(sal_uLong const nPos) { m_nSectionNodePos = nPos; }
void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart);
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index 5deb7ea8a5a1..b750741bb710 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -73,9 +73,9 @@ public:
virtual ~SwUndoSort();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void Insert( const OUString& rOrgPos, const OUString& rNewPos );
void Insert( sal_uLong nOrgPos, sal_uLong nNewPos );
diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx
index 6d0027951cba..918ab0c293d2 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -37,9 +37,9 @@ public:
virtual ~SwUndoSplitNode();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SetTblFlag() { bTblFlag = sal_True; }
};
@@ -66,8 +66,8 @@ public:
SwUndoMove( const SwPaM&, const SwPosition& );
SwUndoMove( SwDoc* pDoc, const SwNodeRange&, const SwNodeIndex& );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
/// set the destination range after the move
void SetDestRange( const SwPaM&, const SwPosition&, sal_Bool, sal_Bool );
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 4d7d89bcecf9..5eff20981281 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -65,11 +65,11 @@ public:
virtual ~SwUndoInsTbl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
};
class SwUndoTxtToTbl : public SwUndo, public SwUndRng
@@ -90,9 +90,9 @@ public:
virtual ~SwUndoTxtToTbl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
SwHistory& GetHistory(); // will be created if necessary
void AddFillBox( const SwTableBox& rBox );
@@ -116,9 +116,9 @@ public:
virtual ~SwUndoTblToTxt();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SetRange( const SwNodeRange& );
void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx,
@@ -136,8 +136,8 @@ public:
virtual ~SwUndoAttrTbl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
class SwUndoTblNumFmt;
@@ -157,8 +157,8 @@ public:
virtual ~SwUndoTblAutoFmt();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void SaveBoxCntnt( const SwTableBox& rBox );
};
@@ -195,8 +195,8 @@ public:
virtual ~SwUndoTblNdsChg();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld );
void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld,
@@ -229,8 +229,8 @@ public:
virtual ~SwUndoTblMerge();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos );
@@ -262,8 +262,8 @@ public:
virtual ~SwUndoTblNumFmt();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void SetNumFmt( sal_uLong nNewNumFmtIdx, const double& rNewNumber )
{ nFmtIdx = nNewNumFmtIdx; fNum = rNewNumber; }
@@ -287,8 +287,8 @@ public:
virtual ~SwUndoTblCpyTbl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt );
void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx,
@@ -308,8 +308,8 @@ public:
virtual ~SwUndoCpyTbl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
void SetTableSttIdx( sal_uLong nIdx ) { nTblNode = nIdx; }
};
@@ -329,9 +329,9 @@ public:
virtual ~SwUndoSplitTbl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SetTblNodeOffset( sal_uLong nIdx ) { nOffset = nIdx - nTblNode; }
SwHistory* GetHistory() { return pHistory; }
@@ -353,9 +353,9 @@ public:
virtual ~SwUndoMergeTbl();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
void SaveFormula( SwHistory& rHistory );
};
@@ -369,9 +369,9 @@ class SwUndoTblHeadline : public SwUndo
public:
SwUndoTblHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16 nNewHdl );
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual void RepeatImpl( ::sw::RepeatContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index ed678567c145..f3cd2f09d63e 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -57,15 +57,15 @@ public:
SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam, sal_Unicode cIns = 0 );
~SwAutoCorrDoc();
- virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd );
- virtual bool Insert( sal_Int32 nPos, const OUString& rTxt );
- virtual bool Replace( sal_Int32 nPos, const OUString& rTxt );
- virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt );
+ virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE;
+ virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
+ virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
+ virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE;
virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId,
- SfxPoolItem& );
+ SfxPoolItem& ) SAL_OVERRIDE;
- virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL );
+ virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) SAL_OVERRIDE;
// return text of a previous paragraph
// If it does not exist or if there is nothing before, return blank.
@@ -76,15 +76,15 @@ public:
virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
SvxAutoCorrect& rACorrect,
- OUString* pPara );
+ OUString* pPara ) SAL_OVERRIDE;
// Will be called after swapping characters by the functions
// - FnCptlSttWrd and
// - FnCptlSttSntnc.
// Afterwards the words can be added into exception list if needed.
virtual void SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos,
- const OUString& rExceptWord, sal_Unicode cChar );
- virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const;
+ const OUString& rExceptWord, sal_Unicode cChar ) SAL_OVERRIDE;
+ virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const SAL_OVERRIDE;
};
class SwAutoCorrExceptWord
diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx
index 49adf05a7855..903c0516ea5e 100755..100644
--- a/sw/source/core/inc/annotationmark.hxx
+++ b/sw/source/core/inc/annotationmark.hxx
@@ -36,7 +36,7 @@ namespace sw { namespace mark
virtual ~AnnotationMark();
- virtual void InitDoc(SwDoc* const io_Doc);
+ virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE;
const SwFmtFld* GetAnnotationFmtFld() const;
};
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index 70bbcbd985f0..882a0283c6ad 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -125,7 +125,7 @@ namespace objectpositioning
<mnLineAlignment> are calculated.
calculated position is set at the given object.
*/
- virtual void CalcPosition();
+ virtual void CalcPosition() SAL_OVERRIDE;
// calculated anchored position for object position type AS_CHAR
Point GetAnchorPos() const;
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 769fe1ea4eb2..da73d4f1dce1 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -27,12 +27,12 @@ class SwBorderAttrs;
class SwBodyFrm: public SwLayoutFrm
{
protected:
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
public:
SwBodyFrm( SwFrmFmt*, SwFrm* );
- virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
+ virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm)
};
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 9df8878743cc..3184a10ada16 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -48,16 +48,16 @@ namespace sw {
{
public:
//getters
- virtual SwPosition& GetMarkPos() const
+ virtual SwPosition& GetMarkPos() const SAL_OVERRIDE
{ return *m_pPos1; }
- virtual const OUString& GetName() const
+ virtual const OUString& GetName() const SAL_OVERRIDE
{ return m_aName; }
- virtual SwPosition& GetOtherMarkPos() const
+ virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE
{
OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." );
return *m_pPos2;
}
- virtual SwPosition& GetMarkStart() const
+ virtual SwPosition& GetMarkStart() const SAL_OVERRIDE
{
if( !IsExpanded() ) return GetMarkPos( );
if ( GetMarkPos( ) < GetOtherMarkPos( ) )
@@ -65,7 +65,7 @@ namespace sw {
else
return GetOtherMarkPos( );
}
- virtual SwPosition& GetMarkEnd() const
+ virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE
{
if( !IsExpanded() ) return GetMarkPos();
if ( GetMarkPos( ) >= GetOtherMarkPos( ) )
@@ -74,8 +74,8 @@ namespace sw {
return GetOtherMarkPos( );
}
- virtual bool IsCoveringPosition(const SwPosition& rPos) const;
- virtual bool IsExpanded() const
+ virtual bool IsCoveringPosition(const SwPosition& rPos) const SAL_OVERRIDE;
+ virtual bool IsExpanded() const SAL_OVERRIDE
{ return static_cast< bool >(m_pPos2); }
virtual void SetName(const OUString& rName)
@@ -85,7 +85,7 @@ namespace sw {
virtual void ClearOtherMarkPos()
{ m_pPos2.reset(); }
- virtual OUString ToString( ) const;
+ virtual OUString ToString( ) const SAL_OVERRIDE;
virtual void Swap()
{
@@ -108,7 +108,7 @@ namespace sw {
protected:
// SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
MarkBase(const SwPaM& rPaM, const OUString& rName);
::boost::scoped_ptr<SwPosition> m_pPos1;
@@ -167,24 +167,24 @@ namespace sw {
const KeyCode& rCode,
const OUString& rName,
const OUString& rShortName);
- virtual void InitDoc(SwDoc* const io_Doc);
+ virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE;
- virtual const OUString& GetShortName() const
+ virtual const OUString& GetShortName() const SAL_OVERRIDE
{ return m_sShortName; }
- virtual const KeyCode& GetKeyCode() const
+ virtual const KeyCode& GetKeyCode() const SAL_OVERRIDE
{ return m_aCode; }
- virtual void SetShortName(const OUString& rShortName)
+ virtual void SetShortName(const OUString& rShortName) SAL_OVERRIDE
{ m_sShortName = rShortName; }
- virtual void SetKeyCode(const KeyCode& rCode)
+ virtual void SetKeyCode(const KeyCode& rCode) SAL_OVERRIDE
{ m_aCode = rCode; }
// ::sfx2::Metadatable
- virtual ::sfx2::IXmlIdRegistry& GetRegistry();
- virtual bool IsInClipboard() const;
- virtual bool IsInUndo() const;
- virtual bool IsInContent() const;
+ virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE;
+ virtual bool IsInClipboard() const SAL_OVERRIDE;
+ virtual bool IsInUndo() const SAL_OVERRIDE;
+ virtual bool IsInContent() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject();
+ ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE;
private:
KeyCode m_aCode;
@@ -198,20 +198,20 @@ namespace sw {
public:
Fieldmark(const SwPaM& rPaM);
- virtual OUString GetFieldname() const
+ virtual OUString GetFieldname() const SAL_OVERRIDE
{ return m_aFieldname; }
- virtual OUString GetFieldHelptext() const
+ virtual OUString GetFieldHelptext() const SAL_OVERRIDE
{ return m_aFieldHelptext; }
- virtual IFieldmark::parameter_map_t* GetParameters()
+ virtual IFieldmark::parameter_map_t* GetParameters() SAL_OVERRIDE
{ return &m_vParams; }
- virtual const IFieldmark::parameter_map_t* GetParameters() const
+ virtual const IFieldmark::parameter_map_t* GetParameters() const SAL_OVERRIDE
{ return &m_vParams; }
- virtual void SetFieldname(const OUString& aFieldname)
+ virtual void SetFieldname(const OUString& aFieldname) SAL_OVERRIDE
{ m_aFieldname = aFieldname; }
- virtual void SetFieldHelptext(const OUString& aFieldHelptext)
+ virtual void SetFieldHelptext(const OUString& aFieldHelptext) SAL_OVERRIDE
{ m_aFieldHelptext = aFieldHelptext; }
virtual void ReleaseDoc(SwDoc* const) = 0;
@@ -219,8 +219,8 @@ namespace sw {
void SetMarkStartPos( const SwPosition& rNewStartPos );
void SetMarkEndPos( const SwPosition& rNewEndPos );
- virtual void Invalidate();
- virtual OUString ToString() const;
+ virtual void Invalidate() SAL_OVERRIDE;
+ virtual OUString ToString() const SAL_OVERRIDE;
private:
OUString m_aFieldname;
@@ -233,8 +233,8 @@ namespace sw {
{
public:
TextFieldmark(const SwPaM& rPaM);
- virtual void InitDoc(SwDoc* const io_pDoc);
- virtual void ReleaseDoc(SwDoc* const pDoc);
+ virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE;
+ virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE;
};
class CheckboxFieldmark
@@ -243,10 +243,10 @@ namespace sw {
{
public:
CheckboxFieldmark(const SwPaM& rPaM);
- virtual void InitDoc(SwDoc* const io_pDoc);
- virtual void ReleaseDoc(SwDoc* const pDoc);
- bool IsChecked() const;
- void SetChecked(bool checked);
+ virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE;
+ virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE;
+ bool IsChecked() const SAL_OVERRIDE;
+ void SetChecked(bool checked) SAL_OVERRIDE;
virtual OUString toString( ) const;
};
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index b362fc74e371..7b551940eccf 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -33,20 +33,20 @@ class SwCellFrm: public SwLayoutFrm
const SwTableBox* pTabBox;
protected:
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true );
~SwCellFrm();
- virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
+ virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
virtual void Paint( SwRect const&,
- SwPrintData const*const pPrintData = NULL ) const;
- virtual void CheckDirection( bool bVert );
+ SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
+ virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
// #i103961#
- virtual void Cut();
+ virtual void Cut() SAL_OVERRIDE;
const SwTableBox *GetTabBox() const { return pTabBox; }
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index a045636ed738..e36c89196c19 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -45,21 +45,21 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm
sal_Bool bTstMove,
const bool bObjsInNewUpper );
- virtual void MakeAll();
+ virtual void MakeAll() SAL_OVERRIDE;
void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
- virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& );
+ virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) SAL_OVERRIDE;
const SwCntntFrm* ImplGetNextCntntFrm( bool bFwd ) const;
protected:
sal_Bool MakePrtArea( const SwBorderAttrs & );
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
- virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
SwCntntFrm( SwCntntNode * const, SwFrm* );
@@ -67,8 +67,8 @@ public:
virtual ~SwCntntFrm();
TYPEINFO_OVERRIDE(); // already in base class
- virtual void Cut();
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
+ virtual void Cut() SAL_OVERRIDE;
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
inline const SwCntntNode *GetNode() const;
inline SwCntntNode *GetNode();
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index 93ee8b163668..774a8e57b1ca 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -29,8 +29,8 @@ public:
SwColumnFrm( SwFrmFmt*, SwFrm* );
~SwColumnFrm();
- virtual void PaintBreak() const;
- virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
+ virtual void PaintBreak() const SAL_OVERRIDE;
+ virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm)
};
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index 79212d38b06c..b43775de0f78 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -37,22 +37,22 @@ namespace sw {
const OUString& rPrefix);
// getters
- virtual SwPosition& GetOtherMarkPos() const;
- virtual SwPosition& GetMarkStart() const
+ virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE;
+ virtual SwPosition& GetMarkStart() const SAL_OVERRIDE
{ return *m_pPos1; }
- virtual SwPosition& GetMarkEnd() const
+ virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE
{ return *m_pPos1; }
- virtual bool IsExpanded() const
+ virtual bool IsExpanded() const SAL_OVERRIDE
{ return false; }
- virtual void SetMarkPos(const SwPosition& rNewPos);
- virtual void SetOtherMarkPos(const SwPosition&)
+ virtual void SetMarkPos(const SwPosition& rNewPos) SAL_OVERRIDE;
+ virtual void SetOtherMarkPos(const SwPosition&) SAL_OVERRIDE
{
OSL_PRECOND(false,
"<CrossRefBookmark::SetOtherMarkPos(..)>"
" - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set." );
}
- virtual void ClearOtherMarkPos()
+ virtual void ClearOtherMarkPos() SAL_OVERRIDE
{
OSL_PRECOND(false,
"<SwCrossRefBookmark::ClearOtherMarkPos(..)>"
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 451c9a936878..7532f9f9a5a6 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -36,12 +36,12 @@ const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001;
class SwFlyDrawObj : public SdrObject
{
private:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
+ virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE;
protected:
// #i95264# SwFlyDrawObj needs an own VC since createViewIndependentPrimitive2DSequence()
// is called when RecalcBoundRect() is used
- virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
+ virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
@@ -50,8 +50,8 @@ public:
~SwFlyDrawObj();
// for instantiation of this class while loading (via factory)
- virtual sal_uInt32 GetObjInventor() const;
- virtual sal_uInt16 GetObjIdentifier() const;
+ virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE;
+ virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
};
// virtual objects for Flys
@@ -66,7 +66,7 @@ protected:
// AW: Need own sdr::contact::ViewContact since AnchorPos from parent is
// not used but something own (top left of new SnapRect minus top left
// of original SnapRect)
- virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
+ virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE;
public:
// for paints triggered form ExecutePrimitive
@@ -82,26 +82,26 @@ public:
~SwVirtFlyDrawObj();
// overloaded method of base class SdrVirtObj
- virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const;
+ virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const SAL_OVERRIDE;
// we treat the size calculation completely on ourself here
- virtual const Rectangle& GetCurrentBoundRect() const;
- virtual const Rectangle& GetLastBoundRect() const;
- virtual void RecalcBoundRect();
- virtual void RecalcSnapRect();
- virtual const Rectangle& GetSnapRect() const;
- virtual void SetSnapRect(const Rectangle& rRect);
- virtual void NbcSetSnapRect(const Rectangle& rRect);
- virtual const Rectangle& GetLogicRect() const;
- virtual void SetLogicRect(const Rectangle& rRect);
- virtual void NbcSetLogicRect(const Rectangle& rRect);
- virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
- virtual void NbcMove (const Size& rSiz);
+ virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE;
+ virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE;
+ virtual void RecalcBoundRect() SAL_OVERRIDE;
+ virtual void RecalcSnapRect() SAL_OVERRIDE;
+ virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE;
+ virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
+ virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE;
+ virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
+ virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE;
+ virtual void NbcMove (const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact,
- const Fraction& yFact);
- virtual void Move (const Size& rSiz);
+ const Fraction& yFact) SAL_OVERRIDE;
+ virtual void Move (const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const Fraction& xFact,
- const Fraction& yFact, bool bUnsetRelative = true);
+ const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
const SwFrmFmt *GetFmt() const;
SwFrmFmt *GetFmt();
@@ -113,13 +113,13 @@ public:
void SetRect() const;
// if an URL is attached to a graphic than this is a macro object
- virtual bool HasMacro() const;
- virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const;
- virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const;
+ virtual bool HasMacro() const SAL_OVERRIDE;
+ virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE;
+ virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE;
// FullDrag support
- virtual bool supportsFullDrag() const;
- virtual SdrObject* getFullDragClone() const;
+ virtual bool supportsFullDrag() const SAL_OVERRIDE;
+ virtual SdrObject* getFullDragClone() const SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 64e34fb5609a..f648389115f8 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -94,7 +94,7 @@ struct SwSortTxtElement : public SwSortElement
SwSortTxtElement( const SwNodeIndex& rPos );
virtual ~SwSortTxtElement();
- virtual OUString GetKey( sal_uInt16 nKey ) const;
+ virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE;
};
// sort table
@@ -105,8 +105,8 @@ struct SwSortBoxElement : public SwSortElement
SwSortBoxElement( sal_uInt16 nRC );
virtual ~SwSortBoxElement();
- virtual OUString GetKey( sal_uInt16 nKey ) const;
- virtual double GetValue( sal_uInt16 nKey ) const;
+ virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE;
+ virtual double GetValue( sal_uInt16 nKey ) const SAL_OVERRIDE;
};
// two-dimensional array of FndBoxes
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index 311103b2d5bb..e15967b51f63 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -39,25 +39,25 @@ namespace sw {
// XFilter
virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL cancel( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XExporter
virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
}
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 1d1617ad071f..a0f31ba1b9fe 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -69,32 +69,32 @@ class SwDrawView : public FmFormView
protected:
// add custom handles (used by other apps, e.g. AnchorPos)
- virtual void AddCustomHdl();
+ virtual void AddCustomHdl() SAL_OVERRIDE;
// overloaded to allow extra handling when picking SwVirtFlyDrawObj's
using FmFormView::CheckSingleSdrObjectHit;
- virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const;
+ virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE;
// support enhanced text edit for draw objects
- virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const;
+ virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const SAL_OVERRIDE;
public:
SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice* pOutDev=NULL );
// from base class
- virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const;
- virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const;
- virtual void MarkListHasChanged();
+ virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const SAL_OVERRIDE;
+ virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const SAL_OVERRIDE;
+ virtual void MarkListHasChanged() SAL_OVERRIDE;
// #i7672#
// Overload to resue edit background color in active text edit view (OutlinerView)
- virtual void ModelHasChanged();
+ virtual void ModelHasChanged() SAL_OVERRIDE;
virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
- sal_uLong nNewPos );
- virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
- virtual void MakeVisible( const Rectangle&, Window &rWin );
- virtual void CheckPossibilities();
+ sal_uLong nNewPos ) SAL_OVERRIDE;
+ virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const SAL_OVERRIDE;
+ virtual void MakeVisible( const Rectangle&, Window &rWin ) SAL_OVERRIDE;
+ virtual void CheckPossibilities() SAL_OVERRIDE;
const SwViewImp &Imp() const { return rImp; }
SwViewImp &Imp() { return rImp; }
@@ -102,7 +102,7 @@ public:
// anchor and Xor for dragging
void ShowDragAnchor();
- virtual void DeleteMarked();
+ virtual void DeleteMarked() SAL_OVERRIDE;
inline void ValidateMarkList() { FlushComeBackTimer(); }
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
index 6d2b589aa7a6..def023c8b2db 100644
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ b/sw/source/core/inc/finalthreadmanager.hxx
@@ -53,24 +53,24 @@ public:
explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context);
// ::com::sun::star::lang::XServiceInfo:
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::util::XJobManager:
- virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::frame::XTerminateListener2
- virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::frame::XTerminateListener (inherited via com::sun::star::frame::XTerminateListener2)
- virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener)
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
FinalThreadManager(FinalThreadManager &); // not defined
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 3ba5bf4b503f..74dc31913c93 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -121,7 +121,7 @@ protected:
Point m_aContentPos; // content area's position relatively to Frm
bool m_bValidContentPos;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void MakePrtArea( const SwBorderAttrs &rAttrs );
void MakeContentPos( const SwBorderAttrs &rAttrs );
@@ -141,15 +141,15 @@ protected:
#i28701#
*/
- virtual void RegisterAtCorrectPage();
+ virtual void RegisterAtCorrectPage() SAL_OVERRIDE;
- virtual bool _SetObjTop( const SwTwips _nTop );
- virtual bool _SetObjLeft( const SwTwips _nLeft );
+ virtual bool _SetObjTop( const SwTwips _nTop ) SAL_OVERRIDE;
+ virtual bool _SetObjLeft( const SwTwips _nLeft ) SAL_OVERRIDE;
- virtual const SwRect GetObjBoundRect() const;
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual const SwRect GetObjBoundRect() const SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
- virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( );
+ virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( ) SAL_OVERRIDE;
SwTwips CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips nMinHeight, const SwTwips nUL);
@@ -159,17 +159,17 @@ public:
virtual ~SwFlyFrm();
// get client information
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
virtual void Paint( SwRect const&,
- SwPrintData const*const pPrintData = NULL ) const;
- virtual Size ChgSize( const Size& aNewSize );
+ SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
+ virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE;
virtual bool GetCrsrOfst( SwPosition *, Point&,
- SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
- virtual void CheckDirection( bool bVert );
- virtual void Cut();
+ virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
+ virtual void Cut() SAL_OVERRIDE;
#ifdef DBG_UTIL
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
#endif
SwTwips _Shrink( SwTwips, sal_Bool bTst );
@@ -260,13 +260,13 @@ public:
void InsertColumns();
// #i26791# - pure virtual methods of base class <SwAnchoredObject>
- virtual void MakeObjPos();
- virtual void InvalidateObjPos();
+ virtual void MakeObjPos() SAL_OVERRIDE;
+ virtual void InvalidateObjPos() SAL_OVERRIDE;
- virtual SwFrmFmt& GetFrmFmt();
- virtual const SwFrmFmt& GetFrmFmt() const;
+ virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE;
+ virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE;
- virtual const SwRect GetObjRect() const;
+ virtual const SwRect GetObjRect() const SAL_OVERRIDE;
/** method to determine if a format on the Writer fly frame is possible
@@ -275,18 +275,18 @@ public:
<SwAnchoredObject::IsFormatPossible()> by:
format isn't possible, if Writer fly frame is locked resp. col-locked.
*/
- virtual bool IsFormatPossible() const;
+ virtual bool IsFormatPossible() const SAL_OVERRIDE;
static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFmt& rFmt );
// overwriting "SwFrmFmt *SwLayoutFrm::GetFmt" to provide the correct derived return type.
// (This is in order to skip on the otherwise necessary casting of the result to
// 'SwFlyFrmFmt *' after calls to this function. The casting is now done in this function.)
- virtual const SwFlyFrmFmt *GetFmt() const;
- virtual SwFlyFrmFmt *GetFmt();
+ virtual const SwFlyFrmFmt *GetFmt() const SAL_OVERRIDE;
+ virtual SwFlyFrmFmt *GetFmt() SAL_OVERRIDE;
- virtual void dumpAsXml( xmlTextWriterPtr writer ) { SwLayoutFrm::dumpAsXml( writer ); };
+ virtual void dumpAsXml( xmlTextWriterPtr writer ) SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); };
- virtual void Calc() const;
+ virtual void Calc() const SAL_OVERRIDE;
const Point& ContentPos() const { return m_aContentPos; }
Point& ContentPos() { return m_aContentPos; }
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 28e007a148d8..b2388f3dcbd7 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -59,7 +59,7 @@ protected:
// method <NotifyBackground>
friend class SwFlyNotify;
virtual void NotifyBackground( SwPageFrm *pPage,
- const SwRect& rRect, PrepareHint eHint);
+ const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE;
SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
public:
@@ -68,7 +68,7 @@ public:
virtual ~SwFlyFreeFrm();
- virtual void MakeAll();
+ virtual void MakeAll() SAL_OVERRIDE;
// #i37068# - accessors for member <mbNoMoveOnCheckClip>
inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip )
@@ -115,7 +115,7 @@ public:
format isn't possible, if Writer fly frame isn't registered at a page frame
and its anchor frame isn't inside another Writer fly frame.
*/
- virtual bool IsFormatPossible() const;
+ virtual bool IsFormatPossible() const SAL_OVERRIDE;
};
// Flys that are bound to LayoutFrms and not to Cntnt
@@ -128,25 +128,25 @@ public:
SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
SwFlyLayFrm( SwFlyLayFrm& );
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
};
// Flys that are bound to Cntnt but not in Cntnt
class SwFlyAtCntFrm : public SwFlyFreeFrm
{
protected:
- virtual void MakeAll();
+ virtual void MakeAll() SAL_OVERRIDE;
// #i28701#
- virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const;
+ virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const SAL_OVERRIDE;
/** method to assure that anchored object is registered at the correct
page frame
#i28701#
*/
- virtual void RegisterAtCorrectPage();
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void RegisterAtCorrectPage() SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
// #i28701#
@@ -157,7 +157,7 @@ public:
void SetAbsPos( const Point &rNew );
// #i26791#
- virtual void MakeObjPos();
+ virtual void MakeObjPos() SAL_OVERRIDE;
/** method to determine, if a format on the Writer fly frame is possible
@@ -166,7 +166,7 @@ public:
<SwFlyFreeFrm::IsFormatPossible()> by:
format isn't possible, if method <MakeAll()> is already in progress.
*/
- virtual bool IsFormatPossible() const;
+ virtual bool IsFormatPossible() const SAL_OVERRIDE;
};
// Flys that are bound to a character in Cntnt
@@ -179,9 +179,9 @@ class SwFlyInCntFrm : public SwFlyFrm
protected:
virtual void NotifyBackground( SwPageFrm *pPage,
- const SwRect& rRect, PrepareHint eHint);
- virtual void MakeAll();
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE;
+ virtual void MakeAll() SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
// #i28701#
@@ -190,7 +190,7 @@ public:
SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
virtual ~SwFlyInCntFrm();
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void SetRefPoint( const Point& rPoint, const Point &rRelAttr,
const Point &rRelPos );
@@ -216,11 +216,11 @@ public:
void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; }
// #i26791#
- virtual void MakeObjPos();
+ virtual void MakeObjPos() SAL_OVERRIDE;
// invalidate anchor frame on invalidation of the position, because the
// position is calculated during the format of the anchor frame
- virtual void _ActionOnInvalidation( const InvalidationType _nInvalid );
+ virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) SAL_OVERRIDE;
};
inline void SwFlyInCntFrm::InvalidateLayout() const
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index c2e2155a8af3..42cbf2600b44 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -124,7 +124,7 @@ class SwFntAccess : public SwCacheAccess
{
SwViewShell *pShell;
protected:
- virtual SwCacheObj *NewObj( );
+ virtual SwCacheObj *NewObj( ) SAL_OVERRIDE;
public:
SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner,
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 514f64e2698e..51ace29eb259 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -428,7 +428,7 @@ protected:
// draw shadow and borders
void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const;
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( );
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index a56db5fa4284..12e9eb963bf3 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -374,7 +374,7 @@ class SwBorderAttrAccess : public SwCacheAccess
const SwFrm *pConstructor; //opt: for passing on to SwBorderAttrs
protected:
- virtual SwCacheObj *NewObj();
+ virtual SwCacheObj *NewObj() SAL_OVERRIDE;
public:
SwBorderAttrAccess( SwCache &rCache, const SwFrm *pOwner );
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 862b86357214..59fdb07eac22 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -38,12 +38,12 @@ public:
const SwFtnFrm* FindFootNote() const;
- virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+ virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void PaintBorder( const SwRect &, const SwPageFrm *pPage,
- const SwBorderAttrs & ) const;
- virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
+ const SwBorderAttrs & ) const SAL_OVERRIDE;
+ virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
void PaintLine( const SwRect &, const SwPageFrm * ) const;
};
@@ -64,17 +64,17 @@ class SwFtnFrm: public SwLayoutFrm
bool mbUnlockPosOfLowerObjs : 1;
#ifdef DBG_UTIL
protected:
- virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+ virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
#endif
public:
SwFtnFrm( SwFrmFmt*, SwFrm*, SwCntntFrm*, SwTxtFtn* );
- virtual void Cut();
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
+ virtual void Cut() SAL_OVERRIDE;
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
- virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
+ virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const;
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index ba6b3625aba6..776c772998b5 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -32,12 +32,12 @@ protected:
public:
SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType);
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual SwTwips GrowFrm( SwTwips,
- sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+ sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
virtual SwTwips ShrinkFrm( SwTwips,
- sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
+ sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
};
/// Header in the document layout, inside a page.
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index a840d03619f6..a5f1e5147253 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -50,14 +50,14 @@ class SwLayoutFrm: public SwFrm
protected:
void Destroy(); // for ~SwRootFrm
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void MakeAll();
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void MakeAll() SAL_OVERRIDE;
SwFrm *pLower;
std::vector<SwAnchoredObject*> aVertPosOrientFrmsFor;
- virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+ virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
long CalcRel( const SwFmtFrmSize &rSz, sal_Bool bWidth ) const;
@@ -81,13 +81,13 @@ public:
void PaintColLines( const SwRect &, const SwFmtCol &,
const SwPageFrm * ) const;
- virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
+ virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE;
virtual bool GetCrsrOfst( SwPosition *, Point&,
- SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
- virtual void Cut();
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
+ virtual void Cut() SAL_OVERRIDE;
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
//sucht den dichtesten Cntnt zum SPoint, wird bei Seiten, Flys und Cells
//benutzt wenn GetCrsrOfst versagt hat.
@@ -101,7 +101,7 @@ public:
virtual ~SwLayoutFrm();
virtual void Paint( SwRect const&,
- SwPrintData const*const pPrintData = NULL ) const;
+ SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
const SwFrm *Lower() const { return pLower; }
SwFrm *Lower() { return pLower; }
const SwCntntFrm *ContainsCntnt() const;
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index b0a2ed13b9b0..b78a3f7b48d2 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -36,22 +36,22 @@ class SwNoTxtFrm: public SwCntntFrm
void InitCtor();
- void Format ( const SwBorderAttrs *pAttrs = 0 );
+ void Format ( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void PaintCntnt ( OutputDevice*, const SwRect&, const SwRect& ) const;
void PaintPicture( OutputDevice*, const SwRect& ) const;
protected:
- virtual void MakeAll();
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void MakeAll() SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
SwNoTxtFrm( SwNoTxtNode * const, SwFrm* );
~SwNoTxtFrm();
virtual void Paint( SwRect const&,
- SwPrintData const*const pPrintData = NULL ) const;
+ SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
virtual bool GetCharRect( SwRect &, const SwPosition&,
- SwCrsrMoveState* = 0) const;
+ SwCrsrMoveState* = 0) const SAL_OVERRIDE;
virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint,
- SwCrsrMoveState* = 0, bool bTestBackground = false) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false) const SAL_OVERRIDE;
const Size &GetGrfSize() const { return GetSize(); }
void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const;
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index 4c7acb5aaa64..4096f3c9b02a 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -47,8 +47,8 @@ class ObservableThread : public osl::Thread,
const oslInterlockedCount nThreadID );
// IReference
- virtual oslInterlockedCount SAL_CALL acquire();
- virtual oslInterlockedCount SAL_CALL release();
+ virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
+ virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
protected:
@@ -61,7 +61,7 @@ class ObservableThread : public osl::Thread,
Otherwise, it's not guaranteed, that its ref-count is increased
during the execution of the thread.
*/
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
virtual void threadFunction() = 0;
@@ -73,7 +73,7 @@ class ObservableThread : public osl::Thread,
the end of its execution and that the observer is notified, that
the thread has finished its work.
*/
- virtual void SAL_CALL onTerminated();
+ virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
virtual void threadFinished();
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index f022c5b1c6b6..a7526f6ea418 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -102,8 +102,8 @@ class SwPageFrm: public SwFtnBossFrm
bool bRightSidebar );
protected:
- virtual void MakeAll();
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void MakeAll() SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm)
@@ -161,20 +161,20 @@ public:
void PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt );
virtual bool GetCrsrOfst( SwPosition *, Point&,
- SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
// erfrage vom Client Informationen
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
- virtual void Cut();
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
- virtual void CheckDirection( bool bVert );
+ virtual void Cut() SAL_OVERRIDE;
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
+ virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
void CheckGrid( sal_Bool bInvalidate );
void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const;
sal_Bool HasGrid() const { return bHasGrid; }
void PaintDecorators( ) const;
- virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
- virtual void PaintBreak() const;
+ virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
+ virtual void PaintBreak() const SAL_OVERRIDE;
//Zeilennummern usw malen
void RefreshExtraData( const SwRect & ) const;
@@ -311,7 +311,7 @@ public:
*/
sw::sidebarwindows::SidebarPosition SidebarPosition() const;
- virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
+ virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE;
inline sal_Int8 ShadowPxWidth() const
{
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index d37fd5509623..6fe273e35516 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -40,7 +40,7 @@ class SwAsyncRetrieveInputStreamThread : public ObservableThread
protected:
- virtual void threadFunction();
+ virtual void threadFunction() SAL_OVERRIDE;
private:
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index aebed31ff82d..0c36352df003 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -98,8 +98,8 @@ class SwHistorySetFmt : public SwHistoryHint
public:
SwHistorySetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNode );
virtual ~SwHistorySetFmt();
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
- virtual OUString GetDescription() const;
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
};
@@ -110,7 +110,7 @@ class SwHistoryResetFmt : public SwHistoryHint
public:
SwHistoryResetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNodeIdx );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
@@ -128,7 +128,7 @@ class SwHistorySetTxt : public SwHistoryHint
public:
SwHistorySetTxt( SwTxtAttr* pTxtHt, sal_uLong nNode );
virtual ~SwHistorySetTxt();
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
@@ -148,9 +148,9 @@ class SwHistorySetTxtFld : public SwHistoryHint
public:
SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNode );
virtual ~SwHistorySetTxtFld();
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
- virtual OUString GetDescription() const;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
};
@@ -163,7 +163,7 @@ class SwHistorySetRefMark : public SwHistoryHint
public:
SwHistorySetRefMark( SwTxtRefMark* pTxtHt, sal_uLong nNode );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
@@ -178,7 +178,7 @@ class SwHistorySetTOXMark : public SwHistoryHint
public:
SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, sal_uLong nNode );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
bool IsEqual( const SwTOXMark& rCmp ) const;
};
@@ -193,7 +193,7 @@ class SwHistoryResetTxt : public SwHistoryHint
public:
SwHistoryResetTxt( sal_uInt16 nWhich, sal_Int32 nStt, sal_Int32 nEnd,
sal_uLong nNode );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
sal_uInt16 GetWhich() const { return m_nAttr; }
sal_uLong GetNode() const { return m_nNodeIndex; }
@@ -215,9 +215,9 @@ public:
SwHistorySetFootnote( SwTxtFtn* pTxtFtn, sal_uLong nNode );
SwHistorySetFootnote( const SwTxtFtn& );
virtual ~SwHistorySetFootnote();
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
- virtual OUString GetDescription() const;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
};
@@ -229,7 +229,7 @@ class SwHistoryChangeFmtColl : public SwHistoryHint
public:
SwHistoryChangeFmtColl( SwFmtColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
@@ -242,7 +242,7 @@ class SwHistoryTxtFlyCnt : public SwHistoryHint
public:
SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt );
virtual ~SwHistoryTxtFlyCnt();
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
SwUndoDelLayFmt* GetUDelLFmt() { return m_pUndo.get(); }
};
@@ -252,7 +252,7 @@ class SwHistoryBookmark : public SwHistoryHint
public:
SwHistoryBookmark(const ::sw::mark::IMark& rBkmk,
bool bSavePos, bool bSaveOtherPos);
- virtual void SetInDoc(SwDoc * pDoc, bool);
+ virtual void SetInDoc(SwDoc * pDoc, bool) SAL_OVERRIDE;
bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk);
const OUString& GetName() const;
@@ -281,7 +281,7 @@ class SwHistorySetAttrSet : public SwHistoryHint
public:
SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNode,
const std::set<sal_uInt16> &rSetArr );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
@@ -296,7 +296,7 @@ public:
SwHistoryResetAttrSet( const SfxItemSet& rSet, sal_uLong nNode,
sal_Int32 nStt,
sal_Int32 nEnd);
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
const std::vector<sal_uInt16>& GetArr() const { return m_Array; }
sal_uLong GetNode() const { return m_nNodeIndex; }
@@ -312,7 +312,7 @@ class SwHistoryChangeFlyAnchor : public SwHistoryHint
public:
SwHistoryChangeFlyAnchor( SwFrmFmt& rFmt );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
class SwHistoryChangeFlyChain : public SwHistoryHint
@@ -323,7 +323,7 @@ class SwHistoryChangeFlyChain : public SwHistoryHint
public:
SwHistoryChangeFlyChain( SwFlyFrmFmt& rFmt, const SwFmtChain& rAttr );
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
class SwHistoryChangeCharFmt : public SwHistoryHint
@@ -333,7 +333,7 @@ class SwHistoryChangeCharFmt : public SwHistoryHint
public:
SwHistoryChangeCharFmt( const SfxItemSet& rSet, const OUString & sFmt);
- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
+ virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
};
@@ -412,7 +412,7 @@ private:
void _MakeSetWhichIds();
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
SwRegHistory( SwHistory* pHst );
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 227be352bdb3..fa955a0a62ae 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -143,7 +143,7 @@ class SwRootFrm: public SwLayoutFrm
protected:
- virtual void MakeAll();
+ virtual void MakeAll() SAL_OVERRIDE;
public:
@@ -186,22 +186,22 @@ public:
void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; }
virtual bool GetCrsrOfst( SwPosition *, Point&,
- SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
virtual void Paint( SwRect const&,
- SwPrintData const*const pPrintData = NULL ) const;
- virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+ SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
+ virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
#ifdef DBG_UTIL
- virtual void Cut();
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
+ virtual void Cut() SAL_OVERRIDE;
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
#endif
- virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
+ virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE;
Point GetNextPrevCntntPos( const Point &rPoint, sal_Bool bNext ) const;
- virtual Size ChgSize( const Size& aNewSize );
+ virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE;
void SetIdleFlags()
{
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index 083fda734a94..ac9a66adbad6 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -29,10 +29,10 @@ class SwBorderAttrs;
/// SwRowFrm is one table row in the document layout.
class SwRowFrm: public SwLayoutFrm
{
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
//Aendern nur die Framesize, nicht die PrtArea-SSize
- virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+ virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+ virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
const SwTableLine *pTabLine;
SwRowFrm* pFollowRow;
@@ -46,14 +46,14 @@ class SwRowFrm: public SwLayoutFrm
bool mbIsRowSpanLine;
protected:
- virtual void MakeAll();
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void MakeAll() SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
SwRowFrm( const SwTableLine &, SwFrm*, bool bInsertContent = true );
~SwRowFrm();
- virtual void Cut();
+ virtual void Cut() SAL_OVERRIDE;
//Zum Anmelden der Flys nachdem eine Zeile erzeugt _und_ eingefuegt wurde.
//Muss vom Erzeuger gerufen werden, denn erst nach dem Konstruieren wird
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 930d1bc83840..26e04ee1151e 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -54,11 +54,11 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
const SwSectionFmt* _GetEndSectFmt() const;
bool IsEndnoteAtMyEnd() const;
protected:
- virtual void MakeAll();
- virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat );
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
- virtual void SwClientNotify( const SwModify&, const SfxHint& );
+ virtual void MakeAll() SAL_OVERRIDE;
+ virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE;
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
public:
SwSectionFrm( SwSection &, SwFrm* ); //Inhalt wird nicht erzeugt!
@@ -66,12 +66,12 @@ public:
virtual ~SwSectionFrm();
void Init();
- virtual void CheckDirection( bool bVert );
+ virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
- virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
+ virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
- virtual void Cut();
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
+ virtual void Cut() SAL_OVERRIDE;
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
inline const SwSectionFrm *GetFollow() const;
inline SwSectionFrm *GetFollow();
@@ -127,7 +127,7 @@ public:
bool IsBalancedSection() const;
- virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer);
+ virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE;
bool IsFtnAtEnd() const { return bFtnAtEnd; }
bool IsEndnAtEnd() const { return bEndnAtEnd; }
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index 07ef171962b6..58297497fc15 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -80,7 +80,7 @@ class SwFontAccess : public SwCacheAccess
{
SwViewShell *pShell;
protected:
- virtual SwCacheObj *NewObj( );
+ virtual SwCacheObj *NewObj( ) SAL_OVERRIDE;
public:
SwFontAccess( const void *pOwner, SwViewShell *pSh );
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 02a454cb9943..510bd735125e 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -98,14 +98,14 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
SwAttrSetChg *pa = 0,
SwAttrSetChg *pb = 0 );
- virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat );
+ virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE;
protected:
- virtual void MakeAll();
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void MakeAll() SAL_OVERRIDE;
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
// only changes the Framesize, not the PrtArea size
- virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+ virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
public:
SwTabFrm( SwTable &, SwFrm* ); // calling Regist Flys always after creation _and_pasting!
@@ -121,16 +121,16 @@ public:
inline SwTabFrm *GetFollow();
SwTabFrm* FindMaster( bool bFirstMaster = false ) const;
- virtual bool GetInfo( SfxPoolItem &rHnt ) const;
+ virtual bool GetInfo( SfxPoolItem &rHnt ) const SAL_OVERRIDE;
virtual void Paint( SwRect const&,
- SwPrintData const*const pPrintData = NULL ) const;
- virtual void CheckDirection( bool bVert );
+ SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
+ virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
- virtual void Cut();
- virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
+ virtual void Cut() SAL_OVERRIDE;
+ virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR,
- const void *pVoid = 0, bool bNotify = true );
+ const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE;
SwCntntFrm *FindLastCntnt();
inline const SwCntntFrm *FindLastCntnt() const;
@@ -215,7 +215,7 @@ public:
sal_uInt16 GetBottomLineSize() const;
- virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer);
+ virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE;
DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm)
};
diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx
index c4158c9dadc5..412df33720f7 100644
--- a/sw/source/core/inc/textapi.hxx
+++ b/sw/source/core/inc/textapi.hxx
@@ -35,9 +35,9 @@ class SwTextAPIEditSource : public SvxEditSource
{
SwTextAPIEditSource_Impl* pImpl;
- virtual SvxEditSource* Clone() const;
- virtual SvxTextForwarder* GetTextForwarder();
- virtual void UpdateData();
+ virtual SvxEditSource* Clone() const SAL_OVERRIDE;
+ virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE;
+ virtual void UpdateData() SAL_OVERRIDE;
explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource );
public:
diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx
index dbfadb0be538..4f5a181652f3 100644
--- a/sw/source/core/inc/threadlistener.hxx
+++ b/sw/source/core/inc/threadlistener.hxx
@@ -43,7 +43,7 @@ class ThreadListener : public IFinishedThreadListener
void ListenToThread( const oslInterlockedCount nThreadID,
ObservableThread& rThread );
- virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID );
+ virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE;
private:
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 7d44dd70b54e..920bc889dd41 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -51,8 +51,8 @@ class ThreadManager : public IThreadListenerOwner
~ThreadManager();
// --> IThreadListenerOwner
- virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef();
- virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID );
+ virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef() SAL_OVERRIDE;
+ virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE;
/** initialization
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 4673b52a8dcb..7b72f992f46a 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -43,11 +43,11 @@ namespace objectpositioning
const SwRect* mpToCharRect;
SwTwips mnToCharTopOfLine;
- virtual bool IsAnchoredToChar() const;
- virtual const SwFrm* ToCharOrientFrm() const;
- virtual const SwRect* ToCharRect() const;
+ virtual bool IsAnchoredToChar() const SAL_OVERRIDE;
+ virtual const SwFrm* ToCharOrientFrm() const SAL_OVERRIDE;
+ virtual const SwRect* ToCharRect() const SAL_OVERRIDE;
// #i22341#
- virtual SwTwips ToCharTopOfLine() const;
+ virtual SwTwips ToCharTopOfLine() const SAL_OVERRIDE;
// method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to
// the needed type
@@ -77,7 +77,7 @@ namespace objectpositioning
/** calculate position of object
*/
- virtual void CalcPosition();
+ virtual void CalcPosition() SAL_OVERRIDE;
/** frame, at which the vertical position is oriented at
*/
diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
index cab45c43763e..31ddfe88bb3d 100644
--- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
@@ -41,7 +41,7 @@ namespace objectpositioning
/** calculate position for object
*/
- virtual void CalcPosition();
+ virtual void CalcPosition() SAL_OVERRIDE;
/** calculated relative position for object
*/
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 557e7da4ee33..31f396c2db42 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -186,13 +186,13 @@ struct SwTOXIndex : public SwTOXSortTabBase
const ::com::sun::star::lang::Locale& rLocale );
virtual ~SwTOXIndex() {}
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const;
- virtual sal_uInt16 GetLevel() const;
- virtual bool operator==( const SwTOXSortTabBase& );
- virtual bool operator<( const SwTOXSortTabBase& );
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetLevel() const SAL_OVERRIDE;
+ virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE;
+ virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE;
private:
- virtual TextAndReading GetText_Impl() const;
+ virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
sal_uInt8 nKeyLevel;
};
@@ -204,12 +204,12 @@ struct SwTOXCustom : public SwTOXSortTabBase
const ::com::sun::star::lang::Locale& rLocale );
virtual ~SwTOXCustom() {}
- virtual sal_uInt16 GetLevel() const;
- virtual bool operator==( const SwTOXSortTabBase& );
- virtual bool operator<( const SwTOXSortTabBase& );
+ virtual sal_uInt16 GetLevel() const SAL_OVERRIDE;
+ virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE;
+ virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE;
private:
- virtual TextAndReading GetText_Impl() const;
+ virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
TextAndReading m_aKey;
sal_uInt16 nLev;
@@ -225,10 +225,10 @@ struct SwTOXContent : public SwTOXSortTabBase
const SwTOXInternational& rIntl );
virtual ~SwTOXContent() {}
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const;
- virtual sal_uInt16 GetLevel() const;
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetLevel() const SAL_OVERRIDE;
private:
- virtual TextAndReading GetText_Impl() const;
+ virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
};
@@ -240,12 +240,12 @@ struct SwTOXPara : public SwTOXSortTabBase
void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; }
void SetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; }
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const;
- virtual sal_uInt16 GetLevel() const;
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetLevel() const SAL_OVERRIDE;
- virtual OUString GetURL() const;
+ virtual OUString GetURL() const SAL_OVERRIDE;
private:
- virtual TextAndReading GetText_Impl() const;
+ virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
SwTOXElement eType;
sal_uInt16 m_nLevel;
@@ -261,11 +261,11 @@ struct SwTOXTable : public SwTOXSortTabBase
void SetLevel(sal_uInt16 nSet){nLevel = nSet;}
- virtual sal_uInt16 GetLevel() const;
+ virtual sal_uInt16 GetLevel() const SAL_OVERRIDE;
- virtual OUString GetURL() const;
+ virtual OUString GetURL() const SAL_OVERRIDE;
private:
- virtual TextAndReading GetText_Impl() const;
+ virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
sal_uInt16 nLevel;
};
@@ -274,8 +274,8 @@ struct SwTOXAuthority : public SwTOXSortTabBase
{
private:
SwFmtFld& m_rField;
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const;
- virtual TextAndReading GetText_Impl() const;
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+ virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
public:
SwTOXAuthority( const SwCntntNode& rNd, SwFmtFld& rField, const SwTOXInternational& rIntl );
@@ -283,9 +283,9 @@ public:
SwFmtFld& GetFldFmt() {return m_rField;}
- virtual bool operator==( const SwTOXSortTabBase& );
- virtual bool operator<( const SwTOXSortTabBase& );
- virtual sal_uInt16 GetLevel() const;
+ virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE;
+ virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE;
+ virtual sal_uInt16 GetLevel() const SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 5b99ffd8bdbc..a35a81aff0fd 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -208,11 +208,11 @@ class SwTxtFrm: public SwCntntFrm
sal_Int32 &nChgStart, sal_Int32 &nChgEnd,
sal_Int32 &nInvStart, sal_Int32 &nInvEnd);
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
- com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos );
+ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) SAL_OVERRIDE;
//public, weil der eine oder andere die Methode rufen darf um das
//Prepare zu sparen - mit Vorsicht zu geniessen!
void Init();
@@ -229,7 +229,7 @@ public:
// Additional information can be obtained by passing an SwCrsrMoveState object.
// Returns false if rPos > number of character is string
virtual bool GetCharRect( SwRect& rRect, const SwPosition& rPos,
- SwCrsrMoveState* pCMS = 0 ) const;
+ SwCrsrMoveState* pCMS = 0 ) const SAL_OVERRIDE;
// Eine etwas abgespeckte GetCharRect-Version fuer autopositionierte Rahmen
bool GetAutoPos( SwRect &, const SwPosition& ) const;
@@ -255,7 +255,7 @@ public:
bool GetTopOfLine( SwTwips& _onTopOfLine,
const SwPosition& _rPos ) const;
- virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
+ virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE;
//Liefert in nOffset den Offset des Characters innerhalb des
//gesetzten Textbuffers zurueck, welcher der durch aPoint
@@ -263,7 +263,7 @@ public:
//naechsten ist. Wenn der SPoint ausserhalb der SSize liegt,
//liefert die Funktion false, true sonst.
virtual bool GetCrsrOfst( SwPosition *, Point&,
- SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
// GetKeyCrsrOfst sorgt dafuer, dass der Frame nicht gewechselt wird
// (z.B. Wechsel in den zeichengebundenen Frame).
@@ -273,18 +273,18 @@ public:
void PaintExtraData( const SwRect & rRect ) const; //Seitennummer usw.
SwRect Paint();
virtual void Paint( SwRect const&,
- SwPrintData const*const pPrintData = NULL ) const;
- virtual bool GetInfo( SfxPoolItem & ) const;
+ SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem & ) const SAL_OVERRIDE;
//Layoutorientiertes Cursortravelling: Linker, rechter Rand,
//vorhergehende/naechste Zeile, gleiche horizontale Position.
- virtual bool LeftMargin(SwPaM *) const;
- virtual bool RightMargin(SwPaM *, bool bAPI = false) const;
+ virtual bool LeftMargin(SwPaM *) const SAL_OVERRIDE;
+ virtual bool RightMargin(SwPaM *, bool bAPI = false) const SAL_OVERRIDE;
virtual bool UnitUp(SwPaM *, const SwTwips nOffset = 0,
- bool bSetInReadOnly = false ) const;
+ bool bSetInReadOnly = false ) const SAL_OVERRIDE;
virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0,
- bool bSetInReadOnly = false ) const;
+ bool bSetInReadOnly = false ) const SAL_OVERRIDE;
bool _UnitUp(SwPaM *, const SwTwips nOffset = 0,
bool bSetInReadOnly = false ) const;
bool _UnitDown(SwPaM *, const SwTwips nOffset = 0,
@@ -324,12 +324,12 @@ public:
// Wer den void* falsch casted ist selbst Schuld!
// Auf jedenfall muss der void* auf 0 geprueft werden.
virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR,
- const void *pVoid = 0, bool bNotify = true );
+ const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE;
// nMaxHeight is the required height
// bSplit indicates, that the paragraph has to be split
// bTst indicates, that we are currently doing a test formatting
- virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst );
+ virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ) SAL_OVERRIDE;
// Hier das WouldFit-Aequivalent fuer mal kurz probeweise
// umgehaengte TextFrames, auch hier liefert
@@ -418,8 +418,8 @@ public:
inline SwTwips GetLeftMargin() const;
inline SwTwips GetRightMargin() const;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void CheckDirection( bool bVert );
+ virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
// Liefert die Summe der Zeilenhoehen in pLine zurueck.
sal_uInt16 GetParHeight() const;
@@ -581,7 +581,7 @@ public:
static void repaintTextFrames( const SwTxtNode& rNode );
- virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer);
+ virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE;
};
/*************************************************************************
diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx
index 5d1ea5395fac..93611f173f35 100644
--- a/sw/source/core/inc/undoflystrattr.hxx
+++ b/sw/source/core/inc/undoflystrattr.hxx
@@ -33,10 +33,10 @@ class SwUndoFlyStrAttr : public SwUndo
const OUString& sNewStr );
virtual ~SwUndoFlyStrAttr();
- virtual void UndoImpl( ::sw::UndoRedoContext & );
- virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
private:
SwFlyFrmFmt& mrFlyFrmFmt;
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index 639f6b6d7c67..51e5c7d3cb56 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -92,44 +92,44 @@ public:
::com::sun::star::lang::XUnoTunnel> & xUT);
// MetadatableMixin
- virtual ::sfx2::Metadatable* GetCoreObject();
+ virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XModel > GetModel();
+ ::com::sun::star::frame::XModel > GetModel() SAL_OVERRIDE;
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -137,56 +137,56 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -201,20 +201,20 @@ class SwXFieldmarkParameters
}
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
private:
::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException);
};
@@ -242,13 +242,13 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getFieldType(void)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setFieldType(const OUString& description )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -256,13 +256,13 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
class SwXODFCheckboxField : public SwXFieldmark
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 569710eb06ac..2ef2a690eccb 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -37,7 +37,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
//XServiceInfo
virtual OUString SAL_CALL getImplementationName(void)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
virtual ~SwHyperlinkEventDescriptor();
public:
@@ -71,12 +71,12 @@ public:
~SwFrameEventDescriptor();
virtual OUString SAL_CALL getImplementationName(void)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
- virtual void setMacroItem(const SvxMacroItem& rItem);
- virtual const SvxMacroItem& getMacroItem();
- virtual sal_uInt16 getMacroItemWhich() const;
+ virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE;
+ virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE;
+ virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE;
};
class SwFrameStyleEventDescriptor : public SvEventDescriptor
@@ -91,12 +91,12 @@ public:
~SwFrameStyleEventDescriptor();
virtual OUString SAL_CALL getImplementationName(void)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
- virtual void setMacroItem(const SvxMacroItem& rItem);
- virtual const SvxMacroItem& getMacroItem();
- virtual sal_uInt16 getMacroItemWhich() const;
+ virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE;
+ virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE;
+ virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 0065c2529ce4..e029d49ab18b 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -77,35 +77,35 @@ public:
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -113,40 +113,40 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -185,35 +185,35 @@ public:
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -221,68 +221,68 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XUpdatable
virtual void SAL_CALL update()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextField
virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDependentTextField
virtual void SAL_CALL attachTextFieldMaster(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xFieldMaster)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> SAL_CALL getTextFieldMaster()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -306,21 +306,21 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 4eae5ee007cd..09a6e7bc598f 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -57,32 +57,32 @@ public:
SwXFlatParagraph( SwTxtNode& rTxtNode, const OUString& aExpandText, const ModelToViewHelper& rConversionMap );
virtual ~SwXFlatParagraph();
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL acquire( ) throw();
- virtual void SAL_CALL release( ) throw();
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
+ virtual void SAL_CALL release( ) throw() SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// text::XTextMarkup:
- virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception);
+ virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength,
- const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception);
+ const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange,
- const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception);
+ const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// text::XFlatParagraph:
- virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception);
- virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException, std::exception);
- virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception);
- virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
- virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
- virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
- virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
- virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+ virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
const SwTxtNode* getTxtNode() const;
@@ -90,7 +90,7 @@ public:
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId)
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
SwXFlatParagraph( const SwXFlatParagraph & ); // not defined
@@ -115,15 +115,15 @@ public:
virtual ~SwXFlatParagraphIterator();
// text::XFlatParagraphIterator:
- virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception);
- virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception);
- virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception);
- virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
- virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
+ virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
protected:
// SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
private:
SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ); // not defined
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index 537ca3a4317a..bc8d40bb6ffe 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -57,12 +57,12 @@ private:
protected:
- virtual const SwStartNode *GetStartNode() const;
+ virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor >
CreateCursor()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ~SwXFootnote();
@@ -81,52 +81,52 @@ public:
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw() { OWeakObject::release(); }
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); }
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getTypes()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -134,80 +134,80 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
createEnumeration()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFootnote
virtual OUString SAL_CALL getLabel()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setLabel(const OUString& rLabel)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSimpleText
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor > SAL_CALL
createTextCursor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor > SAL_CALL
createTextCursorByRange(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextPosition)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index 0be41286f40a..a1b5d1d0d5ae 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -76,44 +76,44 @@ public:
CreateXDocumentIndex(SwDoc & rDoc, SwTOXBaseSection const& rSection);
// MetadatableMixin
- virtual ::sfx2::Metadatable* GetCoreObject();
+ virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
- GetModel();
+ GetModel() SAL_OVERRIDE;
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -121,74 +121,74 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XRefreshable
virtual void SAL_CALL refresh()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addRefreshListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener>& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeRefreshListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener>& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDocumentIndex
virtual OUString SAL_CALL getServiceName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL update()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -228,35 +228,35 @@ public:
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -264,56 +264,56 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDocumentIndexMark
virtual OUString SAL_CALL getMarkEntry()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 2d343de927bc..0eee4e645c86 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -112,108 +112,108 @@ public:
::com::sun::star::uno::RuntimeException);
// MetadatableMixin
- virtual ::sfx2::Metadatable * GetCoreObject();
+ virtual ::sfx2::Metadatable * GetCoreObject() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
- GetModel();
+ GetModel() SAL_OVERRIDE;
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XChild
virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL
getParent()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setParent(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface> const& xParent)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::NoSupportException, std::exception);
+ ::com::sun::star::lang::NoSupportException, std::exception) SAL_OVERRIDE;
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
createEnumeration()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextRange
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
- SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getStart()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getString()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setString(const OUString& rString)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSimpleText
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor > SAL_CALL
createTextCursor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor > SAL_CALL
createTextCursorByRange(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextPosition)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL insertString(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xRange,
const OUString& aString, sal_Bool bAbsorb)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL insertControlCharacter(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xRange,
sal_Int16 nControlCharacter, sal_Bool bAbsorb)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XText
virtual void SAL_CALL insertTextContent(
@@ -223,12 +223,12 @@ public:
::com::sun::star::text::XTextContent > & xContent,
sal_Bool bAbsorb)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeTextContent(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent > & xContent)
throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -266,31 +266,31 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -298,54 +298,54 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL
getPropertyValue(const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextField
virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index 953ee5589e96..a8d223393f3d 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -89,21 +89,21 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index fcaf6434dfe7..6011d0912f07 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -152,7 +152,7 @@ protected:
virtual ~SwXTextPortion();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType );
@@ -166,38 +166,38 @@ public:
sal_Bool bIsEnd );
//XTextRange
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XTolerantMultiPropertySet
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XMultiPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XTextContent
virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -210,16 +210,16 @@ public:
//XUnoTunnel
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XContentEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SetRefMark( ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent > xMark)
@@ -284,27 +284,27 @@ public:
//XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
throw( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
class SwXRedlinePortion : public SwXTextPortion
@@ -333,14 +333,14 @@ public:
SwRangeRedline const& rRedline, sal_Bool const bIsStart) throw();
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index 8f5360e3bf78..75db5eee9fbc 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -68,35 +68,35 @@ public:
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -104,56 +104,56 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index 017db44dd49d..651151ef76d1 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -73,44 +73,44 @@ public:
const bool bIndexHeader = false);
// MetadatableMixin
- virtual ::sfx2::Metadatable* GetCoreObject();
+ virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
- GetModel();
+ GetModel() SAL_OVERRIDE;
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
@@ -118,62 +118,62 @@ public:
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertyState
virtual ::com::sun::star::beans::PropertyState SAL_CALL
getPropertyState(const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyState > SAL_CALL
getPropertyStates(
const ::com::sun::star::uno::Sequence<
OUString >& rPropertyNames)
throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyToDefault(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMultiPropertySet
virtual void SAL_CALL setPropertyValues(
@@ -184,55 +184,55 @@ public:
throw (::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL getPropertyValues(
const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertiesChangeListener(
const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertiesChangeListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertiesChangeListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertiesChangeListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL firePropertiesChangeEvent(
const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertiesChangeListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextContent
virtual void SAL_CALL attach(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextSection
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextSection > SAL_CALL
getParentSection()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::text::XTextSection > > SAL_CALL
getChildSections()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 96980afef814..597cfefe0ad4 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -55,16 +55,16 @@ public:
virtual ~SwXTextMarkup();
// ::com::sun::star::text::XTextMarkup:
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::text::XMultiTextMarkup:
- virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
SwXTextMarkup( const SwXTextMarkup & ); // not defined
@@ -72,7 +72,7 @@ private:
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
SwTxtNode* mpTxtNode;
const ModelToViewHelper maConversionMap;
@@ -88,12 +88,12 @@ public:
SwXStringKeyMap();
// ::com::sun::star::container::XStringKeyMap:
- virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception);
- virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception);
- virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception);
- virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception);
+ virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE;
private:
SwXStringKeyMap(SwXStringKeyMap &); // not defined
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index b9ed68134c2e..e43fe77bd487 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -31,7 +31,7 @@ public:
SwURLStateChanged( const SwDoc* pD );
virtual ~SwURLStateChanged();
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index b756e5af5f61..6546a000b2b1 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -181,7 +181,7 @@ public:
SwSizeEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar )
: SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmHeight( pF->Frm().Height() ) {}
virtual ~SwSizeEnterLeave() {}
- virtual void Leave(); // resize message
+ virtual void Leave() SAL_OVERRIDE; // resize message
};
class SwUpperEnterLeave : public SwImplEnterLeave
@@ -191,8 +191,8 @@ public:
SwUpperEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar )
: SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmId( 0 ) {}
virtual ~SwUpperEnterLeave() {}
- virtual void Enter(); // message
- virtual void Leave(); // message of FrmId from upper
+ virtual void Enter() SAL_OVERRIDE; // message
+ virtual void Leave() SAL_OVERRIDE; // message of FrmId from upper
};
class SwFrmChangesLeave : public SwImplEnterLeave
@@ -202,8 +202,8 @@ public:
SwFrmChangesLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar )
: SwImplEnterLeave( pF, nFunct, nAct, pPar ), aFrm( pF->Frm() ) {}
virtual ~SwFrmChangesLeave() {}
- virtual void Enter(); // no message
- virtual void Leave(); // message when resizing the Frm area
+ virtual void Enter() SAL_OVERRIDE; // no message
+ virtual void Leave() SAL_OVERRIDE; // message when resizing the Frm area
};
void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam )
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index a8850aa0f807..fdfb7853e4ce 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3169,7 +3169,7 @@ class SwFrmHolder : private SfxListener
{
SwFrm* pFrm;
bool bSet;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
public:
SwFrmHolder() : pFrm(0), bSet(false) {}
void SetFrm( SwFrm* pHold );
diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx
index f7c40c836813..99ba0e13292a 100644
--- a/sw/source/core/layout/objectformatterlayfrm.hxx
+++ b/sw/source/core/layout/objectformatterlayfrm.hxx
@@ -48,7 +48,7 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter
protected:
- virtual SwFrm& GetAnchorFrm();
+ virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE;
public:
virtual ~SwObjectFormatterLayFrm();
@@ -56,8 +56,8 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter
// #i40147# - add parameter <_bCheckForMovedFwd>.
// Not relevant for objects anchored at layout frame.
virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj,
- const bool _bCheckForMovedFwd = false );
- virtual bool DoFormatObjs();
+ const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE;
+ virtual bool DoFormatObjs() SAL_OVERRIDE;
static SwObjectFormatterLayFrm* CreateObjFormatter(
SwLayoutFrm& _rAnchorLayFrm,
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index 74eff931c680..b29fcadb4b95 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -116,15 +116,15 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
protected:
- virtual SwFrm& GetAnchorFrm();
+ virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE;
public:
virtual ~SwObjectFormatterTxtFrm();
// #i40147# - add parameter <_bCheckForMovedFwd>.
virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj,
- const bool _bCheckForMovedFwd = false );
- virtual bool DoFormatObjs();
+ const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE;
+ virtual bool DoFormatObjs() SAL_OVERRIDE;
/** method to create an instance of <SwObjectFormatterTxtFrm> is
necessary.
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 107a0e0e3ffd..3b72a714f938 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3004,7 +3004,7 @@ namespace
virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence(
const sdr::contact::ViewObjectContact& rOriginal,
- const sdr::contact::DisplayInfo& rDisplayInfo)
+ const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE
{
sal_Bool bPaint( sal_True );
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index ddbb2627c1fd..636b6f8eb08c 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -72,8 +72,8 @@ public:
SwOLELRUCache();
virtual void Notify( const uno::Sequence<
- OUString>& aPropertyNames );
- virtual void Commit();
+ OUString>& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Commit() SAL_OVERRIDE;
void Load();
void InsertObj( SwOLEObj& rObj );
@@ -98,9 +98,9 @@ class SwOLEListener_Impl : public ::cppu::WeakImplHelper1< embed::XStateChangeLi
public:
SwOLEListener_Impl( SwOLEObj* pObj );
void Release();
- virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception);
- virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception);
- virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception);
+ virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
SwOLEListener_Impl::SwOLEListener_Impl( SwOLEObj* pObj )
@@ -158,9 +158,9 @@ public:
SwEmbedObjectLink(SwOLENode* pNode);
virtual ~SwEmbedObjectLink();
- virtual void Closed();
+ virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
bool Connect() { return GetRealObject() != NULL; }
};
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 63ea8f5a5135..1ba49c8e1466 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -855,7 +855,7 @@ class SwMetaPortion : public SwTxtPortion
{
public:
inline SwMetaPortion() { SetWhichPor( POR_META ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 120e2910d406..4568fa2349fc 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -90,11 +90,11 @@ public:
const KSHORT nDistance );
virtual ~SwDropPortion();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
void PaintDrop( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
inline MSHORT GetLines() const { return nLines; }
inline KSHORT GetDistance() const { return nDistance; }
@@ -111,7 +111,7 @@ public:
static void DeleteDropCapCache();
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 39422ec97f9b..23afa3675782 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -30,16 +30,16 @@ class SwExpandPortion : public SwTxtPortion
{
public:
inline SwExpandPortion() { SetWhichPor( POR_EXP ); }
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -58,18 +58,18 @@ public:
bool IsMulti() const { return bMulti; }
void SetMulti( bool bNew ) { bMulti = bNew; }
- virtual SwLinePortion *Compress();
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
MSHORT MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
bool bUnderflow ) const;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -81,12 +81,12 @@ class SwPostItsPortion : public SwExpandPortion
bool bScript;
public:
SwPostItsPortion( bool bScrpt );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
bool IsScript() const { return bScript; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index f6c13a54c88f..3107a1973364 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -69,14 +69,14 @@ public:
inline const SwFont *GetFont() const { return pFnt; }
inline OUString GetExp() const { return aExpand; }
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// Empty fields are also allowed
- virtual SwLinePortion *Compress();
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
inline bool IsFollow() const { return bFollow; }
inline void SetFollow( bool bNew ) { bFollow = bNew; }
@@ -103,12 +103,12 @@ public:
virtual SwFldPortion *Clone( const OUString &rExpand ) const;
// Extra GetTxtSize because of pFnt
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -122,12 +122,12 @@ public:
inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = 0 )
: SwFldPortion( rExpand, pFntL )
{ SetLen(1); SetWhichPor( POR_HIDDEN ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
- OUTPUT_OPERATOR
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -148,15 +148,15 @@ public:
const bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -173,7 +173,7 @@ public:
const bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -198,8 +198,8 @@ public:
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
~SwGrfNumPortion();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
void SetBase( long nLnAscent, long nLnDescent,
long nFlyAscent, long nFlyDescent );
@@ -218,7 +218,7 @@ public:
inline SwTwips GetId() const { return nId; }
inline sal_Int16 GetOrient() const { return eOrient; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -241,10 +241,10 @@ class SwCombinedPortion : public SwFldPortion
sal_uInt8 nProportion; // relative font height
public:
SwCombinedPortion( const OUString &rExpand );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 61967b0ae641..48532fa651f4 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -40,9 +40,9 @@ public:
: SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -57,7 +57,7 @@ class SwFlyCntPortion : public SwLinePortion
bool bDraw : 1; // DrawContact?
bool bMax : 1; // Line adjustment and height == line height
sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom
- virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
public:
// OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
@@ -89,9 +89,9 @@ public:
objectpositioning::AsCharFlags nFlags );
sal_Int32 GetFlyCrsrOfst( const KSHORT nOfst, const Point &rPoint,
SwPosition *pPos, SwCrsrMoveState* pCMS ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 6d2bb5175945..161d3e1730f0 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -40,16 +40,16 @@ public:
KSHORT nOrig = KSHRT_MAX );
KSHORT& Orig() { return nOrigHeight; }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// #i98418#
void SetPreferredScriptType( sal_uInt8 nPreferredScriptType );
const SwTxtFtn* GetTxtFtn() const { return pFtn; };
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -63,7 +63,7 @@ public:
: SwNumberPortion( rExpand, pFntL, true, false, 0, false )
{ SetWhichPor( POR_FTNNUM ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -75,21 +75,21 @@ class SwQuoVadisPortion : public SwFldPortion
OUString aErgo;
public:
SwQuoVadisPortion( const OUString &rExp, const OUString& rStr );
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
void SetNumber( const OUString& rStr ) { aErgo = rStr; }
const OUString GetQuoTxt() const { return aExpand; }
const OUString &GetContTxt() const { return aErgo; }
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -100,12 +100,12 @@ class SwErgoSumPortion : public SwFldPortion
{
public:
SwErgoSumPortion( const OUString &rExp, const OUString& rStr );
- virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
- OUTPUT_OPERATOR
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index 4da5ae294618..7c5edccbec6b 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -44,12 +44,12 @@ public:
inline void MoveAllGlue( SwGluePortion *pTarget );
inline void MoveHalfGlue( SwGluePortion *pTarget );
inline void AdjFixWidth();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -64,7 +64,7 @@ public:
SwFixPortion( const KSHORT nFixWidth, const KSHORT nFixPos );
inline void Fix( const KSHORT nNewFix ) { nFix = nNewFix; }
inline KSHORT Fix() const { return nFix; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -76,7 +76,7 @@ class SwMarginPortion : public SwGluePortion
public:
SwMarginPortion( const KSHORT nFixWidth );
void AdjustRight( const SwLineLayout* pCurr );
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 55e541ff9036..400fd3cbbf18 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -32,13 +32,13 @@ public:
{
SetWhichPor( POR_HYPH );
}
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -55,12 +55,12 @@ public:
SetWhichPor( POR_HYPHSTR );
}
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -75,20 +75,20 @@ class SwSoftHyphPortion : public SwHyphPortion
public:
SwSoftHyphPortion();
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwLinePortion *Compress();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
inline void SetExpand( const bool bNew ) { bExpand = bNew; }
bool IsExpand() const { return bExpand; }
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -99,8 +99,8 @@ class SwSoftHyphStrPortion : public SwHyphStrPortion
{
public:
SwSoftHyphStrPortion( const OUString &rStr );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 92c80d4c6d1c..ef1c3ed4445e 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -103,8 +103,8 @@ private:
public:
// From SwLinePortion
- virtual SwLinePortion *Insert( SwLinePortion *pPortion );
- virtual SwLinePortion *Append( SwLinePortion *pPortion );
+ virtual SwLinePortion *Insert( SwLinePortion *pPortion ) SAL_OVERRIDE;
+ virtual SwLinePortion *Append( SwLinePortion *pPortion ) SAL_OVERRIDE;
inline SwLinePortion *GetFirstPortion() const;
// Flags
@@ -165,7 +165,7 @@ public:
{ return _GetHangingMargin(); }
// For special treatment for empty lines
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Stuff for justified alignment
inline bool IsSpaceAdd() { return pLLSpaceAdd != NULL; }
@@ -229,7 +229,7 @@ public:
const SwLinePortion* _pDontConsiderPortion = NULL,
const bool _bNoFlyCntPorAndLinePor = false ) const;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout)
};
@@ -341,7 +341,7 @@ public:
void dumpAsXml( xmlTextWriter* writer, SwTxtFrm* pTxtFrm );
#endif
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion)
};
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 616fa2d5144c..16561993e4d0 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -33,8 +33,10 @@ class SwPortionHandler;
// The portions output operators are virtual methods of the portion.
#ifdef DBG_UTIL
#define OUTPUT_OPERATOR virtual SvStream & operator<<( SvStream & aOs ) const;
+#define OUTPUT_OPERATOR_OVERRIDE virtual SvStream & operator<<( SvStream & aOs ) const SAL_OVERRIDE;
#else
#define OUTPUT_OPERATOR
+#define OUTPUT_OPERATOR_OVERRIDE
#endif
// Portion groups
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index ed0d28ddce15..8f11e91cc320 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -139,8 +139,8 @@ public:
inline bool OnTop() const { return bTop; }
void ActualizeTabulator();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const;
// Summarize the internal lines to calculate the (external) size
@@ -154,9 +154,9 @@ public:
{ return ( HasRotation() ? ( IsRevers() ? 2700 : 900 ) : 0 ); }
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
class SwDoubleLinePortion : public SwMultiPortion
@@ -190,8 +190,8 @@ public:
inline sal_Int32 GetBlank1() const { return nBlank1; }
inline sal_Int32 GetBlank2() const { return nBlank2; }
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
- virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE;
};
class SwRubyPortion : public SwMultiPortion
@@ -234,9 +234,9 @@ public:
// Get number of blanks for justified alignment
sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf ) const;
// Calculates extra spacing based on number of blanks
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Manipulate the spacing array at pCurr
- virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const;
+ virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE;
};
// For cursor travelling in multiportions
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 553faee334b3..ccf7f7152760 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -29,8 +29,8 @@ class SwRefPortion : public SwTxtPortion
{
public:
inline SwRefPortion(){ SetWhichPor( POR_REF ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -43,15 +43,15 @@ class SwIsoRefPortion : public SwRefPortion
public:
SwIsoRefPortion();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual SwLinePortion *Compress();
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index 17615690839f..82553082f6a3 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -34,8 +34,8 @@ class SwTmpEndPortion : public SwLinePortion
{
public:
SwTmpEndPortion( const SwLinePortion &rPortion );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -47,16 +47,16 @@ class SwBreakPortion : public SwLinePortion
public:
SwBreakPortion( const SwLinePortion &rPortion );
// Returns 0 if we have no usable data
- virtual SwLinePortion *Compress();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -83,10 +83,10 @@ public:
// of rPortion. It is only used for kerning portions for grid mode
SwKernPortion( const SwLinePortion &rPortion );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -100,11 +100,11 @@ class SwArrowPortion : public SwLinePortion
public:
SwArrowPortion( const SwLinePortion &rPortion );
SwArrowPortion( const SwTxtPaintInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual SwLinePortion *Compress();
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
inline bool IsLeft() const { return bLeft; }
inline const Point& GetPos() const { return aPos; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -136,8 +136,8 @@ public:
inline SwHiddenTextPortion( sal_Int32 nLen )
{ SetWhichPor( POR_HIDDEN_TXT ); SetLen( nLen ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
};
/*************************************************************************
@@ -160,9 +160,9 @@ public:
SetWhichPor( POR_CONTROLCHAR ); SetLen( 1 );
}
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index a8cf38b05950..525bfbe07651 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -35,18 +35,18 @@ class SwTabPortion : public SwFixPortion
bool PreFormat( SwTxtFormatInfo &rInf );
public:
SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
bool PostFormat( SwTxtFormatInfo &rInf );
inline bool IsFilled() const { return 0 != cFill; }
inline KSHORT GetTabPos() const { return nTabPos; }
inline bool IsAutoTabStop() const { return bAutoTabStop; }
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -59,7 +59,7 @@ public:
inline SwTabLeftPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0', bool bAutoTab = true )
: SwTabPortion( nTabPosVal, cFillChar, bAutoTab )
{ SetWhichPor( POR_TABLEFT ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -72,7 +72,7 @@ public:
inline SwTabRightPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
: SwTabPortion( nTabPosVal, cFillChar )
{ SetWhichPor( POR_TABRIGHT ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -85,7 +85,7 @@ public:
inline SwTabCenterPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
: SwTabPortion( nTabPosVal, cFillChar )
{ SetWhichPor( POR_TABCENTER ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -122,7 +122,7 @@ public:
return mnWidthOfPortionsUpTpDecimalPosition;
}
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -136,7 +136,7 @@ public:
const sal_Unicode cFillChar = '\0' )
: SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
{ SetLen( 0 ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index dc4db1a7068b..9d86686a5a07 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -30,8 +30,8 @@ class SwToxPortion : public SwTxtPortion
{
public:
inline SwToxPortion(){ SetWhichPor( POR_TOX ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -44,15 +44,15 @@ class SwIsoToxPortion : public SwToxPortion
public:
SwIsoToxPortion();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual SwLinePortion *Compress();
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 1ec658a9c9c2..2a9b275c3bcc 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -39,13 +39,13 @@ class SwTxtPortion : public SwLinePortion
public:
inline SwTxtPortion(){ SetWhichPor( POR_TXT ); }
SwTxtPortion( const SwLinePortion &rPortion );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Counts the spaces for justified paragraph
sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf, sal_Int32& rCnt ) const;
@@ -53,9 +53,9 @@ public:
bool CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess );
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwTxtPortion)
};
@@ -64,11 +64,11 @@ class SwTxtInputFldPortion : public SwTxtPortion
public:
SwTxtInputFldPortion();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
private:
bool mbContainsInputFieldStart;
@@ -87,14 +87,14 @@ public:
SwHolePortion( const SwTxtPortion &rPor );
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
- virtual SwLinePortion *Compress();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwHolePortion)
};
@@ -103,8 +103,8 @@ class SwFieldMarkPortion : public SwTxtPortion
public:
inline SwFieldMarkPortion() : SwTxtPortion()
{ }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
};
class SwFieldFormPortion : public SwTxtPortion
@@ -112,8 +112,8 @@ class SwFieldFormPortion : public SwTxtPortion
public:
inline SwFieldFormPortion() : SwTxtPortion()
{ }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 021f5e040ac0..aca6c89025d6 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -46,7 +46,7 @@ class SwTxtLineAccess : public SwCacheAccess
{
protected:
- virtual SwCacheObj *NewObj();
+ virtual SwCacheObj *NewObj() SAL_OVERRIDE;
public:
SwTxtLineAccess( const SwTxtFrm *pOwner );
@@ -55,7 +55,7 @@ public:
inline SwTxtLine &GetTxtLine();
- virtual bool IsAvailable() const;
+ virtual bool IsAvailable() const SAL_OVERRIDE;
};
inline SwTxtLine &SwTxtLineAccess::GetTxtLine()
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 7400d8de6ab7..54c066bf98f6 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -118,7 +118,7 @@ class XmlPortionDumper:public SwPortionHandler
virtual void Text( sal_uInt16 nLength,
sal_uInt16 nType,
sal_Int32 nHeight,
- sal_Int32 nWidth)
+ sal_Int32 nWidth) SAL_OVERRIDE
{
ofs += nLength;
xmlTextWriterStartElement( writer, BAD_CAST( "Text" ) );
@@ -150,7 +150,7 @@ class XmlPortionDumper:public SwPortionHandler
const OUString & rText,
sal_uInt16 nType,
sal_Int32 nHeight,
- sal_Int32 nWidth )
+ sal_Int32 nWidth ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "Special" ) );
xmlTextWriterWriteFormatAttribute( writer,
@@ -175,7 +175,7 @@ class XmlPortionDumper:public SwPortionHandler
ofs += nLength;
}
- virtual void LineBreak( KSHORT nWidth )
+ virtual void LineBreak( KSHORT nWidth ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "LineBreak" ) );
if (nWidth > 0)
@@ -189,7 +189,7 @@ class XmlPortionDumper:public SwPortionHandler
* @param nLength
* number of 'model string' characters to be skipped
*/
- virtual void Skip( sal_uInt16 nLength )
+ virtual void Skip( sal_uInt16 nLength ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "Skip" ) );
xmlTextWriterWriteFormatAttribute( writer,
@@ -199,7 +199,7 @@ class XmlPortionDumper:public SwPortionHandler
ofs += nLength;
}
- virtual void Finish( )
+ virtual void Finish( ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "Finish" ) );
xmlTextWriterEndElement( writer );
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx
index 058f74a53216..4d18dd7e3489 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -52,12 +52,12 @@ public:
~SwGrammarContact() { aTimer.Stop(); delete mpProxyList; }
// (pure) virtual functions of IGrammarContact
- virtual void updateCursorPosition( const SwPosition& rNewPos );
- virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate );
- virtual void finishGrammarCheck( SwTxtNode& rTxtNode );
+ virtual void updateCursorPosition( const SwPosition& rNewPos ) SAL_OVERRIDE;
+ virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ) SAL_OVERRIDE;
+ virtual void finishGrammarCheck( SwTxtNode& rTxtNode ) SAL_OVERRIDE;
protected:
// virtual function of SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
SwGrammarContact::SwGrammarContact() : mpProxyList(0), mbFinished( false )
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 8a9945babcb6..9da547bb1b9a 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -129,8 +129,8 @@ protected:
public:
SwDoGetCapitalSize( SwDrawTextInfo &rInfo ) : SwDoCapitals ( rInfo ) { }
virtual ~SwDoGetCapitalSize() {}
- virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont );
- virtual void Do();
+ virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE;
+ virtual void Do() SAL_OVERRIDE;
const Size &GetSize() const { return aTxtSize; }
};
@@ -190,8 +190,8 @@ public:
, m_nBreak( -1 )
{ }
virtual ~SwDoGetCapitalBreak() {}
- virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont );
- virtual void Do();
+ virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE;
+ virtual void Do() SAL_OVERRIDE;
sal_Int32 getBreak() const { return m_nBreak; }
};
@@ -273,8 +273,8 @@ public:
SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0)
{ }
virtual ~SwDoDrawCapital() {}
- virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont );
- virtual void Do();
+ virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE;
+ virtual void Do() SAL_OVERRIDE;
void DrawSpace( Point &rPos );
};
@@ -369,8 +369,8 @@ public:
SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0), nCrsr( 0 ), nOfst( nOfs )
{ }
virtual ~SwDoCapitalCrsrOfst() {}
- virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont );
- virtual void Do();
+ virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE;
+ virtual void Do() SAL_OVERRIDE;
void DrawSpace( const Point &rPos );
inline sal_Int32 GetCrsr(){ return nCrsr; }
@@ -446,7 +446,7 @@ class SwDoDrawStretchCapital : public SwDoDrawCapital
const sal_uInt16 nCapWidth;
const sal_uInt16 nOrgWidth;
public:
- virtual void Do();
+ virtual void Do() SAL_OVERRIDE;
SwDoDrawStretchCapital( SwDrawTextInfo &rInfo, const sal_uInt16 nCapitalWidth )
: SwDoDrawCapital( rInfo ),
diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx
index 713d12eab1fb..21eb9e2c1e69 100644
--- a/sw/source/core/uibase/dbui/dbmgr.cxx
+++ b/sw/source/core/uibase/dbui/dbmgr.cxx
@@ -208,7 +208,7 @@ class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1
{
SwNewDBMgr& rDBMgr;
- virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
public:
SwConnectionDisposedListener_Impl(SwNewDBMgr& rMgr);
~SwConnectionDisposedListener_Impl();
diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx
index 9f240d9aa40a..9ba3200c760c 100644
--- a/sw/source/core/uibase/dbui/dbtree.cxx
+++ b/sw/source/core/uibase/dbui/dbtree.cxx
@@ -81,10 +81,10 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener >
pWrtSh(pShell) {}
~SwDBTreeList_Impl();
- virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception);
- virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception);
- virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception);
- virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception);
+ virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool HasContext();
SwWrtShell* GetWrtShell() { return pWrtSh;}
diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
index 67966f12abf5..bf16a14e828a 100644
--- a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
@@ -164,13 +164,13 @@ public:
SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg);
~SwMailDispatcherListener_Impl();
- virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher);
- virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher);
- virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher);
+ virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
+ virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
+ virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE;
virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher,
- uno::Reference< mail::XMailMessage> xMailMessage);
+ uno::Reference< mail::XMailMessage> xMailMessage) SAL_OVERRIDE;
virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher,
- uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage);
+ uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) SAL_OVERRIDE;
static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage );
};
diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx
index 324b8b6d0ce9..6143905efc5a 100644
--- a/sw/source/core/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx
@@ -155,8 +155,8 @@ public:
SwMailMergeConfigItem_Impl();
~SwMailMergeConfigItem_Impl();
- virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
+ virtual void Commit() SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
const Sequence< OUString>
GetAddressBlocks(sal_Bool bConvertToConfig = sal_False) const;
void SetAddressBlocks(
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index 9e148f46e5f8..4e53bfacc219 100644
--- a/sw/source/core/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
@@ -163,8 +163,8 @@ public:
SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh );
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
- virtual void Closed();
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
+ virtual void Closed() SAL_OVERRIDE;
sal_Bool WriteData( SvStream& rStrm );
diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
index 5ea13c2cfe93..d3f1ee04bcf8 100644
--- a/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
@@ -53,7 +53,7 @@ private:
protected:
virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
+ const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
AnchorPrimitive( const basegfx::B2DPolygon& rTriangle,
@@ -85,7 +85,7 @@ public:
bool getShadow() const { return mbShadow; }
bool getLineSolid() const { return mbLineSolid; }
- virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const;
+ virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
DeclPrimitive2DIDBlock()
};
diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
index 7c86e1abe013..c53ef7a04c9b 100644
--- a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
@@ -100,7 +100,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
void implResetGeometry();
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
private:
// object's geometry
diff --git a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
index c1334e8e077b..a5b38790ffbd 100644
--- a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
@@ -35,12 +35,12 @@ class AnnotationMenuButton : public MenuButton
~AnnotationMenuButton();
// overloaded <MenuButton> methods
- virtual void Select();
+ virtual void Select() SAL_OVERRIDE;
// overloaded <Window> methods
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void Paint( const Rectangle& rRect );
- virtual void KeyInput( const KeyEvent& rKeyEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
private:
sw::sidebarwindows::SwSidebarWin& mrSidebarWin;
diff --git a/sw/source/core/uibase/docvw/OverlayRanges.hxx b/sw/source/core/uibase/docvw/OverlayRanges.hxx
index ccbe668211aa..8fd7cf46edb9 100755..100644
--- a/sw/source/core/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/core/uibase/docvw/OverlayRanges.hxx
@@ -40,7 +40,7 @@ namespace sw
bool mbShowSolidBorder;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
static OverlayRanges* CreateOverlayRange(
diff --git a/sw/source/core/uibase/docvw/PageBreakWin.cxx b/sw/source/core/uibase/docvw/PageBreakWin.cxx
index 1380fdfcc469..b6a6c5ce2419 100644
--- a/sw/source/core/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/core/uibase/docvw/PageBreakWin.cxx
@@ -61,7 +61,7 @@ namespace
SwDashedLine( pParent, pColorFn ),
m_pWin( pWin ) {};
- virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
};
void SwBreakDashedLine::MouseMove( const MouseEvent& rMEvt )
diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
index efb1a5d68e27..2b9b4d2fa7f8 100644
--- a/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
@@ -45,7 +45,7 @@ private:
protected:
virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
+ const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
ShadowPrimitive(
@@ -63,7 +63,7 @@ public:
const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
ShadowState getShadowState() const { return maShadowState; }
- virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const;
+ virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
DeclPrimitive2DIDBlock()
};
diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
index d692ec86a75b..d0e57d043584 100644
--- a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
@@ -37,7 +37,7 @@ class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
{
protected:
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
private:
basegfx::B2DPoint maSecondPosition;
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
index 37829b290a5a..f6f9fafc54ce 100644
--- a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
@@ -39,16 +39,16 @@ class SidebarTxtControl : public Control
SwPostItMgr& mrPostItMgr;
protected:
- virtual void Paint( const Rectangle& rRect);
- virtual void KeyInput( const KeyEvent& rKeyEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void LoseFocus();
- virtual void RequestHelp(const HelpEvent &rEvt);
- virtual OUString GetSurroundingText() const;
- virtual Selection GetSurroundingTextSelection() const;
+ virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
+ virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
+ virtual void LoseFocus() SAL_OVERRIDE;
+ virtual void RequestHelp(const HelpEvent &rEvt) SAL_OVERRIDE;
+ virtual OUString GetSurroundingText() const SAL_OVERRIDE;
+ virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE;
DECL_LINK( Select, Menu* );
@@ -59,13 +59,13 @@ class SidebarTxtControl : public Control
SwPostItMgr& rPostItMgr );
~SidebarTxtControl();
- virtual void GetFocus();
+ virtual void GetFocus() SAL_OVERRIDE;
OutlinerView* GetTextView() const;
DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
};
} } // end of namespace sw::sidebarwindows
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
index 0ab0c43a33ae..5bbd2e8eef2e 100644
--- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -43,15 +43,15 @@ class SidebarTextEditSource : public SvxEditSource,
SidebarTextEditSource( SidebarTxtControl& rSidebarTxtControl );
virtual ~SidebarTextEditSource();
- virtual SvxEditSource* Clone() const;
+ virtual SvxEditSource* Clone() const SAL_OVERRIDE;
- virtual SvxTextForwarder* GetTextForwarder();
- virtual SvxViewForwarder* GetViewForwarder();
+ virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE;
+ virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE;
virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
- virtual void UpdateData();
+ virtual void UpdateData() SAL_OVERRIDE;
- virtual SfxBroadcaster& GetBroadcaster() const;
+ virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE;
DECL_LINK( NotifyHdl, EENotify* );
private:
@@ -134,24 +134,24 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
virtual sal_Int32 SAL_CALL
getAccessibleChildCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int32 i )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
addAccessibleEventListener (
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
removeAccessibleEventListener (
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
- virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+ virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
private:
SidebarTxtControl& mrSidebarTxtControl;
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
index 051c5ecd7758..b8078c7e1c84 100644
--- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -33,7 +33,7 @@ class SidebarTxtControlAccessible : public VCLXWindow
virtual ~SidebarTxtControlAccessible();
virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext >
- CreateAccessibleContext();
+ CreateAccessibleContext() SAL_OVERRIDE;
private:
SidebarTxtControl& mrSidebarTxtControl;
diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
index 99ba832a60db..c9201556017b 100644
--- a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
@@ -54,7 +54,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
}
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getAccessibleParent() throw (css::uno::RuntimeException, std::exception)
+ getAccessibleParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
osl::MutexGuard aGuard(maMutex);
@@ -69,7 +69,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
return xAccParent;
}
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception)
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
osl::MutexGuard aGuard(maMutex);
diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
index c86516d5ce99..739865e609db 100644
--- a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
@@ -39,7 +39,7 @@ class SidebarWinAccessible : public VCLXWindow
virtual ~SidebarWinAccessible();
virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext >
- CreateAccessibleContext();
+ CreateAccessibleContext() SAL_OVERRIDE;
void ChangeSidebarItem( const SwSidebarItem& rSidebarItem );
diff --git a/sw/source/core/uibase/docvw/srcedtw.cxx b/sw/source/core/uibase/docvw/srcedtw.cxx
index 65c6f25c02c5..968f3986b3cf 100644
--- a/sw/source/core/uibase/docvw/srcedtw.cxx
+++ b/sw/source/core/uibase/docvw/srcedtw.cxx
@@ -215,7 +215,7 @@ private:
virtual ~ChangesListener() {}
virtual void SAL_CALL disposing(css::lang::EventObject const &)
- throw (css::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
osl::MutexGuard g(editor_.mutex_);
editor_.notifier_.clear();
@@ -223,7 +223,7 @@ private:
virtual void SAL_CALL propertiesChange(
css::uno::Sequence< css::beans::PropertyChangeEvent > const &)
- throw (css::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
SolarMutexGuard g;
editor_.SetFont();
diff --git a/sw/source/core/uibase/inc/DashedLine.hxx b/sw/source/core/uibase/inc/DashedLine.hxx
index 14ea2ef2507d..0944767a21e4 100644
--- a/sw/source/core/uibase/inc/DashedLine.hxx
+++ b/sw/source/core/uibase/inc/DashedLine.hxx
@@ -22,7 +22,7 @@ public:
SwDashedLine( Window* pParent, Color& ( *pColorFn )() );
~SwDashedLine( );
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
index 48ee686e8fe6..ad8a48b8109d 100644
--- a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
+++ b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
@@ -46,7 +46,7 @@ class DropDownFieldDialog : public SvxStandardDialog
SwDropDownField* pDropField;
DECL_LINK(ButtonHdl, PushButton*);
- virtual void Apply();
+ virtual void Apply() SAL_OVERRIDE;
public:
DropDownFieldDialog( Window *pParent, SwWrtShell &rSh,
SwField* pField, sal_Bool bNextButton = sal_False );
diff --git a/sw/source/core/uibase/inc/HeaderFooterWin.hxx b/sw/source/core/uibase/inc/HeaderFooterWin.hxx
index 945d02de07e6..bf2a52c0bcf4 100644
--- a/sw/source/core/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/core/uibase/inc/HeaderFooterWin.hxx
@@ -34,12 +34,12 @@ public:
void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd );
- virtual void Paint( const Rectangle& rRect );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void Select( );
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void Select( ) SAL_OVERRIDE;
- virtual void ShowAll( bool bShow );
- virtual bool Contains( const Point &rDocPt ) const;
+ virtual void ShowAll( bool bShow ) SAL_OVERRIDE;
+ virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE;
bool IsHeader() { return m_bIsHeader; };
bool IsEmptyHeaderFooter( );
@@ -47,7 +47,7 @@ public:
void ExecuteCommand(sal_uInt16 nSlot);
- void SetReadonly( bool bReadonly );
+ void SetReadonly( bool bReadonly ) SAL_OVERRIDE;
private:
DECL_LINK( FadeHandler, void * );
diff --git a/sw/source/core/uibase/inc/PageBreakWin.hxx b/sw/source/core/uibase/inc/PageBreakWin.hxx
index 9e9ed283b182..c0eb854a1b7e 100644
--- a/sw/source/core/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/core/uibase/inc/PageBreakWin.hxx
@@ -36,19 +36,19 @@ public:
SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm );
~SwPageBreakWin( );
- virtual void Paint( const Rectangle& rRect );
- virtual void Select( );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void Activate( );
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Select( ) SAL_OVERRIDE;
+ virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void Activate( ) SAL_OVERRIDE;
void UpdatePosition( const Point* pEvtPt = NULL );
- virtual void ShowAll( bool bShow );
- virtual bool Contains( const Point &rDocPt ) const;
+ virtual void ShowAll( bool bShow ) SAL_OVERRIDE;
+ virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE;
const SwPageFrm* GetPageFrame( );
- void SetReadonly( bool bReadonly );
+ void SetReadonly( bool bReadonly ) SAL_OVERRIDE;
void Fade( bool bFadeIn );
diff --git a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
index 922841304721..7bc8dcfea56c 100644
--- a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
@@ -38,15 +38,15 @@ class SwSpellDialogChildWindow
void LockFocusNotification(bool bLock);
protected:
- virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck);
- virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck);
- virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage);
- virtual bool HasAutoCorrection();
- virtual bool HasGrammarChecking();
- virtual bool IsGrammarChecking();
- virtual void SetGrammarChecking(bool bOn);
- virtual void GetFocus();
- virtual void LoseFocus();
+ virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) SAL_OVERRIDE;
+ virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE;
+ virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) SAL_OVERRIDE;
+ virtual bool HasAutoCorrection() SAL_OVERRIDE;
+ virtual bool HasGrammarChecking() SAL_OVERRIDE;
+ virtual bool IsGrammarChecking() SAL_OVERRIDE;
+ virtual void SetGrammarChecking(bool bOn) SAL_OVERRIDE;
+ virtual void GetFocus() SAL_OVERRIDE;
+ virtual void LoseFocus() SAL_OVERRIDE;
public:
SwSpellDialogChildWindow (
diff --git a/sw/source/core/uibase/inc/SwXFilterOptions.hxx b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
index 8e39c494f529..6a117372c5f1 100644
--- a/sw/source/core/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
@@ -55,39 +55,39 @@ public:
// XPropertyAccess
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
- SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aProps )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XExecutableDialog
virtual void SAL_CALL setTitle( const OUString& aTitle )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XImporter
virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent >& xDoc )
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XExporter
virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent >& xDoc )
throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/source/core/uibase/inc/actctrl.hxx b/sw/source/core/uibase/inc/actctrl.hxx
index 0111eb1de37d..d51ac3dec526 100644
--- a/sw/source/core/uibase/inc/actctrl.hxx
+++ b/sw/source/core/uibase/inc/actctrl.hxx
@@ -31,7 +31,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField
protected:
virtual void Action();
- virtual bool Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
NumEditAction( Window* pParent, const ResId& rResId ) :
NumericField(pParent, rResId) {}
@@ -47,8 +47,8 @@ class SW_DLLPUBLIC NoSpaceEdit : public Edit
{
OUString sForbiddenChars;
protected:
- virtual void KeyInput( const KeyEvent& );
- virtual void Modify();
+ virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE;
+ virtual void Modify() SAL_OVERRIDE;
public:
NoSpaceEdit( Window* pParent );
@@ -81,7 +81,7 @@ public:
ReturnActionEdit(Window* pParent, WinBits nStyle)
: Edit(pParent, nStyle){}
~ReturnActionEdit();
- virtual void KeyInput( const KeyEvent& );
+ virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE;
void SetReturnActionLink(const Link& rLink)
{ aReturnActionLink = rLink;}
diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx
index 314188cc8c2f..02fe9f399ed4 100644
--- a/sw/source/core/uibase/inc/annotsh.hxx
+++ b/sw/source/core/uibase/inc/annotsh.hxx
@@ -66,7 +66,7 @@ public:
void StateSearch(SfxItemSet &);
virtual ::svl::IUndoManager*
- GetUndoManager();
+ GetUndoManager() SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/uibase/inc/autoedit.hxx b/sw/source/core/uibase/inc/autoedit.hxx
index 94d81b771527..606489f3a2af 100644
--- a/sw/source/core/uibase/inc/autoedit.hxx
+++ b/sw/source/core/uibase/inc/autoedit.hxx
@@ -27,7 +27,7 @@ public:
AutoEdit( Window* pParent, ResId aResId ) : Edit( pParent, aResId ){}
protected:
- virtual void KeyInput( const KeyEvent& rEvent );
+ virtual void KeyInput( const KeyEvent& rEvent ) SAL_OVERRIDE;
};
// Implementation in autocorr.cxx
diff --git a/sw/source/core/uibase/inc/barcfg.hxx b/sw/source/core/uibase/inc/barcfg.hxx
index f0e05c11dde9..117fa3cff00a 100644
--- a/sw/source/core/uibase/inc/barcfg.hxx
+++ b/sw/source/core/uibase/inc/barcfg.hxx
@@ -30,8 +30,8 @@ public:
SwToolbarConfigItem( bool bWeb );
~SwToolbarConfigItem();
- virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
+ virtual void Commit() SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId );
};
diff --git a/sw/source/core/uibase/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx
index dcf59bb97efb..63c4082599e3 100644
--- a/sw/source/core/uibase/inc/bmpwin.hxx
+++ b/sw/source/core/uibase/inc/bmpwin.hxx
@@ -38,9 +38,9 @@ private:
sal_Bool bGraphic : 1;
bool bLeftAlign : 1;
- virtual void Paint(const Rectangle& rRect);
+ virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
- virtual Size GetOptimalSize() const;
+ virtual Size GetOptimalSize() const SAL_OVERRIDE;
public:
BmpWindow(Window* pPar, WinBits nStyle);
diff --git a/sw/source/core/uibase/inc/bookctrl.hxx b/sw/source/core/uibase/inc/bookctrl.hxx
index a8ce181fd7fc..7771fb326556 100644
--- a/sw/source/core/uibase/inc/bookctrl.hxx
+++ b/sw/source/core/uibase/inc/bookctrl.hxx
@@ -26,12 +26,12 @@
class SwBookmarkControl : public SfxStatusBarControl
{
- virtual void Command( const CommandEvent& rCEvt );
+ virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState );
- virtual void Paint( const UserDrawEvent& rEvt );
+ const SfxPoolItem* pState ) SAL_OVERRIDE;
+ virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE;
SFX_DECL_STATUSBAR_CONTROL();
diff --git a/sw/source/core/uibase/inc/bookmark.hxx b/sw/source/core/uibase/inc/bookmark.hxx
index 2c896c17d3eb..ff1179c2d9bc 100644
--- a/sw/source/core/uibase/inc/bookmark.hxx
+++ b/sw/source/core/uibase/inc/bookmark.hxx
@@ -35,7 +35,7 @@ class BookmarkCombo : public SwComboBox
sal_Int32 GetNextSelEntryPos(sal_Int32 nPos) const;
sal_Int32 GetSelEntryPos(sal_Int32 nPos) const;
- virtual bool PreNotify(NotifyEvent& rNEvt);
+ virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE;
public:
BookmarkCombo(Window* pWin, WinBits nStyle);
@@ -58,7 +58,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog
DECL_LINK(ModifyHdl, BookmarkCombo *);
DECL_LINK(DeleteHdl, void *);
- virtual void Apply();
+ virtual void Apply() SAL_OVERRIDE;
public:
SwInsertBookmarkDlg(Window *pParent, SwWrtShell &rSh, SfxRequest& rReq);
diff --git a/sw/source/core/uibase/inc/break.hxx b/sw/source/core/uibase/inc/break.hxx
index 00933a759b4f..6dd6356e7343 100644
--- a/sw/source/core/uibase/inc/break.hxx
+++ b/sw/source/core/uibase/inc/break.hxx
@@ -59,7 +59,7 @@ class SwBreakDlg: public SvxStandardDialog
void CheckEnable();
protected:
- virtual void Apply();
+ virtual void Apply() SAL_OVERRIDE;
public:
SwBreakDlg( Window *pParent, SwWrtShell &rSh );
diff --git a/sw/source/core/uibase/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx
index bcd36c4594e8..871252854288 100644
--- a/sw/source/core/uibase/inc/cfgitems.hxx
+++ b/sw/source/core/uibase/inc/cfgitems.hxx
@@ -68,8 +68,8 @@ public:
SwDocDisplayItem( const SwViewOption& rVOpt,
sal_uInt16 nWhich );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual bool operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
void operator=( const SwDocDisplayItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
};
@@ -104,8 +104,8 @@ public:
SwElemItem(const SwElemItem& rElemItem);
SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual bool operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
void operator=( const SwElemItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
@@ -127,9 +127,9 @@ public:
SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData );
SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
- virtual bool operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
const OUString &GetFax() const { return sFaxName; }
void SetFax( const OUString& rFax) { sFaxName = rFax; }
@@ -171,8 +171,8 @@ public:
SwShadowCursorItem( const SwShadowCursorItem& rElemItem );
SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual bool operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
void operator=( const SwShadowCursorItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
@@ -210,8 +210,8 @@ public:
SfxPoolItem(_nWhich){};
SwTestItem( const SwTestItem& pTestItem);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual bool operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/uibase/inc/changedb.hxx b/sw/source/core/uibase/inc/changedb.hxx
index 4e8e31acce58..a5d048821d66 100644
--- a/sw/source/core/uibase/inc/changedb.hxx
+++ b/sw/source/core/uibase/inc/changedb.hxx
@@ -52,7 +52,7 @@ class SwChangeDBDlg: public SvxStandardDialog
DECL_LINK(ButtonHdl, void *);
DECL_LINK(AddDBHdl, void *);
- virtual void Apply();
+ virtual void Apply() SAL_OVERRIDE;
void UpdateFlds();
void FillDBPopup();
SvTreeListEntry* Insert(const OUString& rDBName);
diff --git a/sw/source/core/uibase/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx
index d233b37a9143..5b7a077e4d66 100644
--- a/sw/source/core/uibase/inc/chrdlg.hxx
+++ b/sw/source/core/uibase/inc/chrdlg.hxx
@@ -54,7 +54,7 @@ public:
~SwCharDlg();
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
};
class SwCharURLPage : public SfxTabPage
@@ -85,8 +85,8 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/uibase/inc/colex.hxx b/sw/source/core/uibase/inc/colex.hxx
index dc7d25b1ba73..4cb67723b036 100644
--- a/sw/source/core/uibase/inc/colex.hxx
+++ b/sw/source/core/uibase/inc/colex.hxx
@@ -49,7 +49,7 @@ class SW_DLLPUBLIC SwPageGridExample : public SwPageExample
protected:
virtual void DrawPage( const Point& rPoint,
const bool bSecond,
- const bool bEnabled );
+ const bool bEnabled ) SAL_OVERRIDE;
public:
SwPageGridExample(Window* pPar) :
SwPageExample(pPar),
@@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwColExample : public SwPageExample
protected:
virtual void DrawPage( const Point& rPoint,
const bool bSecond,
- const bool bEnabled );
+ const bool bEnabled ) SAL_OVERRIDE;
public:
SwColExample(Window* pPar)
@@ -94,14 +94,14 @@ private:
SwFmtCol m_aCols;
protected:
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
public:
SwColumnOnlyExample(Window*);
void SetColumns(const SwFmtCol& rCol);
- virtual Size GetOptimalSize() const;
+ virtual Size GetOptimalSize() const SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_UI_INC_COLEX_HXX
diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
index ca7c55c2e692..9102eb102152 100644
--- a/sw/source/core/uibase/inc/column.hxx
+++ b/sw/source/core/uibase/inc/column.hxx
@@ -81,8 +81,8 @@ public:
: ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER)
{
}
- virtual void UserDraw( const UserDrawEvent& rUDEvt );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -162,8 +162,8 @@ class SwColumnPage : public SfxTabPage
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual void ActivatePage(const SfxItemSet& rSet);
- virtual int DeactivatePage(SfxItemSet *pSet);
+ virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
+ virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
SwColumnPage(Window *pParent, const SfxItemSet &rSet);
@@ -177,8 +177,8 @@ public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
static sal_uInt16* GetRanges();
- virtual bool FillItemSet(SfxItemSet &rSet);
- virtual void Reset(const SfxItemSet &rSet);
+ virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
+ virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
void SetFrmMode(sal_Bool bMod);
void SetPageWidth(long nPageWidth);
diff --git a/sw/source/core/uibase/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx
index 354a625468f2..62ec96a421ea 100644
--- a/sw/source/core/uibase/inc/conarc.hxx
+++ b/sw/source/core/uibase/inc/conarc.hxx
@@ -36,11 +36,11 @@ public:
ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
// Mouse- & Key-Events
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+ virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual void Activate(const sal_uInt16 nSlotId); // activate function
- virtual void Deactivate();
+ virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
+ virtual void Deactivate() SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX
diff --git a/sw/source/core/uibase/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx
index 96d6707b9a90..8e38ff85caa3 100644
--- a/sw/source/core/uibase/inc/concustomshape.hxx
+++ b/sw/source/core/uibase/inc/concustomshape.hxx
@@ -44,18 +44,18 @@ class ConstCustomShape : public SwDrawBase
ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq );
// Mouse- & Key-Events
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+ virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual void Activate(const sal_uInt16 nSlotId); // activate function
+ virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
OUString GetShapeType() const;
static OUString GetShapeTypeFromRequest( SfxRequest& rReq );
- virtual void CreateDefaultObject();
+ virtual void CreateDefaultObject() SAL_OVERRIDE;
// #i33136#
- virtual bool doConstructOrthogonal() const;
+ virtual bool doConstructOrthogonal() const SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
diff --git a/sw/source/core/uibase/inc/condedit.hxx b/sw/source/core/uibase/inc/condedit.hxx
index 514a23e58c55..0a9d386c104f 100644
--- a/sw/source/core/uibase/inc/condedit.hxx
+++ b/sw/source/core/uibase/inc/condedit.hxx
@@ -27,8 +27,8 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper
{
bool bBrackets, bEnableDrop;
- SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
public:
ConditionEdit(Window* pParent, WinBits nStyle);
diff --git a/sw/source/core/uibase/inc/conform.hxx b/sw/source/core/uibase/inc/conform.hxx
index a1226a21f25e..5fb041d0fa94 100644
--- a/sw/source/core/uibase/inc/conform.hxx
+++ b/sw/source/core/uibase/inc/conform.hxx
@@ -27,10 +27,10 @@ public:
ConstFormControl(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
// Mouse- & Key-Events
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual void Activate(const sal_uInt16 nSlotId); // activate function
- virtual void CreateDefaultObject();
+ virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
+ virtual void CreateDefaultObject() SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/uibase/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx
index d91c38e0dd6b..2df2d7eaeba0 100644
--- a/sw/source/core/uibase/inc/conpoly.hxx
+++ b/sw/source/core/uibase/inc/conpoly.hxx
@@ -35,11 +35,11 @@ public:
ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
// Mouse- & Key-Events
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
+ virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+ virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual void Activate(const sal_uInt16 nSlotId); // activate function
+ virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
#endif // INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX
diff --git a/sw/source/core/uibase/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx
index 4791935d37ce..3539a63099e3 100644
--- a/sw/source/core/uibase/inc/conrect.hxx
+++ b/sw/source/core/uibase/inc/conrect.hxx
@@ -40,10 +40,10 @@ class ConstRectangle : public SwDrawBase
ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
// Mouse- & Key-Events
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+ virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual void Activate(const sal_uInt16 nSlotId); // activate function
+ virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
#endif // INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX
diff --git a/sw/source/core/uibase/inc/content.hxx b/sw/source/core/uibase/inc/content.hxx
index 2700bd261e83..b4a6c92f6988 100644
--- a/sw/source/core/uibase/inc/content.hxx
+++ b/sw/source/core/uibase/inc/content.hxx
@@ -36,7 +36,7 @@ class SwRangeRedline;
class SwPopup : public PopupMenu
{
sal_uInt16 nCurId;
- virtual void Select(){nCurId = GetCurItemId();}
+ virtual void Select() SAL_OVERRIDE {nCurId = GetCurItemId();}
public:
SwPopup() :
@@ -96,7 +96,7 @@ public:
: SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr )
{}
- virtual sal_Bool IsProtect() const;
+ virtual sal_Bool IsProtect() const SAL_OVERRIDE;
const OUString& GetURL() { return sURL; }
const SwTxtINetFmt* GetINetAttr() { return pINetAttr; }
};
@@ -128,7 +128,7 @@ public:
const SwFmtFld* GetPostIt() { return pFld; }
SwRangeRedline* GetRedline() { return pRedline; }
- virtual sal_Bool IsProtect() const;
+ virtual sal_Bool IsProtect() const SAL_OVERRIDE;
bool IsPostIt() {return mbPostIt; }
};
diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx
index 11d39b9db697..ff808365a589 100644
--- a/sw/source/core/uibase/inc/conttree.hxx
+++ b/sw/source/core/uibase/inc/conttree.hxx
@@ -97,52 +97,52 @@ class SwContentTree : public SvTreeListBox
using SvTreeListBox::EditEntry;
protected:
- virtual void RequestHelp( const HelpEvent& rHEvt );
- virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
SwNavigationPI* GetParentWindow(){return
(SwNavigationPI*)Window::GetParent();}
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual void DragFinished( sal_Int8 );
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
+ virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE;
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
bool FillTransferData( TransferDataContainer& rTransfer,
sal_Int8& rDragMode );
bool HasContentChanged();
virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
- SvTreeListEntry* );
- virtual bool NotifyAcceptDrop( SvTreeListEntry* );
+ SvTreeListEntry* ) SAL_OVERRIDE;
+ virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE;
virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
- );
+ ) SAL_OVERRIDE;
virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
- );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ ) SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
void EditEntry( SvTreeListEntry* pEntry, sal_uInt8 nMode );
void GotoContent(SwContent* pCnt);
static void SetInDrag(bool bSet) {bIsInDrag = bSet;}
- virtual PopupMenu* CreateContextMenu( void );
- virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry );
+ virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE;
+ virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE;
public:
SwContentTree(Window* pParent, const ResId& rResId);
~SwContentTree();
- OUString GetEntryAltText( SvTreeListEntry* pEntry ) const;
- OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const;
+ OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE;
+ OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE;
SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt);
bool ToggleToRoot();
@@ -189,12 +189,12 @@ public:
DECL_LINK( ContentDoubleClickHdl, void * );
DECL_LINK( TimerUpdate, void * );
- virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* );
- virtual void RequestingChildren( SvTreeListEntry* pParent );
- virtual void GetFocus();
- virtual void KeyInput(const KeyEvent& rKEvt);
+ virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE;
+ virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
+ virtual void GetFocus() SAL_OVERRIDE;
+ virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
- virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true );
+ virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE;
virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const;
};
@@ -211,7 +211,7 @@ public:
virtual void Paint(
const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView,
- const SvTreeListEntry* pEntry);
+ const SvTreeListEntry* pEntry) SAL_OVERRIDE;
};
namespace sfx2 { class DocumentInserter; }
@@ -251,38 +251,38 @@ private:
protected:
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
- virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* );
+ virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE;
virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
- );
+ ) SAL_OVERRIDE;
virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
- );
+ ) SAL_OVERRIDE;
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual void DragFinished( sal_Int8 );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
+ virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE;
virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
- SvTreeListEntry* );
- virtual bool NotifyAcceptDrop( SvTreeListEntry* );
+ SvTreeListEntry* ) SAL_OVERRIDE;
+ virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE;
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void KeyInput(const KeyEvent& rKEvt);
- virtual void GetFocus();
- virtual void SelectHdl();
- virtual void DeselectHdl();
- virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
+ virtual void GetFocus() SAL_OVERRIDE;
+ virtual void SelectHdl() SAL_OVERRIDE;
+ virtual void DeselectHdl() SAL_OVERRIDE;
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE;
void Clear();
@@ -302,8 +302,8 @@ protected:
static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;}
DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*);
- virtual PopupMenu* CreateContextMenu( void );
- virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry );
+ virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE;
+ virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE;
public:
SwGlobalTree(Window* pParent, const ResId& rResId);
diff --git a/sw/source/core/uibase/inc/cption.hxx b/sw/source/core/uibase/inc/cption.hxx
index 578efcdb8e1c..7eb9837e2dfd 100644
--- a/sw/source/core/uibase/inc/cption.hxx
+++ b/sw/source/core/uibase/inc/cption.hxx
@@ -55,7 +55,7 @@ public:
: ComboBox( pParent, nStyle )
{}
- virtual bool PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
};
class SwCaptionDialog : public SvxStandardDialog
@@ -96,7 +96,7 @@ class SwCaptionDialog : public SvxStandardDialog
DECL_LINK(OptionHdl, Button *);
DECL_LINK(CaptionHdl, void *);
- virtual void Apply();
+ virtual void Apply() SAL_OVERRIDE;
void DrawSample();
void CheckButtonWidth();
diff --git a/sw/source/core/uibase/inc/dbconfig.hxx b/sw/source/core/uibase/inc/dbconfig.hxx
index 042a719b7338..d569b26d1d20 100644
--- a/sw/source/core/uibase/inc/dbconfig.hxx
+++ b/sw/source/core/uibase/inc/dbconfig.hxx
@@ -38,8 +38,8 @@ public:
void Load();
const SwDBData& GetAddressSource();
const SwDBData& GetBibliographySource();
- virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
+ virtual void Commit() SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/uibase/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx
index 4d271dd41e2a..60ad6d86186c 100644
--- a/sw/source/core/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/core/uibase/inc/dbinsdlg.hxx
@@ -144,8 +144,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, sal_Bool bInsField );
using SfxModalDialog::Notify;
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
- virtual void Commit();
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Commit() SAL_OVERRIDE;
void Load();
// set the tables - properties
diff --git a/sw/source/core/uibase/inc/dbtree.hxx b/sw/source/core/uibase/inc/dbtree.hxx
index 7120cbf25e17..e94b1d22512c 100644
--- a/sw/source/core/uibase/inc/dbtree.hxx
+++ b/sw/source/core/uibase/inc/dbtree.hxx
@@ -44,17 +44,17 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
SAL_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
SAL_DLLPRIVATE void InitTreeList();
- SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent );
+ SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
- SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
using SvTreeListBox::Select;
public:
SwDBTreeList(Window* pParent, WinBits nStyle);
virtual ~SwDBTreeList();
- virtual Size GetOptimalSize() const;
+ virtual Size GetOptimalSize() const SAL_OVERRIDE;
OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0);
diff --git a/sw/source/core/uibase/inc/docfnote.hxx b/sw/source/core/uibase/inc/docfnote.hxx
index c5289213d2b2..b9d2dac9318b 100644
--- a/sw/source/core/uibase/inc/docfnote.hxx
+++ b/sw/source/core/uibase/inc/docfnote.hxx
@@ -31,7 +31,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog
sal_uInt16 m_nFootNoteId;
sal_uInt16 m_nEndNoteId;
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
DECL_LINK( OkHdl, Button * );
diff --git a/sw/source/core/uibase/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx
index a7c427550942..98f4ab192c30 100644
--- a/sw/source/core/uibase/inc/docstdlg.hxx
+++ b/sw/source/core/uibase/inc/docstdlg.hxx
@@ -38,8 +38,8 @@ public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
protected:
- virtual bool FillItemSet( SfxItemSet &rSet);
- virtual void Reset (const SfxItemSet &rSet);
+ virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE;
+ virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE;
DECL_LINK(UpdateHdl, void *);
diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx
index 27714918c05e..3ddf9f5e2544 100644
--- a/sw/source/core/uibase/inc/drpcps.hxx
+++ b/sw/source/core/uibase/inc/drpcps.hxx
@@ -73,7 +73,7 @@ friend class SwDropCapsPict;
SwDropCapsPage(Window *pParent, const SfxItemSet &rSet);
~SwDropCapsPage();
- virtual int DeactivatePage(SfxItemSet *pSet);
+ virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
void FillSet( SfxItemSet &rSet );
DECL_LINK(ClickHdl, void *);
@@ -89,8 +89,8 @@ public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
static sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet &rSet);
- virtual void Reset (const SfxItemSet &rSet);
+ virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE;
+ virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE;
void SetFormat(sal_Bool bSet){bFormat = bSet;}
protected:
diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx
index cd7b4befef17..1da91e4766fc 100644
--- a/sw/source/core/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/core/uibase/inc/drwtxtsh.hxx
@@ -48,7 +48,7 @@ public:
virtual ~SwDrawTextShell();
virtual ::svl::IUndoManager*
- GetUndoManager();
+ GetUndoManager() SAL_OVERRIDE;
void StateDisableItems(SfxItemSet &);
diff --git a/sw/source/core/uibase/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx
index d3905bc27e57..c087fa072bf8 100644
--- a/sw/source/core/uibase/inc/dselect.hxx
+++ b/sw/source/core/uibase/inc/dselect.hxx
@@ -33,9 +33,9 @@ class DrawSelection : public SwDrawBase
DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
// mouse- & key events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
- virtual void Activate(const sal_uInt16 nSlotId); // activate function
+ virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};