summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/AnnotationWin.hxx24
-rw-r--r--sw/inc/PostItMgr.hxx6
-rw-r--r--sw/inc/SidebarWin.hxx12
-rw-r--r--sw/inc/SwNodeNum.hxx28
-rw-r--r--sw/inc/SwSmartTagMgr.hxx4
-rw-r--r--sw/inc/SwUndoField.hxx12
-rw-r--r--sw/inc/SwXMLSectionList.hxx6
-rw-r--r--sw/inc/TextCursorHelper.hxx2
-rw-r--r--sw/inc/accmap.hxx20
-rw-r--r--sw/inc/anchoreddrawobject.hxx26
-rw-r--r--sw/inc/authfld.hxx22
-rw-r--r--sw/inc/calbck.hxx10
-rw-r--r--sw/inc/ccoll.hxx4
-rw-r--r--sw/inc/cellatr.hxx14
-rw-r--r--sw/inc/chpfld.hxx10
-rw-r--r--sw/inc/colwd.hxx2
-rw-r--r--sw/inc/crsrsh.hxx10
-rw-r--r--sw/inc/dbfld.hxx88
-rw-r--r--sw/inc/dcontact.hxx112
-rw-r--r--sw/inc/ddefld.hxx18
-rw-r--r--sw/inc/dlelstnr.hxx8
-rw-r--r--sw/inc/doc.hxx396
-rw-r--r--sw/inc/docary.hxx20
-rw-r--r--sw/inc/docsh.hxx74
-rw-r--r--sw/inc/docstyle.hxx62
-rw-r--r--sw/inc/docufld.hxx248
-rw-r--r--sw/inc/dpage.hxx6
-rw-r--r--sw/inc/drawdoc.hxx8
-rw-r--r--sw/inc/editsh.hxx2
-rw-r--r--sw/inc/expfld.hxx106
-rw-r--r--sw/inc/fchrfmt.hxx14
-rw-r--r--sw/inc/fesh.hxx2
-rw-r--r--sw/inc/fldbas.hxx6
-rw-r--r--sw/inc/flddat.hxx20
-rw-r--r--sw/inc/flddropdown.hxx18
-rw-r--r--sw/inc/fmtanchr.hxx10
-rw-r--r--sw/inc/fmtautofmt.hxx10
-rw-r--r--sw/inc/fmtclbl.hxx2
-rw-r--r--sw/inc/fmtclds.hxx10
-rw-r--r--sw/inc/fmtcnct.hxx8
-rw-r--r--sw/inc/fmtcntnt.hxx4
-rw-r--r--sw/inc/fmtcol.hxx10
-rw-r--r--sw/inc/fmteiro.hxx4
-rw-r--r--sw/inc/fmtflcnt.hxx4
-rw-r--r--sw/inc/fmtfld.hxx10
-rw-r--r--sw/inc/fmtfollowtextflow.hxx4
-rw-r--r--sw/inc/fmtfordr.hxx4
-rw-r--r--sw/inc/fmtfsize.hxx10
-rw-r--r--sw/inc/fmtftn.hxx4
-rw-r--r--sw/inc/fmtftntx.hxx14
-rw-r--r--sw/inc/fmthdft.hxx12
-rw-r--r--sw/inc/fmtinfmt.hxx10
-rw-r--r--sw/inc/fmtline.hxx10
-rw-r--r--sw/inc/fmtlsplt.hxx4
-rw-r--r--sw/inc/fmtmeta.hxx16
-rw-r--r--sw/inc/fmtornt.hxx24
-rw-r--r--sw/inc/fmtpdsc.hxx14
-rw-r--r--sw/inc/fmtrfmrk.hxx4
-rw-r--r--sw/inc/fmtrowsplt.hxx4
-rw-r--r--sw/inc/fmtruby.hxx10
-rw-r--r--sw/inc/fmtsrnd.hxx12
-rw-r--r--sw/inc/fmturl.hxx10
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx8
-rw-r--r--sw/inc/format.hxx4
-rw-r--r--sw/inc/frmfmt.hxx26
-rw-r--r--sw/inc/ftninfo.hxx2
-rw-r--r--sw/inc/globdoc.hxx2
-rw-r--r--sw/inc/grfatr.hxx72
-rw-r--r--sw/inc/hfspacingitem.hxx4
-rw-r--r--sw/inc/hhcwrp.hxx8
-rw-r--r--sw/inc/hints.hxx4
-rw-r--r--sw/inc/lineinfo.hxx2
-rw-r--r--sw/inc/modcfg.hxx20
-rw-r--r--sw/inc/ndgrf.hxx10
-rw-r--r--sw/inc/ndnotxt.hxx4
-rw-r--r--sw/inc/ndole.hxx10
-rw-r--r--sw/inc/ndtxt.hxx44
-rw-r--r--sw/inc/node.hxx6
-rw-r--r--sw/inc/numrule.hxx12
-rw-r--r--sw/inc/pagedesc.hxx4
-rw-r--r--sw/inc/paratr.hxx32
-rw-r--r--sw/inc/postithelper.hxx10
-rw-r--r--sw/inc/prtopt.hxx6
-rw-r--r--sw/inc/redline.hxx18
-rw-r--r--sw/inc/reffld.hxx26
-rw-r--r--sw/inc/section.hxx20
-rw-r--r--sw/inc/shellio.hxx14
-rw-r--r--sw/inc/swabstdlg.hxx2
-rw-r--r--sw/inc/swacorr.hxx4
-rw-r--r--sw/inc/swatrset.hxx4
-rw-r--r--sw/inc/swbaslnk.hxx4
-rw-r--r--sw/inc/swcli.hxx10
-rw-r--r--sw/inc/swcrsr.hxx6
-rw-r--r--sw/inc/swddetbl.hxx4
-rw-r--r--sw/inc/swfltopt.hxx4
-rw-r--r--sw/inc/swmodule.hxx10
-rw-r--r--sw/inc/swserv.hxx2
-rw-r--r--sw/inc/swtable.hxx4
-rw-r--r--sw/inc/swtblfmt.hxx2
-rw-r--r--sw/inc/tgrditem.hxx10
-rw-r--r--sw/inc/tox.hxx8
-rw-r--r--sw/inc/txatbase.hxx2
-rw-r--r--sw/inc/txtatr.hxx4
-rw-r--r--sw/inc/txtfld.hxx4
-rw-r--r--sw/inc/txtinet.hxx4
-rw-r--r--sw/inc/txtrfmrk.hxx2
-rw-r--r--sw/inc/txttxmrk.hxx2
-rw-r--r--sw/inc/undobj.hxx36
-rw-r--r--sw/inc/unochart.hxx122
-rw-r--r--sw/inc/unocoll.hxx142
-rw-r--r--sw/inc/unocrsr.hxx16
-rw-r--r--sw/inc/unodraw.hxx108
-rw-r--r--sw/inc/unofieldcoll.hxx36
-rw-r--r--sw/inc/unoframe.hxx166
-rw-r--r--sw/inc/unoidxcoll.hxx20
-rw-r--r--sw/inc/unoparagraph.hxx90
-rw-r--r--sw/inc/unoredline.hxx58
-rw-r--r--sw/inc/unoredlines.hxx28
-rw-r--r--sw/inc/unosett.hxx136
-rw-r--r--sw/inc/unosrch.hxx42
-rw-r--r--sw/inc/unostyle.hxx218
-rw-r--r--sw/inc/unotbl.hxx318
-rw-r--r--sw/inc/unotext.hxx68
-rw-r--r--sw/inc/unotextbodyhf.hxx58
-rw-r--r--sw/inc/unotextcursor.hxx136
-rw-r--r--sw/inc/unotextrange.hxx68
-rw-r--r--sw/inc/unotxdoc.hxx234
-rw-r--r--sw/inc/usrfld.hxx34
-rw-r--r--sw/inc/viscrs.hxx26
-rw-r--r--sw/inc/wdocsh.hxx2
-rw-r--r--sw/qa/core/filters-test.cxx4
-rw-r--r--sw/qa/core/macros-test.cxx4
-rw-r--r--sw/qa/core/uwriter.cxx4
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx8
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlw14export.cxx2
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx2
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx2
-rw-r--r--sw/qa/tiledrendering/tiledrendering.cxx4
-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
606 files changed, 6664 insertions, 6662 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 1c62794bf398..7932c07cc03a 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -38,27 +38,27 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
SwFmtFld* aField );
virtual ~SwAnnotationWin();
- virtual void UpdateData();
- virtual void SetPostItText();
- virtual void Delete();
- virtual void GotoPos();
+ virtual void UpdateData() SAL_OVERRIDE;
+ virtual void SetPostItText() SAL_OVERRIDE;
+ virtual void Delete() SAL_OVERRIDE;
+ virtual void GotoPos() SAL_OVERRIDE;
- virtual OUString GetAuthor();
- virtual Date GetDate();
- virtual Time GetTime();
+ virtual OUString GetAuthor() SAL_OVERRIDE;
+ virtual Date GetDate() SAL_OVERRIDE;
+ virtual Time GetTime() SAL_OVERRIDE;
- virtual sal_uInt32 MoveCaret();
+ virtual sal_uInt32 MoveCaret() SAL_OVERRIDE;
- virtual bool CalcFollow();
+ virtual bool CalcFollow() SAL_OVERRIDE;
void InitAnswer(OutlinerParaObject* pText);
- virtual bool IsProtected();
+ virtual bool IsProtected() SAL_OVERRIDE;
protected:
- virtual MenuButton* CreateMenuButton();
+ virtual MenuButton* CreateMenuButton() SAL_OVERRIDE;
private:
- virtual SvxLanguageItem GetLanguage(void);
+ virtual SvxLanguageItem GetLanguage(void) SAL_OVERRIDE;
sal_uInt32 CountFollowing();
SwFmtFld* mpFmtFld;
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 0355ae569ebe..907f6b2dc2bf 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -128,8 +128,8 @@ class SwNoteProps: public utl::ConfigItem
return aNames;
}
- 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;
};
class SwPostItMgr: public SfxListener
@@ -193,7 +193,7 @@ class SwPostItMgr: public SfxListener
const_iterator begin() const { return mvPostItFlds.begin(); }
const_iterator end() const { return mvPostItFlds.end(); }
- void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
void LayoutPostIts();
bool CalcRects();
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index f98a2ef88a1c..630ef1668242 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -174,16 +174,16 @@ class SwSidebarWin : public Window
void SetLanguage(const SvxLanguageItem aNewItem);
void ChangeSidebarItem( SwSidebarItem& rSidebarItem );
- 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;
protected:
- virtual void DataChanged( const DataChangedEvent& aEvent);
- virtual void LoseFocus();
- virtual void Paint( const Rectangle& rRect);
- virtual void GetFocus();
+ virtual void DataChanged( const DataChangedEvent& aEvent) SAL_OVERRIDE;
+ virtual void LoseFocus() SAL_OVERRIDE;
+ virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void GetFocus() SAL_OVERRIDE;
virtual MenuButton* CreateMenuButton() = 0;
- void SetSizePixel( const Size& rNewSize );
+ void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE;
SfxItemSet DefaultItem();
DECL_LINK(ModifyHdl, void*);
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 7a0e24382197..08f473c36a71 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -39,17 +39,17 @@ public:
void ChangeNumRule( SwNumRule& rNumRule );
SwTxtNode* GetTxtNode() const;
- virtual bool IsNotificationEnabled() const;
+ virtual bool IsNotificationEnabled() const SAL_OVERRIDE;
- virtual bool IsContinuous() const;
+ virtual bool IsContinuous() const SAL_OVERRIDE;
- virtual bool IsCounted() const;
+ virtual bool IsCounted() const SAL_OVERRIDE;
- virtual bool LessThan(const SwNumberTreeNode & rNode) const;
+ virtual bool LessThan(const SwNumberTreeNode & rNode) const SAL_OVERRIDE;
- virtual bool IsRestart() const;
+ virtual bool IsRestart() const SAL_OVERRIDE;
- virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const;
+ virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const SAL_OVERRIDE;
SwPosition GetPosition() const;
@@ -71,16 +71,16 @@ public:
const SwNodeNum* GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const;
protected:
- virtual SwNumberTreeNode * Create() const;
+ virtual SwNumberTreeNode * Create() const SAL_OVERRIDE;
// --> #i64010#
- virtual bool HasCountedChildren() const;
- virtual bool IsCountedForNumbering() const;
+ virtual bool HasCountedChildren() const SAL_OVERRIDE;
+ virtual bool IsCountedForNumbering() const SAL_OVERRIDE;
// method called before this tree node has been added to the list tree
- virtual void PreAdd();
+ virtual void PreAdd() SAL_OVERRIDE;
// method called at a child after this child has been removed from the list tree
- virtual void PostRemove();
+ virtual void PostRemove() SAL_OVERRIDE;
private:
SwTxtNode * mpTxtNode;
SwNumRule * mpNumRule;
@@ -90,11 +90,11 @@ private:
SwNodeNum( const SwNodeNum& ); // no copy constructor
SwNodeNum& operator=( const SwNodeNum& ); // no assignment operator
- virtual bool IsCountPhantoms() const;
+ virtual bool IsCountPhantoms() const SAL_OVERRIDE;
- virtual bool IsNotifiable() const;
+ virtual bool IsNotifiable() const SAL_OVERRIDE;
- virtual void NotifyNode();
+ virtual void NotifyNode() SAL_OVERRIDE;
};
#endif // INCLUDED_SW_INC_SWNODENUM_HXX
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index 485d2f43c9ed..c3e1640ed89a 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -40,10 +40,10 @@ public:
static SwSmartTagMgr& Get();
// ::com::sun::star::util::XModifyListener
- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::util::XChangesListener
- virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 923889f614da..9c3b6b6ce0c5 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -57,9 +57,9 @@ public:
virtual ~SwUndoFieldFromDoc();
- 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 SwUndoFieldFromAPI : public SwUndoField
@@ -76,9 +76,9 @@ public:
sal_uInt16 nWhich);
virtual ~SwUndoFieldFromAPI();
- 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_INC_SWUNDOFIELD_HXX
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 9e63504598a5..63765c6e0ca3 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -30,7 +30,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:
std::vector<OUString*> &rSectionList;
@@ -55,7 +55,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;
~SvXMLSectionListContext ( void );
};
@@ -72,7 +72,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;
~SvXMLIgnoreSectionListContext ( void );
};
#endif
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index aba4e3dc9083..e6563e3f4824 100644
--- a/sw/inc/TextCursorHelper.hxx
+++ b/sw/inc/TextCursorHelper.hxx
@@ -33,7 +33,7 @@ public:
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 >& 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;
virtual const SwPaM* GetPaM() const = 0;
virtual SwPaM* GetPaM() = 0;
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 08e8a3756f7a..edfed85948ac 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -263,12 +263,12 @@ public:
// IAccessibleViewForwarder
- virtual bool IsValid() const;
- virtual Rectangle GetVisibleArea() const;
- virtual Point LogicToPixel (const Point& rPoint) const;
- virtual Size LogicToPixel (const Size& rSize) const;
- virtual Point PixelToLogic (const Point& rPoint) const;
- virtual Size PixelToLogic (const Size& rSize) const;
+ virtual bool IsValid() const SAL_OVERRIDE;
+ virtual Rectangle GetVisibleArea() const SAL_OVERRIDE;
+ virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE;
+ virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE;
+ virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE;
+ virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE;
// IAccessibleParent
virtual bool ReplaceChild (
@@ -276,13 +276,13 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
const long _nIndex,
const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
- ) throw (::com::sun::star::uno::RuntimeException);
+ ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
(::com::sun::star::beans::XPropertySet* pSet)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessibleCaption (
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// additional Core/Pixel conversions for internal use; also works
// for preview
@@ -312,7 +312,7 @@ private:
void GetMapMode( const Point& _rPoint,
MapMode& _orMapMode ) const;
public:
- virtual bool IsDocumentSelAll();
+ virtual bool IsDocumentSelAll() SAL_OVERRIDE;
::com::sun::star::uno::WeakReference < ::com::sun::star::accessibility::XAccessible >
GetCursorContext() const { return mxCursorContext; }
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 942b6812adda..28da2cabb061 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -106,19 +106,19 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
void _InvalidatePage( SwPageFrm* _pPageFrm );
protected:
- virtual void ObjectAttachedToAnchorFrame();
+ virtual void ObjectAttachedToAnchorFrame() SAL_OVERRIDE;
/** method to assure that anchored object is registered at the correct
page frame
@author OD
*/
- 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 const SwRect GetObjBoundRect() const SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
@@ -127,19 +127,19 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
virtual ~SwAnchoredDrawObject();
// declaration of pure virtual methods of base class <SwAnchoredObject>
- virtual void MakeObjPos();
- virtual void InvalidateObjPos();
+ virtual void MakeObjPos() SAL_OVERRIDE;
+ virtual void InvalidateObjPos() SAL_OVERRIDE;
inline bool IsValidPos() const
{
return mbValidPos;
}
// accessors to the format
- virtual SwFrmFmt& GetFrmFmt();
- virtual const SwFrmFmt& GetFrmFmt() const;
+ virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE;
+ virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE;
// accessors to the object area and its position
- virtual const SwRect GetObjRect() const;
+ virtual const SwRect GetObjRect() const SAL_OVERRIDE;
// Return value can be NULL.
const Rectangle* GetLastObjRect() const;
@@ -171,7 +171,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
*/
virtual void NotifyBackground( SwPageFrm* _pPageFrm,
const SwRect& _rRect,
- PrepareHint _eHint );
+ PrepareHint _eHint ) SAL_OVERRIDE;
inline bool NotYetPositioned() const
{
@@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
// change of layout direction needs to be tracked
// for setting <mbCaptureAfterLayoutDirChange>.
- virtual void UpdateLayoutDir();
+ virtual void UpdateLayoutDir() SAL_OVERRIDE;
bool IsOutsidePage() const;
// new Loop control
@@ -188,7 +188,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
/** The element name to show in the XML dump.
*/
- virtual const char* getElementName( ) { return "SwAnchoredDrawObject"; }
+ virtual const char* getElementName( ) SAL_OVERRIDE { return "SwAnchoredDrawObject"; }
};
#endif
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index a26cc6d30122..2e3308fd112d 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -70,16 +70,16 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType
OUString m_sSortAlgorithm;
protected:
-virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
SwAuthorityFieldType(SwDoc* pDoc);
~SwAuthorityFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE;
inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; }
SwDoc* GetDoc(){ return m_pDoc; }
@@ -146,8 +146,8 @@ class SwAuthorityField : public SwField
sal_IntPtr m_nHandle;
mutable sal_IntPtr m_nTempSequencePos;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
/// For internal use only, in general continue using ExpandField() instead.
@@ -159,15 +159,15 @@ public:
OUString GetFieldText(ToxAuthorityField eField) const;
- virtual void SetPar1(const OUString& rStr);
- virtual SwFieldType* ChgTyp( SwFieldType* );
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE;
sal_IntPtr GetHandle() const { return m_nHandle; }
- virtual OUString GetDescription() const;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
};
// --- inlines -----------------------------------------------------------
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 26320f9e657f..0b7f0dd50558 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -127,7 +127,7 @@ class SW_DLLPUBLIC SwModify: public SwClient
sal_Bool bInSwFntCache : 1;
// mba: IMHO this method should be pure virtual
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwModify();
@@ -152,7 +152,7 @@ public:
const SwClient* GetDepends() const { return pRoot; }
// get information about attribute
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
void LockModify() { bModifyLocked = true; }
void UnlockModify() { bModifyLocked = false; }
@@ -184,10 +184,10 @@ public:
SwClient* GetToTell() { return pToTell; }
/** get Client information */
- virtual bool GetInfo( SfxPoolItem & ) const;
+ virtual bool GetInfo( SfxPoolItem & ) const SAL_OVERRIDE;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue );
- virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE;
+ virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) SAL_OVERRIDE;
};
class SwClientIter
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 446f58c046a3..6ef9207bb3d6 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -58,8 +58,8 @@ public:
TYPEINFO_OVERRIDE();
- 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;
static const CommandStruct* GetCmds();
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 2ba21cf95884..fef1f0171f31 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -36,8 +36,8 @@ public:
sal_Bool bAuto = sal_False );
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr )
{
@@ -60,14 +60,14 @@ public:
~SwTblBoxFormula() {};
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
inline void ChgDefinedIn( const SwModify* pNew )
{ pDefinedIn = (SwModify*)pNew; }
// BoxAttribut -> BoxStartNode
- virtual const SwNode* GetNodeOfFormula() const;
+ virtual const SwNode* GetNodeOfFormula() const SAL_OVERRIDE;
SwTableBox* GetTableBox();
const SwTableBox* GetTableBox() const
@@ -85,8 +85,8 @@ public:
SwTblBoxValue( const double aVal );
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp )
{
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 891e43e57a05..6faccfcd9c03 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -41,7 +41,7 @@ class SwChapterFieldType : public SwFieldType
public:
SwChapterFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
@@ -54,8 +54,8 @@ class SW_DLLPUBLIC SwChapterField : public SwField
OUString sPre;
OUString sPost;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
@@ -71,8 +71,8 @@ public:
inline OUString GetNumber() const;
inline OUString GetTitle() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; }
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 30559a47c681..4069ebc20a57 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -33,7 +33,7 @@ class SwTableWidthDlg : public SvxStandardDialog
SwTableFUNC &rFnc;
protected:
- virtual void Apply();
+ virtual void Apply() SAL_OVERRIDE;
DECL_LINK(LoseFocusHdl, void * = 0);
public:
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index d2fa00d8e41c..dd1bca59f910 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -301,7 +301,7 @@ protected:
SAL_DLLPRIVATE void UpdateMarkedListLevel();
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
@@ -311,8 +311,8 @@ public:
virtual ~SwCrsrShell();
// create new cursor and append the old one
- virtual SwPaM & CreateNewShellCursor();
- virtual SwPaM & GetCurrentShellCursor();
+ virtual SwPaM & CreateNewShellCursor() SAL_OVERRIDE;
+ virtual SwPaM & GetCurrentShellCursor() SAL_OVERRIDE;
SwPaM * CreateCrsr();
///< delete the current cursor and make the following into the current
@@ -403,12 +403,12 @@ public:
* scrolling is done. The passed Rectangle lays on pixel borders to avoid
* pixel errors.
*/
- virtual void VisPortChgd( const SwRect & );
+ virtual void VisPortChgd( const SwRect & ) SAL_OVERRIDE;
/*
* virtual paint method to make selection visible again after Paint
*/
- void Paint( const Rectangle & rRect );
+ void Paint( const Rectangle & rRect ) SAL_OVERRIDE;
// Areas
inline void SetMark();
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 31314d2db46c..6861248b5d9e 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -43,8 +43,8 @@ public:
SwDBFieldType(SwDoc* pDocPtr, const OUString& rColumnName, const SwDBData& rDBData);
~SwDBFieldType();
- virtual OUString GetName() const;
- virtual SwFieldType* Copy() const;
+ virtual OUString GetName() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
inline void AddRef() { nRefCnt++; }
void ReleaseRef();
@@ -52,8 +52,8 @@ public:
OUString GetColumnName() const {return sColumn;}
const SwDBData& GetDBData() const {return aDBData;}
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -70,22 +70,22 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
bool bValidValue : 1;
bool bInitialized : 1;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwDBField(SwDBFieldType*, sal_uLong nFmt = 0);
virtual ~SwDBField();
- virtual SwFieldType* ChgTyp( SwFieldType* );
+ virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE;
/// Current text.
inline void SetExpansion(const OUString& rStr);
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nType);
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
/// For calculations in expressions.
void ChgValue( double d, bool bVal );
@@ -105,7 +105,7 @@ public:
inline void SetInitialized() { bInitialized = true; }
/// Get name.
- virtual OUString GetPar1() const;
+ virtual OUString GetPar1() const SAL_OVERRIDE;
/// access to the command string
OUString GetFieldCode() const { return sFieldCode;}
@@ -113,8 +113,8 @@ public:
/// DBName
inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
inline void SwDBField::SetExpansion(const OUString& rStr)
@@ -146,12 +146,12 @@ public:
SwDBData GetDBData(SwDoc* pDoc);
void SetDBData(const SwDBData& rDBData);
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nType);
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -163,7 +163,7 @@ class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType
public:
SwDBNextSetFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -179,18 +179,18 @@ public:
SwDBNextSetField( SwDBNextSetFieldType*,
const OUString& rCond, const OUString& rDummy, const SwDBData& rDBData);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
void Evaluate(SwDoc*);
inline void SetCondValid(bool bCond);
inline bool IsCondValid() const;
// Condition
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
inline bool SwDBNextSetField::IsCondValid() const
@@ -208,7 +208,7 @@ class SwDBNumSetFieldType : public SwFieldType
public:
SwDBNumSetFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -225,24 +225,24 @@ class SwDBNumSetField : public SwDBNameInfField
public:
SwDBNumSetField(SwDBNumSetFieldType*, const OUString& rCond, const OUString& rDBNum, const SwDBData& rDBData);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
inline bool IsCondValid() const;
inline void SetCondValid(bool bCond);
void Evaluate(SwDoc*);
// Condition
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
// Number of data record.
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
// Number of data record is in nFormat!!
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
inline bool SwDBNumSetField::IsCondValid() const
@@ -262,7 +262,7 @@ public:
SwDBNameFieldType(SwDoc*);
OUString Expand(sal_uLong) const;
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -274,10 +274,10 @@ class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
public:
SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -289,7 +289,7 @@ class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType
public:
SwDBSetNumberFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -303,14 +303,14 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
public:
SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
void Evaluate(SwDoc*);
inline long GetSetNumber() const;
inline void SetSetNumber(long nNum);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
inline long SwDBSetNumberField::GetSetNumber() const
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index f78267c4e218..30ffeb1a168c 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -196,7 +196,7 @@ private:
SwFlyDrawObj* mpMasterObj;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
@@ -205,22 +205,22 @@ public:
SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod );
virtual ~SwFlyDrawContact();
- virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const;
- virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj );
+ virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
+ virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE;
- virtual const SdrObject* GetMaster() const;
- virtual SdrObject* GetMaster();
- virtual void SetMaster( SdrObject* _pNewMaster );
+ virtual const SdrObject* GetMaster() const SAL_OVERRIDE;
+ virtual SdrObject* GetMaster() SAL_OVERRIDE;
+ virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE;
/** override methods to control Writer fly frames,
which are linked, and to assure that all objects anchored at/inside the
Writer fly frame are also made visible/invisible. */
- virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj );
- virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj );
+ virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj ) SAL_OVERRIDE;
+ virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) SAL_OVERRIDE;
/** get data collection of anchored objects handled by with contact
*/
- virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const;
+ virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE;
};
/** new class for re-direct methods calls at a 'virtual'
@@ -244,7 +244,7 @@ class SwDrawVirtObj : public SdrVirtObj
/** 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:
TYPEINFO_OVERRIDE();
@@ -254,9 +254,9 @@ class SwDrawVirtObj : public SdrVirtObj
virtual ~SwDrawVirtObj();
/// access to offset
- virtual const Point GetOffset() const;
+ virtual const Point GetOffset() const SAL_OVERRIDE;
- virtual SwDrawVirtObj* Clone() const;
+ virtual SwDrawVirtObj* Clone() const SAL_OVERRIDE;
SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj);
/// connection to writer layout
@@ -274,48 +274,48 @@ class SwDrawVirtObj : public SdrVirtObj
/ to drawing layer. */
bool IsConnected() const;
- virtual void NbcSetAnchorPos(const Point& rPnt);
+ virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE;
/// All overloaded methods which need to use the offset
- virtual void RecalcBoundRect();
- virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
- virtual ::basegfx::B2DPolyPolygon TakeContour() const;
- virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
+ virtual void RecalcBoundRect() SAL_OVERRIDE;
+ virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE;
+ virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE;
virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const;
- virtual void NbcMove(const Size& rSiz);
- virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
- virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear);
- virtual void Move(const Size& rSiz);
- virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true);
- virtual void Rotate(const Point& rRef, long nWink, double sn, double cs);
- virtual void Mirror(const Point& rRef1, const Point& rRef2);
- virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear);
- 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 Point GetSnapPoint(sal_uInt32 i) const;
- virtual Point GetPoint(sal_uInt32 i) const;
- virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
-
- virtual bool HasTextEdit() const;
-
- virtual SdrLayerID GetLayer() const;
- virtual void NbcSetLayer(SdrLayerID nLayer);
- virtual void SetLayer(SdrLayerID nLayer);
+ virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
+ virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) 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) SAL_OVERRIDE;
+ virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
+ virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) 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 Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE;
+ virtual Point GetPoint(sal_uInt32 i) const SAL_OVERRIDE;
+ virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) SAL_OVERRIDE;
+
+ virtual bool HasTextEdit() const SAL_OVERRIDE;
+
+ virtual SdrLayerID GetLayer() const SAL_OVERRIDE;
+ virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
+ virtual void SetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
/// FullDrag support
- virtual bool supportsFullDrag() const;
- virtual SdrObject* getFullDragClone() const;
+ virtual bool supportsFullDrag() const SAL_OVERRIDE;
+ virtual SdrObject* getFullDragClone() const SAL_OVERRIDE;
- virtual void SetBoundRectDirty();
- virtual const Rectangle& GetCurrentBoundRect() const;
- virtual const Rectangle& GetLastBoundRect() const;
+ virtual void SetBoundRectDirty() SAL_OVERRIDE;
+ virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE;
+ virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE;
};
bool CheckControlLayer( const SdrObject *pObj );
@@ -393,7 +393,7 @@ class SwDrawContact : public SwContact
protected:
/// virtuelle Methoden von SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
@@ -401,12 +401,12 @@ class SwDrawContact : public SwContact
SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj );
virtual ~SwDrawContact();
- virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const;
- virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj );
+ virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
+ virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE;
- virtual const SdrObject* GetMaster() const;
- virtual SdrObject* GetMaster();
- virtual void SetMaster( SdrObject* _pNewMaster );
+ virtual const SdrObject* GetMaster() const SAL_OVERRIDE;
+ virtual SdrObject* GetMaster() SAL_OVERRIDE;
+ virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE;
const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = 0L ) const;
SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = 0L );
@@ -451,7 +451,7 @@ class SwDrawContact : public SwContact
SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm );
/// Virtual methods of SdrObjUserCall.
- virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect);
+ virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) SAL_OVERRIDE;
/** Used by Changed() and by UndoDraw.
Notifies paragraphs that have to get out of the way. */
@@ -468,7 +468,7 @@ class SwDrawContact : public SwContact
*/
static void GetTextObjectsFromFmt( std::list<SdrTextObj*>&, SwDoc* );
- virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const;
+ virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index bb2343e23fc9..797a2c4bec38 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -52,11 +52,11 @@ public:
void SetExpansion( const OUString& rStr ) { aExpansion = rStr;
bCRLFFlag = sal_False; }
- virtual SwFieldType* Copy() const;
- virtual OUString GetName() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual OUString GetName() const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
OUString GetCmd() const;
void SetCmd( const OUString& aStr );
@@ -90,8 +90,8 @@ public:
class SwDDEField : public SwField
{
private:
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwDDEField(SwDDEFieldType*);
@@ -99,11 +99,11 @@ public:
/** Get parameter via types.
Name cannot be changed. */
- virtual OUString GetPar1() const;
+ virtual OUString GetPar1() const SAL_OVERRIDE;
// Command
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_INC_DDEFLD_HXX
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 3b1c31ab22e9..19c6f7aeb89e 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -66,17 +66,17 @@ public:
virtual ~SwLinguServiceEventListener();
/// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// XDictionaryListEventListener
virtual void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent) throw( ::com::sun::star::uno::RuntimeException );
/// XLinguServiceEventListener
- virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// XTerminateListener
- virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& rEventObj ) 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& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 59119052e7fb..d43856fe6ae7 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -713,123 +713,123 @@ public:
SwNodes const& GetNodes() const { return *m_pNodes; }
// IInterface
- virtual sal_Int32 acquire();
- virtual sal_Int32 release();
- virtual sal_Int32 getReferenceCount() const;
+ virtual sal_Int32 acquire() SAL_OVERRIDE;
+ virtual sal_Int32 release() SAL_OVERRIDE;
+ virtual sal_Int32 getReferenceCount() const SAL_OVERRIDE;
// IDocumentSettingAccess
- virtual bool get(/*[in]*/ DocumentSettingId id) const;
- virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value);
- virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const;
- virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters );
- virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable();
- virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const;
- virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const;
- virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode );
- virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const;
- virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode );
- virtual SwCharCompressType getCharacterCompressionType() const;
- virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType );
+ virtual bool get(/*[in]*/ DocumentSettingId id) const SAL_OVERRIDE;
+ virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) SAL_OVERRIDE;
+ virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const SAL_OVERRIDE;
+ virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) SAL_OVERRIDE;
+ virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() SAL_OVERRIDE;
+ virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const SAL_OVERRIDE;
+ virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE;
+ virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) SAL_OVERRIDE;
+ virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE;
+ virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode ) SAL_OVERRIDE;
+ virtual SwCharCompressType getCharacterCompressionType() const SAL_OVERRIDE;
+ virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) SAL_OVERRIDE;
virtual sal_uInt32 getRsid() const;
virtual void setRsid( sal_uInt32 nVal );
virtual sal_uInt32 getRsidRoot() const;
virtual void setRsidRoot( sal_uInt32 nVal );
// IDocumentDeviceAccess
- virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const;
- virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged );
- virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const;
- virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged );
- virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const;
- virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes );
- virtual const JobSetup* getJobsetup() const;
- virtual void setJobsetup(/*[in]*/ const JobSetup& rJobSetup );
- virtual const SwPrintData & getPrintData() const;
- virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData);
+ virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const SAL_OVERRIDE;
+ virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) SAL_OVERRIDE;
+ virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE;
+ virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged ) SAL_OVERRIDE;
+ virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE;
+ virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes ) SAL_OVERRIDE;
+ virtual const JobSetup* getJobsetup() const SAL_OVERRIDE;
+ virtual void setJobsetup(/*[in]*/ const JobSetup& rJobSetup ) SAL_OVERRIDE;
+ virtual const SwPrintData & getPrintData() const SAL_OVERRIDE;
+ virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData) SAL_OVERRIDE;
// IDocumentMarkAccess
IDocumentMarkAccess* getIDocumentMarkAccess();
const IDocumentMarkAccess* getIDocumentMarkAccess() const;
// IDocumentRedlineAccess
- virtual RedlineMode_t GetRedlineMode() const;
- virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode);
- virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode);
- virtual bool IsRedlineOn() const;
- virtual bool IsIgnoreRedline() const;
- virtual bool IsInRedlines(const SwNode& rNode) const;
- virtual const SwRedlineTbl& GetRedlineTbl() const;
- virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const;
- virtual SwExtraRedlineTbl& GetExtraRedlineTbl();
- virtual bool HasExtraRedlineTbl() const;
- virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete);
- virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, /*[in]*/bool bCallDelete);
- virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, /*[in]*/bool bCallDelete);
- virtual bool SplitRedline(const SwPaM& rPam);
- virtual bool DeleteRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType);
- virtual bool DeleteRedline(/*[in]*/const SwStartNode& rSection, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType);
- virtual sal_uInt16 GetRedlinePos(/*[in]*/const SwNode& rNode, /*[in]*/sal_uInt16 nType) const;
- virtual void CompressRedlines();
- virtual const SwRangeRedline* GetRedline(/*[in]*/const SwPosition& rPos, /*[in]*/sal_uInt16* pFndPos) const;
- virtual bool IsRedlineMove() const;
- virtual void SetRedlineMove(/*[in]*/bool bFlag);
- virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete);
- virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete);
- virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete);
- virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete);
- virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const;
- virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const;
- virtual void UpdateRedlineAttr();
- virtual sal_uInt16 GetRedlineAuthor();
- virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor);
- virtual bool SetRedlineComment(/*[in]*/const SwPaM& rPam, /*[in]*/const OUString& rComment);
- virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const;
- virtual void SetRedlinePassword(/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword);
+ virtual RedlineMode_t GetRedlineMode() const SAL_OVERRIDE;
+ virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE;
+ virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE;
+ virtual bool IsRedlineOn() const SAL_OVERRIDE;
+ virtual bool IsIgnoreRedline() const SAL_OVERRIDE;
+ virtual bool IsInRedlines(const SwNode& rNode) const SAL_OVERRIDE;
+ virtual const SwRedlineTbl& GetRedlineTbl() const SAL_OVERRIDE;
+ virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const SAL_OVERRIDE;
+ virtual SwExtraRedlineTbl& GetExtraRedlineTbl() SAL_OVERRIDE;
+ virtual bool HasExtraRedlineTbl() const SAL_OVERRIDE;
+ virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE;
+ virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE;
+ virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE;
+ virtual bool SplitRedline(const SwPaM& rPam) SAL_OVERRIDE;
+ virtual bool DeleteRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE;
+ virtual bool DeleteRedline(/*[in]*/const SwStartNode& rSection, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE;
+ virtual sal_uInt16 GetRedlinePos(/*[in]*/const SwNode& rNode, /*[in]*/sal_uInt16 nType) const SAL_OVERRIDE;
+ virtual void CompressRedlines() SAL_OVERRIDE;
+ virtual const SwRangeRedline* GetRedline(/*[in]*/const SwPosition& rPos, /*[in]*/sal_uInt16* pFndPos) const SAL_OVERRIDE;
+ virtual bool IsRedlineMove() const SAL_OVERRIDE;
+ virtual void SetRedlineMove(/*[in]*/bool bFlag) SAL_OVERRIDE;
+ virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE;
+ virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE;
+ virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE;
+ virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE;
+ virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE;
+ virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE;
+ virtual void UpdateRedlineAttr() SAL_OVERRIDE;
+ virtual sal_uInt16 GetRedlineAuthor() SAL_OVERRIDE;
+ virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor) SAL_OVERRIDE;
+ virtual bool SetRedlineComment(/*[in]*/const SwPaM& rPam, /*[in]*/const OUString& rComment) SAL_OVERRIDE;
+ virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const SAL_OVERRIDE;
+ virtual void SetRedlinePassword(/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) SAL_OVERRIDE;
// IDocumentUndoRedo
IDocumentUndoRedo & GetIDocumentUndoRedo();
IDocumentUndoRedo const& GetIDocumentUndoRedo() const;
// IDocumentLinksAdministration
- virtual bool IsVisibleLinks() const;
- virtual void SetVisibleLinks(bool bFlag);
- virtual sfx2::LinkManager& GetLinkManager();
- virtual const sfx2::LinkManager& GetLinkManager() const;
- virtual void UpdateLinks(bool bUI);
- virtual bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const;
- virtual bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue);
- virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem);
- virtual bool EmbedAllLinks();
- virtual void SetLinksUpdated(const bool bNewLinksUpdated);
- virtual bool LinksUpdated() const;
+ virtual bool IsVisibleLinks() const SAL_OVERRIDE;
+ virtual void SetVisibleLinks(bool bFlag) SAL_OVERRIDE;
+ virtual sfx2::LinkManager& GetLinkManager() SAL_OVERRIDE;
+ virtual const sfx2::LinkManager& GetLinkManager() const SAL_OVERRIDE;
+ virtual void UpdateLinks(bool bUI) SAL_OVERRIDE;
+ virtual bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const SAL_OVERRIDE;
+ virtual bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) SAL_OVERRIDE;
+ virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) SAL_OVERRIDE;
+ virtual bool EmbedAllLinks() SAL_OVERRIDE;
+ virtual void SetLinksUpdated(const bool bNewLinksUpdated) SAL_OVERRIDE;
+ virtual bool LinksUpdated() const SAL_OVERRIDE;
// IDocumentFieldsAccess
- virtual const SwFldTypes *GetFldTypes() const;
- virtual SwFieldType *InsertFldType(const SwFieldType &);
- virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const;
- virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const;
- virtual void RemoveFldType(sal_uInt16 nFld);
- virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB);
- virtual void InsDeletedFldType(SwFieldType &);
- virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich);
- virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds);
- virtual void UpdateRefFlds(SfxPoolItem* pHt);
- virtual void UpdateTblFlds(SfxPoolItem* pHt);
- virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds);
- virtual void UpdateUsrFlds();
- virtual void UpdatePageFlds(SfxPoolItem*);
- virtual void LockExpFlds();
- virtual void UnlockExpFlds();
- virtual bool IsExpFldsLocked() const;
- virtual SwDocUpdtFld& GetUpdtFlds() const;
- virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen);
- virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime);
- virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt);
- virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld);
- virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld);
- virtual bool IsNewFldLst() const;
- virtual void SetNewFldLst( bool bFlag);
- virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld);
+ virtual const SwFldTypes *GetFldTypes() const SAL_OVERRIDE;
+ virtual SwFieldType *InsertFldType(const SwFieldType &) SAL_OVERRIDE;
+ virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const SAL_OVERRIDE;
+ virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const SAL_OVERRIDE;
+ virtual void RemoveFldType(sal_uInt16 nFld) SAL_OVERRIDE;
+ virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) SAL_OVERRIDE;
+ virtual void InsDeletedFldType(SwFieldType &) SAL_OVERRIDE;
+ virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) SAL_OVERRIDE;
+ virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) SAL_OVERRIDE;
+ virtual void UpdateRefFlds(SfxPoolItem* pHt) SAL_OVERRIDE;
+ virtual void UpdateTblFlds(SfxPoolItem* pHt) SAL_OVERRIDE;
+ virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) SAL_OVERRIDE;
+ virtual void UpdateUsrFlds() SAL_OVERRIDE;
+ virtual void UpdatePageFlds(SfxPoolItem*) SAL_OVERRIDE;
+ virtual void LockExpFlds() SAL_OVERRIDE;
+ virtual void UnlockExpFlds() SAL_OVERRIDE;
+ virtual bool IsExpFldsLocked() const SAL_OVERRIDE;
+ virtual SwDocUpdtFld& GetUpdtFlds() const SAL_OVERRIDE;
+ virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) SAL_OVERRIDE;
+ virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) SAL_OVERRIDE;
+ virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) SAL_OVERRIDE;
+ virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) SAL_OVERRIDE;
+ virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) SAL_OVERRIDE;
+ virtual bool IsNewFldLst() const SAL_OVERRIDE;
+ virtual void SetNewFldLst( bool bFlag) SAL_OVERRIDE;
+ virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) SAL_OVERRIDE;
/** Returns the field at a certain position.
@param rPos position to search at
@@ -845,165 +845,165 @@ public:
bool containsUpdatableFields();
// IDocumentContentOperations
- virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll) const;
- virtual void DeleteSection(SwNode* pNode);
- virtual bool DeleteRange(SwPaM&);
- virtual bool DelFullPara(SwPaM&);
+ virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll) const SAL_OVERRIDE;
+ virtual void DeleteSection(SwNode* pNode) SAL_OVERRIDE;
+ virtual bool DeleteRange(SwPaM&) SAL_OVERRIDE;
+ virtual bool DelFullPara(SwPaM&) SAL_OVERRIDE;
// Add optional parameter <bForceJoinNext>, default value <false>
// Needed for hiding of deletion redlines
virtual bool DeleteAndJoin( SwPaM&,
- const bool bForceJoinNext = false );
- virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags);
- virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags);
- virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags);
- virtual bool Overwrite(const SwPaM &rRg, const OUString& rStr);
+ const bool bForceJoinNext = false ) SAL_OVERRIDE;
+ virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE;
+ virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags) SAL_OVERRIDE;
+ virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE;
+ virtual bool Overwrite(const SwPaM &rRg, const OUString& rStr) SAL_OVERRIDE;
virtual bool InsertString(const SwPaM &rRg, const OUString&,
- const enum InsertFlags nInsertMode = INS_EMPTYEXPAND );
+ const enum InsertFlags nInsertMode = INS_EMPTYEXPAND ) SAL_OVERRIDE;
virtual bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 );
virtual bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen );
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
- const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
+ const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
+ const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
virtual SwDrawFrmFmt* InsertDrawObj(
const SwPaM &rRg,
SdrObject& rDrawObj,
- const SfxItemSet& rFlyAttrSet );
+ const SfxItemSet& rFlyAttrSet ) SAL_OVERRIDE;
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
+ const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
// Add a para for the char attribute exp...
virtual bool InsertPoolItem(
const SwPaM &rRg,
const SfxPoolItem&,
const SetAttrMode nFlags,
- const bool bExpandCharToPara=false);
+ const bool bExpandCharToPara=false) SAL_OVERRIDE;
virtual bool InsertItemSet (const SwPaM &rRg, const SfxItemSet&,
- const SetAttrMode nFlags);
- virtual void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj);
- virtual void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&);
+ const SetAttrMode nFlags) SAL_OVERRIDE;
+ virtual void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) SAL_OVERRIDE;
+ virtual void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) SAL_OVERRIDE;
virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
- virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart);
- virtual bool AppendTxtNode(SwPosition& rPos);
+ const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
+ virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart) SAL_OVERRIDE;
+ virtual bool AppendTxtNode(SwPosition& rPos) SAL_OVERRIDE;
virtual void SetModified(SwPaM &rPaM);
virtual bool ReplaceRange(SwPaM& rPam, const OUString& rNewStr,
- const bool bRegExReplace);
- virtual void RemoveLeadingWhiteSpace(const SwPosition & rPos );
+ const bool bRegExReplace) SAL_OVERRIDE;
+ virtual void RemoveLeadingWhiteSpace(const SwPosition & rPos ) SAL_OVERRIDE;
// IDocumentStylePoolAccess
- virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true );
- virtual SwFmt* GetFmtFromPool( sal_uInt16 nId );
- virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId );
- virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId );
- virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true );
- virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId );
- virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const;
- virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const;
- virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const;
+ virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE;
+ virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE;
+ virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
+ virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
+ virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
// IDocumentLineNumberAccess
- virtual const SwLineNumberInfo& GetLineNumberInfo() const;
- virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo);
+ virtual const SwLineNumberInfo& GetLineNumberInfo() const SAL_OVERRIDE;
+ virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo) SAL_OVERRIDE;
// IDocumentStatistics
- virtual void DocInfoChgd();
- virtual const SwDocStat &GetDocStat() const;
- virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true);
- virtual void SetDocStat(const SwDocStat& rStat);
- virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true);
+ virtual void DocInfoChgd() SAL_OVERRIDE;
+ virtual const SwDocStat &GetDocStat() const SAL_OVERRIDE;
+ virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE;
+ virtual void SetDocStat(const SwDocStat& rStat) SAL_OVERRIDE;
+ virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE;
// IDocumentState
- virtual void SetModified();
- virtual void ResetModified();
- virtual bool IsModified() const;
- virtual bool IsLoaded() const;
- virtual bool IsUpdateExpFld() const;
- virtual bool IsNewDoc() const;
- virtual bool IsPageNums() const;
- virtual void SetPageNums(bool b);
- virtual void SetNewDoc(bool b);
- virtual void SetUpdateExpFldStat(bool b);
- virtual void SetLoaded(bool b);
+ virtual void SetModified() SAL_OVERRIDE;
+ virtual void ResetModified() SAL_OVERRIDE;
+ virtual bool IsModified() const SAL_OVERRIDE;
+ virtual bool IsLoaded() const SAL_OVERRIDE;
+ virtual bool IsUpdateExpFld() const SAL_OVERRIDE;
+ virtual bool IsNewDoc() const SAL_OVERRIDE;
+ virtual bool IsPageNums() const SAL_OVERRIDE;
+ virtual void SetPageNums(bool b) SAL_OVERRIDE;
+ virtual void SetNewDoc(bool b) SAL_OVERRIDE;
+ virtual void SetUpdateExpFldStat(bool b) SAL_OVERRIDE;
+ virtual void SetLoaded(bool b) SAL_OVERRIDE;
// IDocumentDrawModelAccess
- virtual const SdrModel* GetDrawModel() const;
- virtual SdrModel* GetDrawModel();
- virtual SdrLayerID GetHeavenId() const;
- virtual SdrLayerID GetHellId() const;
- virtual SdrLayerID GetControlsId() const;
- virtual SdrLayerID GetInvisibleHeavenId() const;
- virtual SdrLayerID GetInvisibleHellId() const;
- virtual SdrLayerID GetInvisibleControlsId() const;
- virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView );
- virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const;
- virtual SdrLayerID GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId );
- virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId );
- virtual SdrModel* _MakeDrawModel();
- virtual SdrModel* GetOrCreateDrawModel();
+ virtual const SdrModel* GetDrawModel() const SAL_OVERRIDE;
+ virtual SdrModel* GetDrawModel() SAL_OVERRIDE;
+ virtual SdrLayerID GetHeavenId() const SAL_OVERRIDE;
+ virtual SdrLayerID GetHellId() const SAL_OVERRIDE;
+ virtual SdrLayerID GetControlsId() const SAL_OVERRIDE;
+ virtual SdrLayerID GetInvisibleHeavenId() const SAL_OVERRIDE;
+ virtual SdrLayerID GetInvisibleHellId() const SAL_OVERRIDE;
+ virtual SdrLayerID GetInvisibleControlsId() const SAL_OVERRIDE;
+ virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) SAL_OVERRIDE;
+ virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const SAL_OVERRIDE;
+ virtual SdrLayerID GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ) SAL_OVERRIDE;
+ virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) SAL_OVERRIDE;
+ virtual SdrModel* _MakeDrawModel() SAL_OVERRIDE;
+ virtual SdrModel* GetOrCreateDrawModel() SAL_OVERRIDE;
// IDocumentLayoutAccess
- virtual void SetCurrentViewShell( SwViewShell* pNew );
- virtual SwLayouter* GetLayouter();
- virtual const SwLayouter* GetLayouter() const;
- virtual void SetLayouter( SwLayouter* pNew );
- virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet );
- virtual void DelLayoutFmt( SwFrmFmt *pFmt );
- virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms );
- virtual const SwViewShell *GetCurrentViewShell() const;
- virtual SwViewShell *GetCurrentViewShell(); //< It must be able to communicate to a SwViewShell.This is going to be removerd later.
- virtual const SwRootFrm *GetCurrentLayout() const;
- virtual SwRootFrm *GetCurrentLayout();
- virtual bool HasLayout() const;
+ virtual void SetCurrentViewShell( SwViewShell* pNew ) SAL_OVERRIDE;
+ virtual SwLayouter* GetLayouter() SAL_OVERRIDE;
+ virtual const SwLayouter* GetLayouter() const SAL_OVERRIDE;
+ virtual void SetLayouter( SwLayouter* pNew ) SAL_OVERRIDE;
+ virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual void DelLayoutFmt( SwFrmFmt *pFmt ) SAL_OVERRIDE;
+ virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms ) SAL_OVERRIDE;
+ virtual const SwViewShell *GetCurrentViewShell() const SAL_OVERRIDE;
+ virtual SwViewShell *GetCurrentViewShell() SAL_OVERRIDE; //< It must be able to communicate to a SwViewShell.This is going to be removerd later.
+ virtual const SwRootFrm *GetCurrentLayout() const SAL_OVERRIDE;
+ virtual SwRootFrm *GetCurrentLayout() SAL_OVERRIDE;
+ virtual bool HasLayout() const SAL_OVERRIDE;
void ClearSwLayouterEntries();
// IDocumentTimerAccess
- virtual void StartIdling();
- virtual void StopIdling();
- virtual void BlockIdling();
- virtual void UnblockIdling();
- virtual void StartBackgroundJobs();
+ virtual void StartIdling() SAL_OVERRIDE;
+ virtual void StopIdling() SAL_OVERRIDE;
+ virtual void BlockIdling() SAL_OVERRIDE;
+ virtual void UnblockIdling() SAL_OVERRIDE;
+ virtual void StartBackgroundJobs() SAL_OVERRIDE;
// IDocumentChartDataProviderAccess
- virtual SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const;
- virtual void CreateChartInternalDataProviders( const SwTable *pTable );
- virtual SwChartLockController_Helper & GetChartControllerHelper();
+ virtual SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const SAL_OVERRIDE;
+ virtual void CreateChartInternalDataProviders( const SwTable *pTable ) SAL_OVERRIDE;
+ virtual SwChartLockController_Helper & GetChartControllerHelper() SAL_OVERRIDE;
// IDocumentListItems
- virtual void addListItem( const SwNodeNum& rNodeNum );
- virtual void removeListItem( const SwNodeNum& rNodeNum );
+ virtual void addListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE;
+ virtual void removeListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE;
virtual OUString getListItemText( const SwNodeNum& rNodeNum,
const bool bWithNumber = true,
- const bool bWithSpacesForLevel = false ) const;
- virtual void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const;
- virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const;
+ const bool bWithSpacesForLevel = false ) const SAL_OVERRIDE;
+ virtual void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE;
+ virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE;
// IDocumentOutlineNodes
- virtual sal_Int32 getOutlineNodesCount() const;
- virtual int getOutlineLevel( const sal_Int32 nIdx ) const;
+ virtual sal_Int32 getOutlineNodesCount() const SAL_OVERRIDE;
+ virtual int getOutlineLevel( const sal_Int32 nIdx ) const SAL_OVERRIDE;
virtual OUString getOutlineText( const sal_Int32 nIdx,
const bool bWithNumber,
const bool bWithSpacesForLevel,
- const bool bWithFtn ) const;
- virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const;
- virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const;
+ const bool bWithFtn ) const SAL_OVERRIDE;
+ virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const SAL_OVERRIDE;
+ virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const SAL_OVERRIDE;
// IDocumentListsAccess
virtual SwList* createList( const OUString& rListId,
- const OUString& rDefaultListStyleName );
- virtual void deleteList( const OUString& rListId );
- virtual SwList* getListByName( const OUString& rListId ) const;
- virtual SwList* createListForListStyle( const OUString& rListStyleName );
- virtual SwList* getListForListStyle( const OUString& rListStyleName ) const;
- virtual void deleteListForListStyle( const OUString& rListStyleName );
+ const OUString& rDefaultListStyleName ) SAL_OVERRIDE;
+ virtual void deleteList( const OUString& rListId ) SAL_OVERRIDE;
+ virtual SwList* getListByName( const OUString& rListId ) const SAL_OVERRIDE;
+ virtual SwList* createListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE;
+ virtual SwList* getListForListStyle( const OUString& rListStyleName ) const SAL_OVERRIDE;
+ virtual void deleteListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE;
virtual void trackChangeOfListStyleName( const OUString& rListStyleName,
- const OUString& rNewListStyleName );
+ const OUString& rNewListStyleName ) SAL_OVERRIDE;
// IDocumentExternalData
virtual void setExternalData(::sw::tExternalDataType eType,
- ::sw::tExternalDataPointer pPayload);
- virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType);
+ ::sw::tExternalDataPointer pPayload) SAL_OVERRIDE;
+ virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) SAL_OVERRIDE;
virtual void setDocReadOnly( sal_Bool b) { mbReadOnly = b; }
virtual sal_Bool getDocReadOnly() const { return mbReadOnly; }
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 4c717e735d58..93f18154b40b 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -63,8 +63,8 @@ public:
class SwGrfFmtColls : public std::vector<SwGrfFmtColl*>, public SwFmtsBase
{
public:
- virtual size_t GetFmtCount() const { return size(); }
- virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); }
+ virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); }
+ virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwGrfFmtColl* pFmt) const;
/// free's any remaining child objects
virtual ~SwGrfFmtColls() {}
@@ -77,8 +77,8 @@ class SAL_DLLPUBLIC_TEMPLATE SwFrmFmts_Base : public std::vector<SwFrmFmt*> {};
class SW_DLLPUBLIC SwFrmFmts : public SwFrmFmts_Base, public SwFmtsBase
{
public:
- virtual size_t GetFmtCount() const { return size(); }
- virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); }
+ virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); }
+ virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwFrmFmt* pFmt) const;
bool Contains(const SwFrmFmt* pFmt) const;
/// free's any remaining child objects
@@ -88,8 +88,8 @@ public:
class SwCharFmts : public std::vector<SwCharFmt*>, public SwFmtsBase
{
public:
- virtual size_t GetFmtCount() const { return size(); }
- virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); }
+ virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); }
+ virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwCharFmt* pFmt) const;
bool Contains(const SwCharFmt* pFmt) const;
void dumpAsXml(xmlTextWriterPtr w);
@@ -100,8 +100,8 @@ public:
class SwTxtFmtColls : public std::vector<SwTxtFmtColl*>, public SwFmtsBase
{
public:
- virtual size_t GetFmtCount() const { return size(); }
- virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); }
+ virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); }
+ virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwTxtFmtColl* pFmt) const;
void dumpAsXml(xmlTextWriterPtr w);
virtual ~SwTxtFmtColls() {}
@@ -111,8 +111,8 @@ public:
class SW_DLLPUBLIC SwSectionFmts : public std::vector<SwSectionFmt*>, public SwFmtsBase
{
public:
- virtual size_t GetFmtCount() const { return size(); }
- virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); }
+ virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); }
+ virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwSectionFmt* pFmt) const;
bool Contains(const SwSectionFmt* pFmt) const;
/// free's any remaining child objects
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 72257e277a2f..4662938eab93 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -79,16 +79,16 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SAL_DLLPRIVATE void RemoveLink();
/// Catch hint for DocInfo.
- SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
/// FileIO
- SAL_DLLPRIVATE virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- SAL_DLLPRIVATE virtual bool Load( SfxMedium& rMedium );
- SAL_DLLPRIVATE virtual bool LoadFrom( SfxMedium& rMedium );
- SAL_DLLPRIVATE virtual bool ConvertFrom( SfxMedium &rMedium );
- SAL_DLLPRIVATE virtual bool ConvertTo( SfxMedium &rMedium );
- SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium& rMedium );
- SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ SAL_DLLPRIVATE virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool LoadFrom( SfxMedium& rMedium ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool ConvertFrom( SfxMedium &rMedium ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium& rMedium ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
@@ -98,9 +98,9 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
/// Make DocInfo known to the Doc.
SAL_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
- Window *pParent, const SfxItemSet &);
+ Window *pParent, const SfxItemSet &) SAL_OVERRIDE;
/// OLE-stuff
- SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16);
+ SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) SAL_OVERRIDE;
/// Methods for StyleSheets
@@ -141,7 +141,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
protected:
/// override to update text fields
- virtual void DoFlushDocInfo();
+ virtual void DoFlushDocInfo() SAL_OVERRIDE;
public:
using SotObject::GetInterface;
@@ -165,15 +165,15 @@ public:
DECL_LINK( Ole2ModifiedHdl, void * );
/// OLE-stuff.
- virtual void SetVisArea( const Rectangle &rRect );
- virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const;
- virtual Printer *GetDocumentPrinter();
- virtual OutputDevice* GetDocumentRefDev();
- virtual void OnDocumentPrinterChanged( Printer * pNewPrinter );
- virtual sal_uLong GetMiscStatus() const;
+ virtual void SetVisArea( const Rectangle &rRect ) SAL_OVERRIDE;
+ virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const SAL_OVERRIDE;
+ virtual Printer *GetDocumentPrinter() SAL_OVERRIDE;
+ virtual OutputDevice* GetDocumentRefDev() SAL_OVERRIDE;
+ virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ) SAL_OVERRIDE;
+ virtual sal_uLong GetMiscStatus() const SAL_OVERRIDE;
- virtual void PrepareReload();
- virtual void SetModified( bool = true );
+ virtual void PrepareReload() SAL_OVERRIDE;
+ virtual void SetModified( bool = true ) SAL_OVERRIDE;
/// Dispatcher
void Execute(SfxRequest &);
@@ -195,10 +195,10 @@ public:
void UpdateChildWindows();
/// global IO.
- virtual bool Save();
+ virtual bool Save() SAL_OVERRIDE;
/// For Style PI.
- virtual SfxStyleSheetBasePool* GetStyleSheetPool();
+ virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE;
/// Set View for actions via Shell.
void SetView(SwView* pVw);
@@ -219,11 +219,11 @@ public:
SwCrsrShell* pCrsrSh = 0, SwPaM* pPaM = 0);
virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType,
- ::com::sun::star::uno::Any & rValue );
+ ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType,
- const ::com::sun::star::uno::Any & rValue );
- virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem );
- virtual void ReconnectDdeLink(SfxObjectShell& rServer);
+ const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
+ virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) SAL_OVERRIDE;
+ virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE;
virtual void FillClass( SvGlobalName * pClassName,
sal_uInt32 * pClipFormat,
@@ -231,9 +231,9 @@ public:
OUString * pLongUserName,
OUString * pUserName,
sal_Int32 nFileFormat,
- bool bTemplate = false ) const;
+ bool bTemplate = false ) const SAL_OVERRIDE;
- virtual void LoadStyles( SfxObjectShell& rSource );
+ virtual void LoadStyles( SfxObjectShell& rSource ) SAL_OVERRIDE;
void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument );
@@ -253,7 +253,7 @@ public:
void LoadingFinished();
/// Cancel transfer (called from SFX).
- virtual void CancelTransfers();
+ virtual void CancelTransfers() SAL_OVERRIDE;
/// Re-read Doc from Html-source.
void ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView );
@@ -267,15 +267,15 @@ public:
void InvalidateModel();
void ReactivateModel();
- virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames();
+ virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames() SAL_OVERRIDE;
/// #i20883# Digital Signatures and Encryption
- virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
+ virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ) SAL_OVERRIDE;
/** #i42634# Overwrites SfxObjectShell::UpdateLinks
This new function is necessary to trigger update of links in docs
read by the binary filter: */
- virtual void UpdateLinks();
+ virtual void UpdateLinks() SAL_OVERRIDE;
virtual void setDocAccTitle( const OUString& rTitle );
virtual const OUString getDocAccTitle() const;
@@ -287,15 +287,15 @@ public:
SAL_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
- virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const;
+ virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const SAL_OVERRIDE;
/** passwword protection for Writer (derived from SfxObjectShell)
see also: FN_REDLINE_ON, FN_REDLINE_ON */
- virtual bool IsChangeRecording() const;
- virtual bool HasChangeRecordProtection() const;
- virtual void SetChangeRecording( bool bActivate );
- virtual bool SetProtectionPassword( const OUString &rPassword );
- virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
+ virtual bool IsChangeRecording() const SAL_OVERRIDE;
+ virtual bool HasChangeRecordProtection() const SAL_OVERRIDE;
+ virtual void SetChangeRecording( bool bActivate ) SAL_OVERRIDE;
+ virtual bool SetProtectionPassword( const OUString &rPassword ) SAL_OVERRIDE;
+ virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) SAL_OVERRIDE;
};
/** Find the right DocShell and create a new one:
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 2e2654ba5dd4..e90ff280de31 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -98,8 +98,8 @@ public:
sal_Bool IsPhysical() const { return bPhysical; }
void SetPhysical(sal_Bool bPhys);
- virtual void SetHidden( sal_Bool bHidden );
- virtual bool IsHidden( ) const;
+ virtual void SetHidden( sal_Bool bHidden ) SAL_OVERRIDE;
+ virtual bool IsHidden( ) const SAL_OVERRIDE;
void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
@@ -110,15 +110,15 @@ public:
void SetItemSet( const SfxItemSet& rSet,
const bool bResetIndentAttrsAtParagraphStyle = false );
- virtual SfxItemSet& GetItemSet();
+ virtual SfxItemSet& GetItemSet() SAL_OVERRIDE;
/** new method for paragraph styles to merge indent attributes of applied list
style into the given item set, if the list style indent attributes are applicable. */
void MergeIndentAttrsOfListStyle( SfxItemSet& rSet );
- virtual const OUString& GetParent() const;
- virtual const OUString& GetFollow() const;
+ virtual const OUString& GetParent() const SAL_OVERRIDE;
+ virtual const OUString& GetFollow() const SAL_OVERRIDE;
- virtual sal_uLong GetHelpId( OUString& rFile );
- virtual void SetHelpId( const OUString& r, sal_uLong nId );
+ virtual sal_uLong GetHelpId( OUString& rFile ) SAL_OVERRIDE;
+ virtual void SetHelpId( const OUString& r, sal_uLong nId ) SAL_OVERRIDE;
/** Preset the members without physical access.
Used by StyleSheetPool. */
@@ -127,15 +127,15 @@ public:
void PresetParent(const OUString& rName){ aParent = rName; }
void PresetFollow(const OUString& rName){ aFollow = rName; }
- virtual bool SetName( const OUString& rStr);
- virtual bool SetParent( const OUString& rStr);
- virtual bool SetFollow( const OUString& rStr);
+ virtual bool SetName( const OUString& rStr) SAL_OVERRIDE;
+ virtual bool SetParent( const OUString& rStr) SAL_OVERRIDE;
+ virtual bool SetFollow( const OUString& rStr) SAL_OVERRIDE;
- virtual bool HasFollowSupport() const;
- virtual bool HasParentSupport() const;
- virtual bool HasClearParentSupport() const;
- virtual OUString GetDescription();
- virtual OUString GetDescription(SfxMapUnit eUnit);
+ virtual bool HasFollowSupport() const SAL_OVERRIDE;
+ virtual bool HasParentSupport() const SAL_OVERRIDE;
+ virtual bool HasClearParentSupport() const SAL_OVERRIDE;
+ virtual OUString GetDescription() SAL_OVERRIDE;
+ virtual OUString GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE;
SwCharFmt* GetCharFmt();
SwTxtFmtColl* GetCollection();
@@ -144,7 +144,7 @@ public:
const SwNumRule* GetNumRule();
void SetNumRule(const SwNumRule& rRule);
- virtual bool IsUsed() const;
+ virtual bool IsUsed() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -171,13 +171,13 @@ public:
SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL );
virtual ~SwStyleSheetIterator();
- virtual sal_uInt16 Count();
- virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
- virtual SfxStyleSheetBase* First();
- virtual SfxStyleSheetBase* Next();
- virtual SfxStyleSheetBase* Find(const OUString& rStr);
+ virtual sal_uInt16 Count() SAL_OVERRIDE;
+ virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx) SAL_OVERRIDE;
+ virtual SfxStyleSheetBase* First() SAL_OVERRIDE;
+ virtual SfxStyleSheetBase* Next() SAL_OVERRIDE;
+ virtual SfxStyleSheetBase* Find(const OUString& rStr) SAL_OVERRIDE;
- virtual void Notify( SfxBroadcaster&, const SfxHint& );
+ virtual void Notify( SfxBroadcaster&, const SfxHint& ) SAL_OVERRIDE;
void InvalidateIterator();
};
@@ -188,8 +188,8 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool
SwDoc& rDoc;
sal_Bool bOrganizer : 1; ///< Organizer
- virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask);
- virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& );
+ virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask) SAL_OVERRIDE;
+ virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ) SAL_OVERRIDE;
using SfxStyleSheetBasePool::Find;
@@ -197,29 +197,29 @@ public:
SwDocStyleSheetPool( SwDoc&, sal_Bool bOrganizer = sal_False );
virtual void Replace( SfxStyleSheetBase& rSource,
- SfxStyleSheetBase& rTarget );
+ SfxStyleSheetBase& rTarget ) SAL_OVERRIDE;
virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily,
sal_uInt16 nMask) SAL_OVERRIDE;
virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam,
- sal_uInt16 n=SFXSTYLEBIT_ALL );
+ sal_uInt16 n=SFXSTYLEBIT_ALL ) SAL_OVERRIDE;
virtual bool SetParent( SfxStyleFamily eFam, const OUString &rStyle,
- const OUString &rParent );
+ const OUString &rParent ) SAL_OVERRIDE;
- virtual void Remove( SfxStyleSheetBase* pStyle);
+ virtual void Remove( SfxStyleSheetBase* pStyle) SAL_OVERRIDE;
void SetOrganizerMode( sal_Bool bMode ) { bOrganizer = bMode; }
sal_Bool IsOrganizerMode() const { return bOrganizer; }
- virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask );
+ virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask ) SAL_OVERRIDE;
SwDoc& GetDoc() const { return rDoc; }
void dispose();
- 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;
void InvalidateIterator();
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index c1c1c7cc977a..27a0c0461626 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -148,7 +148,7 @@ public:
sal_uInt16 const nMaxPage, const OUString& ) const;
void ChangeExpansion( SwDoc* pDoc,
sal_Bool bVirtPageNum, const sal_Int16* pNumFmt = 0 );
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -173,15 +173,15 @@ public:
void ChangeExpansion(sal_uInt16 const nPageNumber,
sal_uInt16 const nMaxPage);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
- virtual sal_uInt16 GetSubType() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
OUString GetUserString() const { return sUserStr; }
void SetUserString( const OUString& rS ) { sUserStr = rS; }
@@ -197,7 +197,7 @@ public:
SwAuthorFieldType();
OUString Expand(sal_uLong) const;
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -211,14 +211,14 @@ class SwAuthorField : public SwField
public:
SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
inline void SetExpansion(const OUString& rStr) { aContent = rStr; }
inline OUString GetContent() const { return aContent; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -232,7 +232,7 @@ public:
SwFileNameFieldType(SwDoc*);
OUString Expand(sal_uLong) const;
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -246,14 +246,14 @@ class SW_DLLPUBLIC SwFileNameField : public SwField
public:
SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
inline void SetExpansion(const OUString& rStr) { aContent = rStr; }
inline OUString GetContent() const { return aContent; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -267,7 +267,7 @@ public:
SwTemplNameFieldType(SwDoc*);
OUString Expand(sal_uLong) const;
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -279,10 +279,10 @@ class SW_DLLPUBLIC SwTemplNameField : public SwField
public:
SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -297,7 +297,7 @@ class SwDocStatFieldType : public SwFieldType
public:
SwDocStatFieldType(SwDoc*);
OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const;
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; }
};
@@ -316,13 +316,13 @@ public:
void ChangeExpansion( const SwFrm* pFrm );
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nSub);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -335,7 +335,7 @@ class SwHiddenTxtFieldType : public SwFieldType
public:
SwHiddenTxtFieldType(sal_Bool bSetHidden = sal_True);
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
void SetHiddenFlag( sal_Bool bSetHidden = sal_True );
inline sal_Bool GetHiddenFlag() const { return bHidden; }
@@ -358,8 +358,8 @@ class SwHiddenTxtField : public SwField
sal_Bool bIsHidden : 1; ///< Is it not visible?
sal_Bool bValid : 1; ///< Is DB-field evaluated?
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwHiddenTxtField( SwHiddenTxtFieldType*,
@@ -375,7 +375,7 @@ public:
const OUString& rFalse,
sal_uInt16 nSubType = TYP_HIDDENTXTFLD);
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
void Evaluate(SwDoc*);
@@ -384,17 +384,17 @@ public:
OUString GetDBName(const OUString& rName, SwDoc *pDoc);
/// Condition
- virtual void SetPar1(const OUString& rStr);
- virtual OUString GetPar1() const;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const SAL_OVERRIDE;
/// True/False - String
- virtual void SetPar2(const OUString& rStr);
- virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual sal_uInt16 GetSubType() const;
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -406,7 +406,7 @@ class SwHiddenParaFieldType : public SwFieldType
public:
SwHiddenParaFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -421,17 +421,17 @@ public:
/// Direct input, delete old value.
SwHiddenParaField(SwHiddenParaFieldType*, const OUString& rCond);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
void SetHidden(sal_Bool bHidden) { bIsHidden = bHidden; }
sal_Bool IsHidden() const { return bIsHidden; }
/// Query, set condition.
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -445,7 +445,7 @@ class SwMacroFieldType : public SwFieldType
public:
SwMacroFieldType(SwDoc*);
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -458,8 +458,8 @@ class SW_DLLPUBLIC SwMacroField : public SwField
OUString aText;
sal_Bool bIsScriptURL;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
/// Direct input, delete old value.
@@ -471,17 +471,17 @@ public:
OUString GetMacroName() const;
SvxMacro GetSvxMacro() const;
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
/// Library and FileName
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
/// Macrotext
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
static void CreateMacroString( OUString& rMacro,
const OUString& rMacroName,
@@ -501,7 +501,7 @@ private:
public:
SwPostItFieldType(SwDoc* pDoc);
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
SwDoc* GetDoc() const
{
@@ -532,20 +532,20 @@ public:
const DateTime& rDate);
~SwPostItField();
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
inline const DateTime GetDateTime() const { return aDateTime; }
inline const Date GetDate() const { return aDateTime.GetDate(); }
inline const Time GetTime() const { return aDateTime.GetTime(); }
/// Author
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
/// Text
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
OUString GetTxt() const { return sTxt; }
OUString GetInitials() const;
void SetName(const OUString& rStr);
@@ -556,9 +556,9 @@ public:
sal_Int32 GetNumberOfParagraphs() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
- virtual OUString GetDescription() const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -571,7 +571,7 @@ public:
SwDocInfoFieldType(SwDoc* pDc);
OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, sal_uInt16 nLang, const OUString& rName) const;
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwDocInfoField : public SwValueField
@@ -580,22 +580,22 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField
OUString aContent;
OUString aName;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt=0);
SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt=0);
- virtual void SetSubType(sal_uInt16);
- virtual sal_uInt16 GetSubType() const;
- virtual void SetLanguage(sal_uInt16 nLng);
- virtual OUString GetFieldName() const;
+ virtual void SetSubType(sal_uInt16) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
OUString GetName() const { return aName; }
void SetName( const OUString& rName ) { aName = rName; }
inline void SetExpansion(const OUString& rStr) { aContent = rStr; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -611,7 +611,7 @@ public:
inline void SetData(const OUString& rStr) { aData = rStr; }
OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const;
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
class SwExtUserField : public SwField
@@ -622,16 +622,16 @@ class SwExtUserField : public SwField
public:
SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0);
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nSub);
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
inline void SetExpansion(const OUString& rStr) { aContent = rStr; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -643,11 +643,11 @@ class SwRefPageSetFieldType : public SwFieldType
public:
SwRefPageSetFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
protected:
/// Overlay, because there is nothing to update!
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem * );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -663,18 +663,18 @@ public:
SwRefPageSetField( SwRefPageSetFieldType*, short nOff = 0,
sal_Bool bOn = sal_True );
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
sal_Bool IsOn() const { return bOn; }
short GetOffset() const { return nOffset; }
void SetOffset( short nOff ) { nOffset = nOff; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -689,10 +689,10 @@ class SwRefPageGetFieldType : public SwFieldType
void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList );
protected:
/// overwritten to update all RefPageGet fields
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem * );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
public:
SwRefPageGetFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst );
SwDoc* GetDoc() const { return pDoc; }
};
@@ -707,14 +707,14 @@ class SwRefPageGetField : public SwField
public:
SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt );
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
void SetText( const OUString& rTxt ) { sTxt = rTxt; }
void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld );
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -728,7 +728,7 @@ class SwJumpEditFieldType : public SwFieldType
public:
SwJumpEditFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
SwCharFmt* GetCharFmt();
};
@@ -740,21 +740,21 @@ public:
SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
const OUString& sText, const OUString& sHelp );
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
/// Placeholder-Text
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
/// Hint-Text
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
SwCharFmt* GetCharFmt() const
{ return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -767,7 +767,7 @@ class SwScriptFieldType : public SwFieldType
public:
SwScriptFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -786,22 +786,22 @@ public:
SwScriptField( SwScriptFieldType*, const OUString& rType,
const OUString& rCode, sal_Bool bURL=sal_False );
- virtual OUString GetDescription() const;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
/// Type
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
/// Text
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
sal_Bool IsCodeURL() const { return bCodeURL; }
void SetCodeURL( sal_Bool bURL ) { bCodeURL = bURL; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -813,7 +813,7 @@ class SwCombinedCharFieldType : public SwFieldType
public:
SwCombinedCharFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -829,15 +829,15 @@ class SW_DLLPUBLIC SwCombinedCharField : public SwField
public:
SwCombinedCharField( SwCombinedCharFieldType*, const OUString& rChars );
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
/// Characters
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_INC_DOCUFLD_HXX
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index e9f414858467..b9774007b01e 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -38,14 +38,14 @@ public:
// #i3694#
// This GetOffset() method is not needed anymore, it even leads to errors.
// virtual Point GetOffset() const;
- virtual SdrObject* ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum );
+ virtual SdrObject* ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum ) SAL_OVERRIDE;
virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV,
- const Rectangle *pRect) const;
+ const Rectangle *pRect) const SAL_OVERRIDE;
sal_Bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE;
};
#endif // INCLUDED_SW_INC_DPAGE_HXX
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index e5eaad641c0b..6d255dfe25c3 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -34,17 +34,17 @@ public:
const SwDoc& GetDoc() const { return *pDoc; }
SwDoc& GetDoc() { return *pDoc; }
- virtual SdrPage* AllocPage(bool bMasterPage);
+ virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::embed::XStorage> GetDocumentStorage() const;
+ ::com::sun::star::embed::XStorage> GetDocumentStorage() const SAL_OVERRIDE;
/// For saving of rectangles as control-replacement for versions < 5.0.
- virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
+ virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const SAL_OVERRIDE;
protected:
/// overload of <SdrModel::createUnoModel()> is needed to provide corresponding uno model.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c03d5bf2444a..cf7b02a87c04 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -583,7 +583,7 @@ public:
sal_Bool HasOtherCnt() const;
/// Apply ViewOptions with Start-/EndAction.
- virtual void ApplyViewOptions( const SwViewOption &rOpt );
+ virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE;
/** Query text within selection.
@returns FALSE, if selected range is too large to be copied
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 8aaf12e04abc..f688d9024e03 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -74,12 +74,12 @@ class SwGetExpFieldType : public SwValueFieldType
{
public:
SwGetExpFieldType(SwDoc* pDoc);
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
/** Overlay, because get-field cannot be changed and therefore
does not need to be updated. Update at changing of set-values! */
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
@@ -90,15 +90,15 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
bool bLateInitialization; // #i82544#
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwGetExpField( SwGetExpFieldType*, const OUString& rFormel,
sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0);
- virtual void SetValue( const double& rVal );
- virtual void SetLanguage(sal_uInt16 nLng);
+ virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
+ virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
inline OUString GetExpStr() const;
inline void ChgExpStr(const OUString& rExpand);
@@ -113,16 +113,16 @@ public:
Only called by formatting!! */
void ChangeExpansion( const SwFrm&, const SwTxtFld& );
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
/// Change formula.
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nType);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
static sal_Int32 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint = 0);
// #i82544#
@@ -155,13 +155,13 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
sal_Bool bDeleted;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
SwSetExpFieldType( SwDoc* pDoc, const OUString& rName,
sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR );
- virtual SwFieldType* Copy() const;
- virtual OUString GetName() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual OUString GetName() const SAL_OVERRIDE;
inline void SetType(sal_uInt16 nTyp);
inline sal_uInt16 GetType() const;
@@ -192,8 +192,8 @@ public:
const SwNode* GetOutlineChgNd() const { return pOutlChgNd; }
void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp )
@@ -217,13 +217,13 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
sal_uInt16 nSeqNo;
sal_uInt16 nSubType;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFmt = 0);
- virtual void SetValue( const double& rVal );
+ virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
inline OUString GetExpStr() const;
@@ -235,10 +235,10 @@ public:
inline void SetInputFlag(sal_Bool bInp);
inline sal_Bool GetInputFlag() const;
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nType);
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
inline sal_Bool IsSequenceFld() const;
@@ -247,13 +247,13 @@ public:
inline sal_uInt16 GetSeqNumber() const { return nSeqNo; }
/// Query name only.
- virtual OUString GetPar1() const;
+ virtual OUString GetPar1() const SAL_OVERRIDE;
/// Query formula.
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
inline OUString SwSetExpField::GetExpStr() const
@@ -283,7 +283,7 @@ class SwInputFieldType : public SwFieldType
public:
SwInputFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
SwDoc* GetDoc() const { return pDoc; }
};
@@ -299,8 +299,8 @@ class SW_DLLPUBLIC SwInputField : public SwField
SwFmtFld* mpFmtFld; // attribute to which the <SwInputField> belongs to
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
// Accessing Input Field's content
const OUString& getContent() const;
@@ -328,15 +328,15 @@ public:
bool isFormField() const;
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
/// Content
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
/// aPromptText
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
virtual OUString GetHelp() const;
virtual void SetHelp(const OUString & rStr);
@@ -344,10 +344,10 @@ public:
virtual OUString GetToolTip() const;
virtual void SetToolTip(const OUString & rStr);
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nSub);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
/*--------------------------------------------------------------------
@@ -383,7 +383,7 @@ class SwTblFieldType : public SwValueFieldType
{
public:
SwTblFieldType(SwDoc* pDocPtr);
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
class SwTblField : public SwValueField, public SwTableFormula
@@ -391,11 +391,11 @@ class SwTblField : public SwValueField, public SwTableFormula
OUString sExpand;
sal_uInt16 nSubType;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
/// Search TextNode containing the field.
- virtual const SwNode* GetNodeOfFormula() const;
+ virtual const SwNode* GetNodeOfFormula() const SAL_OVERRIDE;
OUString GetCommand();
@@ -403,22 +403,22 @@ public:
SwTblField( SwTblFieldType*, const OUString& rFormel,
sal_uInt16 nSubType = 0, sal_uLong nFmt = 0);
- virtual void SetValue( const double& rVal );
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nType);
+ virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
OUString GetExpStr() const { return sExpand; }
void ChgExpStr(const OUString& rStr) { sExpand = rStr; }
void CalcField( SwTblCalcPara& rCalcPara );
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
/// The formula.
- virtual OUString GetPar2() const;
- virtual void SetPar2(const OUString& rStr);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_INC_EXPFLD_HXX
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index c296565b3a90..357aafe67fd5 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -44,7 +44,7 @@ public:
/// @@@ public copy ctor, but no copy assignment?
SwFmtCharFmt( const SwFmtCharFmt& rAttr );
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
private:
/// @@@ public copy ctor, but no copy assignment?
@@ -54,18 +54,18 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
- virtual bool GetInfo( SfxPoolItem& rInfo ) const;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); }
SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); }
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 3723f31092d2..0108500d3568 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -319,7 +319,7 @@ public:
void SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset = 1 );
/// Show current selection (frame / draw object as required).
- virtual void MakeSelVisible();
+ virtual void MakeSelVisible() SAL_OVERRIDE;
/** @return FrmFmt of object that may be under Point.
Object does not become selected! */
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 90cd505cc2e3..ddf1c3274b87 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -409,8 +409,8 @@ protected:
public:
virtual ~SwValueField();
- virtual SwFieldType* ChgTyp( SwFieldType* );
- virtual void SetLanguage(sal_uInt16 nLng);
+ virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE;
+ virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); }
@@ -432,7 +432,7 @@ protected:
SwFormulaField( const SwFormulaField& rFld );
public:
- virtual OUString GetFormula() const;
+ virtual OUString GetFormula() const SAL_OVERRIDE;
void SetFormula(const OUString& rStr);
void SetExpandedFormula(const OUString& rStr);
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 8b854ff89435..fa07bd5c5c52 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -85,7 +85,7 @@ class SwDateTimeFieldType : public SwValueFieldType
public:
SwDateTimeFieldType(SwDoc* pDoc);
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwDateTimeField : public SwValueField
@@ -93,20 +93,20 @@ class SW_DLLPUBLIC SwDateTimeField : public SwValueField
sal_uInt16 nSubType;
long nOffset; // Offset in minutes.
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
public:
SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD,
sal_uLong nFmt = 0, sal_uInt16 nLng = 0);
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType(sal_uInt16 nSub);
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
- virtual double GetValue() const;
+ virtual double GetValue() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr);
- virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const SAL_OVERRIDE;
inline sal_Bool IsDate() const
{ return (nSubType & DATEFLD) != 0; }
@@ -119,8 +119,8 @@ public:
void SetDateTime(const DateTime& rDT);
static double GetDateTime(SwDoc* pDoc, const DateTime& rDT);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_INC_FLDDAT_HXX
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 8ba7905909f4..55751e61dc67 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -46,7 +46,7 @@ public:
@return a copy of this type
*/
- virtual SwFieldType * Copy () const;
+ virtual SwFieldType * Copy () const SAL_OVERRIDE;
};
/**
@@ -90,14 +90,14 @@ class SW_DLLPUBLIC SwDropDownField : public SwField
@return the expanded value of the field
*/
- virtual OUString Expand() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
/**
Creates a copy of this field.
@return the copy of this field
*/
- virtual SwField * Copy() const;
+ virtual SwField * Copy() const SAL_OVERRIDE;
public:
/**
@@ -126,14 +126,14 @@ public:
@return the selected value
*/
- virtual OUString GetPar1() const;
+ virtual OUString GetPar1() const SAL_OVERRIDE;
/**
Returns the name of the field.
@return the name of the field
*/
- virtual OUString GetPar2() const;
+ virtual OUString GetPar2() const SAL_OVERRIDE;
/**
Sets the selected value.
@@ -142,14 +142,14 @@ public:
selected. Otherwise no item will be selected, i.e. the
resulting selection will be empty.
*/
- virtual void SetPar1(const OUString & rStr);
+ virtual void SetPar1(const OUString & rStr) SAL_OVERRIDE;
/**
Sets the name of the field.
@param rStr the new name of the field
*/
- virtual void SetPar2(const OUString & rStr);
+ virtual void SetPar2(const OUString & rStr) SAL_OVERRIDE;
/**
Sets the items of the dropdown box.
@@ -248,7 +248,7 @@ public:
- FIELD_PROP_PAR3 Get the help text of the field.
- FIELD_PROP_PAR4 Get the tool tip of the field.
*/
- virtual bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const;
+ virtual bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const SAL_OVERRIDE;
/**
API: Sets a property value on the dropdown field.
@@ -260,7 +260,7 @@ public:
- FIELD_PROP_PAR3 Set the help text of the field.
- FIELD_PROP_PAR4 Set the tool tip of the field.
*/
- virtual bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId);
+ virtual bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 74b3395406bb..f410ca22c912 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -51,16 +51,16 @@ public:
SwFmtAnchor &operator=( const SwFmtAnchor& );
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
RndStdIds GetAnchorId() const { return nAnchorId; }
sal_uInt16 GetPageNum() const { return nPageNum; }
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 1009ba155e18..eada4b6ac8c9 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -45,16 +45,16 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index c7ee3440f76b..5ded377618a6 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -31,7 +31,7 @@ public:
: SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {}
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(sal_Bool bInP) const
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 81f2f0e06207..4393f5cb8f78 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -100,16 +100,16 @@ public:
SwFmtCol& operator=( const SwFmtCol& );
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
const SwColumns &GetColumns() const { return aColumns; }
SwColumns &GetColumns() { return aColumns; }
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 690857eb5bef..4d69b242ec49 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -40,15 +40,15 @@ public:
inline SwFmtChain &operator=( const SwFmtChain& );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); }
SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); }
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 87d83bc51949..db00d0755bad 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -39,8 +39,8 @@ public:
~SwFmtCntnt();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
const SwNodeIndex *GetCntntIdx() const { return pStartNode; }
void SetNewCntntIdx( const SwNodeIndex *pIdx );
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index e5e000f45cdd..1b77f1542df2 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -86,7 +86,7 @@ protected:
{ pNextTxtFmtColl = this; }
/// To get UL- / LR- / FontHeight-changes.
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
@@ -109,12 +109,12 @@ public:
/** Override to recognize changes on the <SwNumRuleItem> and register/unregister
the paragragh style at the corresponding <SwNumRule> instance. */
- virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
- virtual bool SetFmtAttr( const SfxItemSet& rSet );
- virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
+ virtual bool SetFmtAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
+ virtual bool SetFmtAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
/// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style.
- virtual sal_uInt16 ResetAllFmtAttr();
+ virtual sal_uInt16 ResetAllFmtAttr() SAL_OVERRIDE;
inline bool StayAssignedToListLevelOfOutlineStyle() const
{
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index 28ee643974ca..93586fcd3ec0 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -33,12 +33,12 @@ public:
sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {}
/// "pure virtual methos" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(sal_Bool bInP) const
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 81f7e4d21896..d79566b35b2b 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -36,8 +36,8 @@ class SwFmtFlyCnt : public SfxPoolItem
public:
SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
inline SwFrmFmt *GetFrmFmt() const { return pFmt; }
/// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object.
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 5c87e31c58a2..b1e89ecde91e 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -51,8 +51,8 @@ class SW_DLLPUBLIC SwFmtFld : public SfxPoolItem, public SwClient, public SfxBro
SwFmtFld& operator=(const SwFmtFld& rFld);
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
- virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
@@ -66,10 +66,10 @@ public:
virtual ~SwFmtFld();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- virtual bool GetInfo( SfxPoolItem& rInfo ) const;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
const SwField* GetField() const
{
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 2ab47e9e221a..776518d71da6 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -35,12 +35,12 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(sal_Bool bInP) const
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 10de916409a9..b2ca7788a6b1 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -40,8 +40,8 @@ public:
inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); }
};
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index e5920260216e..e10e9c0e3892 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -65,15 +65,15 @@ public:
SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
SwFrmSize GetHeightSizeType() const { return m_eFrmHeightType; }
void SetHeightSizeType( SwFrmSize eSize ) { m_eFrmHeightType = eSize; }
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index c4716fc95cf1..3d65769620b7 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -45,8 +45,8 @@ public:
virtual ~SwFmtFtn();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
OUString GetNumStr() const { return m_aNumber; }
sal_uInt16 GetNumber() const { return m_nNumber; }
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 6d86c2ef9044..1292aa58b82c 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -52,18 +52,18 @@ protected:
{}
public:
- virtual sal_uInt16 GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
- virtual bool operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
inline sal_Bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
@@ -91,7 +91,7 @@ public:
: SwFmtFtnEndAtTxtEnd( RES_FTN_AT_TXTEND, ePos )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwFmtEndAtTxtEnd : public SwFmtFtnEndAtTxtEnd
@@ -103,7 +103,7 @@ public:
SetNumType( SVX_NUM_ROMAN_LOWER );
}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(sal_Bool bInP) const
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index ec9b932fdf4d..b7f887d1dbbd 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -45,13 +45,13 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)GetRegisteredIn(); }
@@ -78,13 +78,13 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)GetRegisteredIn(); }
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index dbdd0850c173..d8664f051795 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -51,18 +51,18 @@ public:
TYPEINFO_OVERRIDE();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const;
+ sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 );
+ sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
const SwTxtINetFmt* GetTxtINetFmt() const
{
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 9d64c83de253..c6a4198561a2 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -38,15 +38,15 @@ public:
TYPEINFO_OVERRIDE();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
sal_uLong GetStartValue() const { return nStartValue; }
sal_Bool IsCount() const { return bCountLines != 0; }
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 416f1d315b87..0ba80aad46b4 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -32,12 +32,12 @@ public:
SwFmtLayoutSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(sal_Bool bInP) const
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 806be2c608d0..9adeedfa748c 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -107,8 +107,8 @@ public:
virtual ~SwFmtMeta();
/// SfxPoolItem
- virtual bool operator==( const SfxPoolItem & ) const;
- virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem & ) const SAL_OVERRIDE;
+ virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
/// notify clients registered at m_pMeta that this meta is being (re-)moved
void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
@@ -151,19 +151,19 @@ protected:
{ m_wXMeta = xMeta; }
/// SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
explicit Meta(SwFmtMeta * const i_pFmt = 0);
virtual ~Meta();
/// 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;
};
class MetaField
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index c4b2dd63d97e..a967823700a7 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -42,18 +42,18 @@ public:
inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
- SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const;
- SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const;
+ SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
+ SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
sal_Int16 GetVertOrient() const { return eOrient; }
sal_Int16 GetRelationOrient() const { return eRelation; }
@@ -77,15 +77,15 @@ public:
inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
sal_Int16 GetHoriOrient() const { return eOrient; }
sal_Int16 GetRelationOrient() const { return eRelation; }
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index be74b34f9006..3aa854538ff8 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -46,8 +46,8 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
SwModify* pDefinedIn; /**< Points to the object in which the
attribute was set (CntntNode/Format). */
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
- virtual void SwClientNotify( const SwModify&, const SfxHint& rHint );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE;
public:
SwFmtPageDesc( const SwPageDesc *pDesc = 0 );
@@ -58,15 +58,15 @@ public:
TYPEINFO_OVERRIDE();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
SwPageDesc *GetPageDesc() { return (SwPageDesc*)GetRegisteredIn(); }
const SwPageDesc *GetPageDesc() const { return (SwPageDesc*)GetRegisteredIn(); }
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index f7c41095d078..650585734de8 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -41,8 +41,8 @@ public:
~SwFmtRefMark( );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; }
SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; }
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index bd0f9cb55fd6..b14edc0a2689 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -32,12 +32,12 @@ public:
SwFmtRowSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(sal_Bool bInP) const
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index e0577c7f89e4..2835d4a5d2ab 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -42,19 +42,19 @@ public:
SwFmtRuby& operator=( const SwFmtRuby& rAttr );
// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const;
+ sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 );
+ sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; }
SwTxtRuby* GetTxtRuby() { return pTxtAttr; }
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 80eea3a4694e..5f974b3ddc56 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -39,16 +39,16 @@ public:
inline SwFmtSurround &operator=( const SwFmtSurround &rCpy );
// "Pure virtual Methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
SwSurround GetSurround()const { return SwSurround( GetValue() ); }
sal_Bool IsAnchorOnly() const { return bAnchorOnly; }
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 4cb250cec47e..c50589267234 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -49,15 +49,15 @@ public:
virtual ~SwFmtURL();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
void SetTargetFrameName( const OUString& rStr ) { sTargetFrameName = rStr; }
void SetURL(const OUString &rURL, bool bServerMap);
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index 9a46e85287bc..565d2b168b47 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -44,11 +44,11 @@ public:
const SwFmtWrapInfluenceOnObjPos& _rSource );
/// pure virtual methods of class <SfxPoolItem>
- virtual bool operator==( const SfxPoolItem& _rAttr ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& _rAttr ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
/// direct accessors to data
void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition );
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 4829caf678ac..038a0834e9d0 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -62,7 +62,7 @@ protected:
SwFmt( SwAttrPool& rPool, const OUString &rFmtNm, const sal_uInt16* pWhichRanges,
SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
SwFmt( const SwFmt& rFmt );
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
@@ -74,7 +74,7 @@ public:
sal_uInt16 Which() const { return nWhichId; }
/// Query format information.
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
/// Copy attributes even among documents.
void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True );
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index a2d2771cc44c..e4fa0cc4d778 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -58,7 +58,7 @@ protected:
pDrvdFrm, nFmtWhich )
{}
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
@@ -164,7 +164,7 @@ public:
~SwFlyFrmFmt();
/// Creates the views.
- virtual void MakeFrms();
+ virtual void MakeFrms() SAL_OVERRIDE;
SwFlyFrm* GetFrm( const Point* pDocPos = 0,
const sal_Bool bCalcFrm = sal_False ) const;
@@ -172,9 +172,9 @@ public:
SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0,
const sal_Bool bCalcFrm = sal_False ) const;
- virtual Graphic MakeGraphic( ImageMap* pMap = NULL );
+ virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE;
- virtual bool GetInfo( SfxPoolItem& rInfo ) const;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
OUString GetObjTitle() const;
void SetObjTitle( const OUString& rTitle, bool bBroadcast = false );
@@ -192,7 +192,7 @@ public:
@return true, if background color is transparent, but not "no fill"
or a existing background graphic is transparent.
*/
- virtual bool IsBackgroundTransparent() const;
+ virtual bool IsBackgroundTransparent() const SAL_OVERRIDE;
/** SwFlyFrmFmt::IsBackgroundBrushInherited
@@ -262,19 +262,19 @@ public:
/** DrawObjects are removed from the arrays at the layout.
The DrawObjects are marked as deleted. */
- virtual void DelFrms();
+ virtual void DelFrms() SAL_OVERRIDE;
/** Register DrawObjects in the arrays at layout.
Reset delete marks. */
- virtual void MakeFrms();
+ virtual void MakeFrms() SAL_OVERRIDE;
- virtual Graphic MakeGraphic( ImageMap* pMap = NULL );
+ virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE;
- virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
- virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
+ virtual SwFrmFmt::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
+ virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
- virtual sal_Int16 GetPositionLayoutDir() const;
- virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
+ virtual sal_Int16 GetPositionLayoutDir() const SAL_OVERRIDE;
+ virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) SAL_OVERRIDE;
inline bool IsPosAttrSet() const { return mbPosAttrSet; }
inline void PosAttrSet() { mbPosAttrSet = true; }
@@ -284,7 +284,7 @@ public:
mbPosAttrSet = false;
}
- virtual OUString GetDescription() const;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt);
};
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 3abf70ff12d0..2ff9034d8c3f 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
OUString sSuffix;
protected:
bool m_bEndNote;
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
SvxNumberType aFmt;
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index b76f891e0737..fa08d449d5b3 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -38,7 +38,7 @@ public:
OUString * pLongUserName,
OUString * pUserName,
sal_Int32 nFileFormat,
- bool bTemplate = false ) const;
+ bool bTemplate = false ) const SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 0223baac2bf6..de916b330c3b 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -56,21 +56,21 @@ public:
{}
// pure virtual methods of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const;
- virtual bool operator==( const SfxPoolItem& ) const;
+ virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const;
+ sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 );
+ sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
{
@@ -96,7 +96,7 @@ public:
sal_Int32 nTop, sal_Int32 nBottom );
// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
class SwRotationGrf : public SfxUInt16Item
@@ -111,17 +111,17 @@ public:
{}
// pure virtual methods from SfxInt16Item
- 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;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const;
+ sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 );
+ sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; }
const Size& GetUnrotatedSize() const { return aUnrotatedSize; }
@@ -135,12 +135,12 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwContrastGrf : public SfxInt16Item
@@ -151,12 +151,12 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
class SwChannelGrf : public SfxInt16Item
@@ -172,7 +172,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
class SwChannelRGrf : public SwChannelGrf
@@ -181,7 +181,7 @@ public:
SwChannelRGrf( sal_Int16 nVal = 0 )
: SwChannelGrf( nVal, RES_GRFATR_CHANNELR )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
class SwChannelGGrf : public SwChannelGrf
{
@@ -189,7 +189,7 @@ public:
SwChannelGGrf( sal_Int16 nVal = 0 )
: SwChannelGrf( nVal, RES_GRFATR_CHANNELG )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
class SwChannelBGrf : public SwChannelGrf
{
@@ -197,7 +197,7 @@ public:
SwChannelBGrf( sal_Int16 nVal = 0 )
: SwChannelGrf( nVal, RES_GRFATR_CHANNELB )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem
@@ -219,18 +219,18 @@ public:
}
// pure virtual methods from SfxEnumItem
- 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;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const;
+ sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 );
+ sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
const double& GetValue() const { return nValue; }
void SetValue( const double& rVal ) { nValue = rVal; }
@@ -244,12 +244,12 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
class SwTransparencyGrf : public SfxByteItem
@@ -260,16 +260,16 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const;
+ sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 );
+ sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem
@@ -280,20 +280,20 @@ public:
{}
// pure virtual methods of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const;
+ sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 );
+ sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
};
/******************************************************************************
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 87e040015487..38747bc392ff 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -32,12 +32,12 @@ public:
sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {}
// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 3e4a6c790d69..df973d0c513b 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -75,18 +75,18 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
protected:
virtual void GetNextPortion( OUString& rNextPortion,
LanguageType& rLangOfPortion,
- bool bAllowImplicitChangesForNotConvertibleText );
+ bool bAllowImplicitChangesForNotConvertibleText ) SAL_OVERRIDE;
virtual void HandleNewUnit( const sal_Int32 nUnitStart,
- const sal_Int32 nUnitEnd );
+ const sal_Int32 nUnitEnd ) SAL_OVERRIDE;
virtual void ReplaceUnit(
const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
const OUString& rOrigText,
const OUString& rReplaceWith,
const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets,
ReplacementAction eAction,
- LanguageType *pNewUnitLanguage );
+ LanguageType *pNewUnitLanguage ) SAL_OVERRIDE;
- virtual bool HasRubySupport() const;
+ virtual bool HasRubySupport() const SAL_OVERRIDE;
public:
SwHHCWrapper(
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 7242d27578d4..649f11b0728b 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -40,8 +40,8 @@ public:
SwMsgPoolItem( sal_uInt16 nWhich );
// "Overhead" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
};
// SwPtrMsgPoolItem (old SwObjectDying!)
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index 619bc1f85dd1..ce84f67df00c 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient /**< purpose of derivation
sal_Bool bRestartEachPage; /**< Restart counting at the first paragraph of each page
(even on follows when paragraphs are splitted) */
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
SwLineNumberInfo();
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 049bd7492f30..3c81e713905f 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -62,8 +62,8 @@ class SwRevisionConfig : public utl::ConfigItem
SwRevisionConfig();
~SwRevisionConfig();
- 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 Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -82,8 +82,8 @@ class SwCompareConfig : public utl::ConfigItem
SwCompareConfig();
~SwCompareConfig();
- virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ){ };
+ virtual void Commit() SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) SAL_OVERRIDE { };
void Load();
void SetModified() {ConfigItem::SetModified(); }
};
@@ -108,8 +108,8 @@ class SwInsertConfig : public utl::ConfigItem
SwInsertConfig(sal_Bool bWeb);
~SwInsertConfig();
- 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 Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -133,8 +133,8 @@ class SwTableConfig : public utl::ConfigItem
SwTableConfig(sal_Bool bWeb);
~SwTableConfig();
- 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 Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -161,8 +161,8 @@ class SwMiscConfig : public utl::ConfigItem
SwMiscConfig();
~SwMiscConfig();
- 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 Load();
void SetModified(){ConfigItem::SetModified();}
};
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 850b23079770..d5e3ddd7a307 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -123,7 +123,7 @@ public:
const Graphic& GetGrf() const { return maGrfObj.GetGraphic(); }
const GraphicObject& GetGrfObj() const { return maGrfObj; }
const GraphicObject* GetReplacementGrfObj() const;
- virtual SwCntntNode *SplitCntntNode( const SwPosition & );
+ virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
/// isolated only way to set GraphicObject to allow more actions when doing so
void SetGraphic(const Graphic& rGraphic, const OUString& rLink);
@@ -137,7 +137,7 @@ public:
/// when GraphicObject content changes
void onGraphicChanged();
- virtual Size GetTwipSize() const;
+ virtual Size GetTwipSize() const SAL_OVERRIDE;
void SetTwipSize( const Size& rSz );
bool IsTransparent() const;
@@ -162,7 +162,7 @@ public:
void SetScaleImageMap( bool b ) { bScaleImageMap = b; }
/// in ndcopy.cxx
- virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
+ virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
/** Re-read in case graphic was not OK. The current one
gets replaced by the new one. */
@@ -180,8 +180,8 @@ public:
bool IsSelected() const;
/// Communicate to graphic that node is in Undo-range.
- virtual bool SavePersistentData();
- virtual bool RestorePersistentData();
+ virtual bool SavePersistentData() SAL_OVERRIDE;
+ virtual bool RestorePersistentData() SAL_OVERRIDE;
/// Query link-data.
bool IsGrfLink() const { return refLink.Is(); }
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 937c4d46134f..37279c68af5d 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
// Creates for all derivations an AttrSet with ranges for frame- and
// graphics-attributes (only called by SwCntntNode).
- virtual void NewAttrSet( SwAttrPool& );
+ virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
SwNoTxtNode( const SwNoTxtNode& ); // Not allowed.
SwNoTxtNode &operator=( const SwNoTxtNode& ); // Not allowed.
@@ -51,7 +51,7 @@ protected:
public:
~SwNoTxtNode();
- virtual SwCntntFrm *MakeFrm( SwFrm* );
+ virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
inline SwGrfFmtColl *GetGrfColl() const { return (SwGrfFmtColl*)GetRegisteredIn(); }
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 9b3f6c777872..f23a205d4473 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -100,19 +100,19 @@ public:
SwOLEObj& GetOLEObj() { return aOLEObj; }
~SwOLENode();
- virtual SwCntntNode *SplitCntntNode( const SwPosition & );
+ virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
/// Is in ndcopy.cxx.
- virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
+ virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
- virtual Size GetTwipSize() const;
+ virtual Size GetTwipSize() const SAL_OVERRIDE;
const Graphic* GetGraphic();
void GetNewReplacement();
- virtual bool SavePersistentData();
- virtual bool RestorePersistentData();
+ virtual bool SavePersistentData() SAL_OVERRIDE;
+ virtual bool RestorePersistentData() SAL_OVERRIDE;
sal_Bool IsInGlobalDocSection() const;
sal_Bool IsOLEObjectDeleted() const;
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 897e6d7e9f2a..8746d106bf54 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -133,7 +133,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet(); // Called by SplitNode.
/// Create the specific AttrSet.
- SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& );
+ SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
/// Optimization: Asking for information about hidden characters at SwScriptInfo
/// updates these flags.
@@ -202,8 +202,8 @@ public:
protected:
/// for hanging TxtFmtCollections somewhere else (Outline-Numbering!)
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
- virtual void SwClientNotify( const SwModify&, const SfxHint& );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
public:
using SwCntntNode::GetAttr;
@@ -223,18 +223,18 @@ public:
virtual ~SwTxtNode();
- virtual sal_Int32 Len() const;
+ virtual sal_Int32 Len() const SAL_OVERRIDE;
/// Is in itratr.
void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs,
OutputDevice* pOut = 0 ) const;
/// overriding to handle change of certain paragraph attributes
- virtual sal_Bool SetAttr( const SfxPoolItem& );
- virtual sal_Bool SetAttr( const SfxItemSet& rSet );
- virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
- virtual sal_Bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr );
- virtual sal_uInt16 ResetAllAttr();
+ virtual sal_Bool SetAttr( const SfxPoolItem& ) SAL_OVERRIDE;
+ virtual sal_Bool SetAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
+ virtual sal_Bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) SAL_OVERRIDE;
+ virtual sal_uInt16 ResetAllAttr() SAL_OVERRIDE;
/// insert text content
/// @param rStr text to insert; in case it does not fit into the capacity
@@ -339,10 +339,10 @@ public:
const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets );
/// Virtual methods from CntntNode.
- virtual SwCntntFrm *MakeFrm( SwFrm* );
- virtual SwCntntNode *SplitCntntNode( const SwPosition & );
- virtual SwCntntNode *JoinNext();
- virtual SwCntntNode *JoinPrev();
+ virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+ virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
+ virtual SwCntntNode *JoinNext() SAL_OVERRIDE;
+ virtual SwCntntNode *JoinPrev() SAL_OVERRIDE;
SwCntntNode *AppendNode( const SwPosition & );
@@ -398,7 +398,7 @@ public:
sal_uInt16 Convert( SwConversionArgs & );
inline SwTxtFmtColl *GetTxtColl() const;
- virtual SwFmtColl *ChgFmtColl( SwFmtColl* );
+ virtual SwFmtColl *ChgFmtColl( SwFmtColl* ) SAL_OVERRIDE;
void _ChgTxtCollUpdateNum( const SwTxtFmtColl* pOld,
const SwTxtFmtColl* pNew );
@@ -659,7 +659,7 @@ public:
/// in ndcopy.cxx
bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
- virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
+ virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
/// Interactive hyphenation: we find TxtFrm and call its CalcHyph.
bool Hyphenate( SwInterHyphInfo &rHyphInf );
@@ -731,7 +731,7 @@ public:
SwIndex const & rPos,
const sal_Int32 nChangeLen,
const bool bNegative = false,
- const bool bDelete = false );
+ const bool bDelete = false ) SAL_OVERRIDE;
/// change text to Upper/Lower/Hiragana/Katagana/...
void TransliterateText( utl::TransliterationWrapper& rTrans,
@@ -775,16 +775,16 @@ public:
{ m_wXParagraph = xParagraph; }
/// 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;
bool IsCollapse() const;
- virtual void dumpAsXml( xmlTextWriterPtr writer = NULL );
+ virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) SAL_OVERRIDE;
sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
sal_uInt32 GetParRsid() const;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 52d80a3e47de..4b3c88d18348 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -317,7 +317,7 @@ public:
/// Call ChkCondcoll to all ContentNodes of section.
void CheckSectionCondColl() const;
- virtual void dumpAsXml( xmlTextWriterPtr writer = NULL );
+ virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) SAL_OVERRIDE;
private:
/// Private constructor because copying is never allowed!!
@@ -374,7 +374,7 @@ protected:
SwAttrSet (handle): */
sal_uInt16 ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds );
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); /// Already contained in base class Client.
@@ -430,7 +430,7 @@ public:
virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
/// Get information from Client.
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
/// SS for PoolItems: hard attributation.
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 27827250acd4..5450977c62e3 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -53,13 +53,13 @@ class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
//For i120928,record the cp info of graphic within bullet
sal_Unicode cGrfBulletCP;
SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
- SAL_DLLPRIVATE virtual void NotifyGraphicArrived();
+ SAL_DLLPRIVATE virtual void NotifyGraphicArrived() SAL_OVERRIDE;
using SvxNumberFormat::operator ==;
using SvxNumberFormat::operator !=;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
SwNumFmt();
@@ -77,16 +77,16 @@ public:
void SetCharFmt( SwCharFmt* );
virtual void SetCharFmtName(const OUString& rSet);
- virtual OUString GetCharFmtName()const;
+ virtual OUString GetCharFmtName()const SAL_OVERRIDE;
//For i120928,access the cp info of graphic within bullet
void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;}
sal_Unicode GetGrfBulletCP()const {return cGrfBulletCP;}
- virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0);
+ virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0) SAL_OVERRIDE;
- virtual void SetVertOrient(sal_Int16 eSet);
- virtual sal_Int16 GetVertOrient() const;
+ virtual void SetVertOrient(sal_Int16 eSet) SAL_OVERRIDE;
+ virtual sal_Int16 GetVertOrient() const SAL_OVERRIDE;
const SwFmtVertOrient* GetGraphicOrientation() const;
sal_Bool IsEnumeration() const; // #i22362#
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 1af8ad98b264..e6f2203f8f87 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -158,7 +158,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE;
public:
OUString GetName() const { return aDescName; }
@@ -233,7 +233,7 @@ public:
void SetPoolHlpFileId( sal_uInt8 nId ) { aMaster.SetPoolHlpFileId( nId ); }
/// Query information from Client.
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd,
sal_Bool bCheckForThisPgDc = sal_True ) const;
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 76dde6eae120..8bd41a07c8ec 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -59,20 +59,20 @@ private:
SwFmtDrop & operator= (const SwFmtDrop &);
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
inline sal_uInt8 GetLines() const { return nLines; }
inline sal_uInt8 &GetLines() { return nLines; }
@@ -90,7 +90,7 @@ public:
inline SwCharFmt *GetCharFmt() { return (SwCharFmt*)GetRegisteredIn(); }
void SetCharFmt( SwCharFmt *pNew );
/// Get information from Client.
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
/// Get and set Modify pointer.
inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
@@ -109,12 +109,12 @@ public:
inline SwRegisterItem& operator=( const SwRegisterItem& rRegister );
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
inline SwRegisterItem::SwRegisterItem( const sal_Bool bRegister ) :
@@ -146,16 +146,16 @@ public:
{ SetValue( rCpy.GetValue() ); return *this; }
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
};
class SwParaConnectBorderItem : public SfxBoolItem
@@ -169,12 +169,12 @@ public:
inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect );
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
inline SwParaConnectBorderItem::SwParaConnectBorderItem( const sal_Bool bConnect ) :
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index cfd3fb0472d9..837d447f7d34 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -136,13 +136,13 @@ public:
{
}
- virtual SwPosition GetAnchorPosition() const;
- virtual bool UseElement();
- virtual const SwFmtFld& GetFmtFld() const
+ virtual SwPosition GetAnchorPosition() const SAL_OVERRIDE;
+ virtual bool UseElement() SAL_OVERRIDE;
+ virtual const SwFmtFld& GetFmtFld() const SAL_OVERRIDE
{
return mrFmtFld;
}
- virtual const SfxBroadcaster* GetBroadCaster() const
+ virtual const SfxBroadcaster* GetBroadCaster() const SAL_OVERRIDE
{
return dynamic_cast<const SfxBroadcaster *> (&mrFmtFld);
}
@@ -150,7 +150,7 @@ public:
SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr,
- SwPostItBits aBits );
+ SwPostItBits aBits ) SAL_OVERRIDE;
private:
SwFmtFld& mrFmtFld;
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 22acab7d2c46..d7397b3575d7 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -31,9 +31,9 @@ public:
SwPrintOptions(sal_Bool bWeb);
virtual ~SwPrintOptions();
- virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
- virtual void doSetModified( ) { bModified = sal_True; SetModified();}
+ virtual void Commit() SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void doSetModified( ) SAL_OVERRIDE { bModified = sal_True; SetModified();}
SwPrintOptions& operator=(const SwPrintData& rData)
{
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 8c0aa430f501..6219b598a3ff 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -59,9 +59,9 @@ public:
SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId,
const SfxItemSet* pSet = 0 );
virtual ~SwRedlineExtraData_FmtColl();
- virtual SwRedlineExtraData* CreateNew() const;
- virtual void Reject( SwPaM& rPam ) const;
- virtual bool operator == ( const SwRedlineExtraData& ) const;
+ virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE;
+ virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
+ virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
void SetItemSet( const SfxItemSet& rSet );
};
@@ -75,9 +75,9 @@ class SwRedlineExtraData_Format : public SwRedlineExtraData
public:
SwRedlineExtraData_Format( const SfxItemSet& rSet );
virtual ~SwRedlineExtraData_Format();
- virtual SwRedlineExtraData* CreateNew() const;
- virtual void Reject( SwPaM& rPam ) const;
- virtual bool operator == ( const SwRedlineExtraData& ) const;
+ virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE;
+ virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
+ virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
};
/*
@@ -97,9 +97,9 @@ class SW_DLLPUBLIC SwRedlineExtraData_FormattingChanges : public SwRedlineExtraD
public:
SwRedlineExtraData_FormattingChanges( const SfxItemSet* pItemSet );
virtual ~SwRedlineExtraData_FormattingChanges();
- virtual SwRedlineExtraData* CreateNew() const;
- virtual void Reject( SwPaM& rPam ) const;
- virtual bool operator == ( const SwRedlineExtraData& ) const;
+ virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE;
+ virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
+ virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
SfxItemSet* GetItemSet( ) const;
};
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 0b4e3ceec585..c961bb6266f3 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -62,10 +62,10 @@ class SwGetRefFieldType : public SwFieldType
SwDoc* pDoc;
protected:
/// Overlay in order to update all ref-fields.
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
SwGetRefFieldType(SwDoc* pDoc );
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const SAL_OVERRIDE;
SwDoc* GetDoc() const { return pDoc; }
@@ -84,8 +84,8 @@ private:
sal_uInt16 nSubType;
sal_uInt16 nSeqNo;
- virtual OUString Expand() const;
- virtual SwField* Copy() const;
+ virtual OUString Expand() const SAL_OVERRIDE;
+ virtual SwField* Copy() const SAL_OVERRIDE;
// #i81002#
OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
@@ -98,7 +98,7 @@ public:
virtual ~SwGetRefField();
- virtual OUString GetFieldName() const;
+ virtual OUString GetFieldName() const SAL_OVERRIDE;
OUString GetSetRefName() const { return sSetRefName; }
@@ -114,8 +114,8 @@ public:
void SetExpand( const OUString& rStr ) { sTxt = rStr; }
/// Get/set sub type.
- virtual sal_uInt16 GetSubType() const;
- virtual void SetSubType( sal_uInt16 n );
+ virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual void SetSubType( sal_uInt16 n ) SAL_OVERRIDE;
// --> #i81002#
bool IsRefToHeadingCrossRefBookmark() const;
@@ -129,16 +129,16 @@ public:
void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; }
// Name of reference.
- virtual OUString GetPar1() const;
- virtual void SetPar1(const OUString& rStr);
+ virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
- virtual OUString GetPar2() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
+ virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE;
void ConvertProgrammaticToUIName();
- virtual OUString GetDescription() const;
+ virtual OUString GetDescription() const SAL_OVERRIDE;
};
#endif /// INCLUDED_SW_INC_REFFLD_HXX
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 2d958baeb0df..9b0e27e34240 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -160,7 +160,7 @@ private:
bool const bHidden, bool const bCondition);
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); // rtti
@@ -296,20 +296,20 @@ class SW_DLLPUBLIC SwSectionFmt
protected:
SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc );
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); // Already contained in base class client.
~SwSectionFmt();
// Deletes all Frms in aDepend (Frms are recognized via PTR_CAST).
- virtual void DelFrms();
+ virtual void DelFrms() SAL_OVERRIDE;
// Creates views.
- virtual void MakeFrms();
+ virtual void MakeFrms() SAL_OVERRIDE;
// Get information from Format.
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
SwSection* GetSection() const;
inline SwSectionFmt* GetParent() const;
@@ -341,12 +341,12 @@ public:
{ m_wXTextSection = xTextSection; }
// 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;
};
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index e64e5ed0df3b..c28fb75f037a 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -273,7 +273,7 @@ private:
class AsciiReader: public Reader
{
friend class SwReader;
- virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &);
+ virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
public:
AsciiReader(): Reader() {}
};
@@ -285,9 +285,9 @@ class SW_DLLPUBLIC StgReader : public Reader
protected:
sal_uLong OpenMainStream( SotStorageStreamRef& rRef, sal_uInt16& rBuffSize );
public:
- virtual int GetReaderType();
+ virtual int GetReaderType() SAL_OVERRIDE;
OUString GetFltName() { return aFltName; }
- virtual void SetFltName( const OUString& r );
+ virtual void SetFltName( const OUString& r ) SAL_OVERRIDE;
};
// The given stream has to be created dynamically and must
@@ -477,7 +477,7 @@ protected:
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg;
// Create error at call.
- virtual sal_uLong WriteStream();
+ virtual sal_uLong WriteStream() SAL_OVERRIDE;
virtual sal_uLong WriteStorage() = 0;
virtual sal_uLong WriteMedium( SfxMedium& ) = 0;
@@ -486,10 +486,10 @@ protected:
public:
StgWriter() : Writer() {}
- virtual sal_Bool IsStgWriter() const;
+ virtual sal_Bool IsStgWriter() const SAL_OVERRIDE;
- virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 );
- virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 );
+ virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ) SAL_OVERRIDE;
+ virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ) SAL_OVERRIDE;
SotStorage& GetStorage() const { return *pStg; }
};
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c5f7c745e7cd..d5736be0859c 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -105,7 +105,7 @@ public:
//from class SalFrame
virtual void SetWindowState( const OString & rStr ) = 0;
virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0;
- virtual void EndDialog(long ) = 0;
+ virtual void EndDialog(long ) SAL_OVERRIDE = 0;
};
class AbstractInsFootNoteDlg : public VclAbstractDialog
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index cf8d7d969cad..b22deecd8a97 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -32,12 +32,12 @@ protected:
// Return replacement text (only for SWG-format, all others can be obtained from wordlist!).
// rShort is stream-name - encrypted!
virtual bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
- const OUString& rFileName, const OUString& rShort, OUString& rLong );
+ const OUString& rFileName, const OUString& rShort, OUString& rLong ) SAL_OVERRIDE;
// Text with attributes (only SWG-format!).
// rShort is stream-name - encrypted!
virtual bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
- const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& );
+ const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index cb67b5217bf2..782cb26acc4e 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -168,7 +168,7 @@ class SW_DLLPUBLIC SwAttrSet : public SfxItemSet
SwAttrSet *pOldSet, *pNewSet;
// Notification-Callback
- virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew );
+ virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ) SAL_OVERRIDE;
void PutChgd( const SfxPoolItem& rI ) { SfxItemSet::PutDirect( rI ); }
public:
@@ -176,7 +176,7 @@ public:
SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable );
SwAttrSet( const SwAttrSet& );
- virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const;
+ virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const SAL_OVERRIDE;
bool Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew );
bool Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew );
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index a55d151114a1..a47ae6a73535 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -57,9 +57,9 @@ public:
virtual ~SwBaseLink();
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 void Closed();
+ virtual void Closed() SAL_OVERRIDE;
virtual const SwNode* GetAnchor() const;
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index b80b231c3ef5..72eeeb49b3f4 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -32,10 +32,10 @@ class SwOleClient : public SfxInPlaceClient
sal_Bool bInDoVerb;
sal_Bool bOldCheckForOLEInCaption;
- virtual void ObjectAreaChanged();
- virtual void RequestNewObjectArea( Rectangle& );
- virtual void ViewChanged();
- virtual void MakeVisible();
+ virtual void ObjectAreaChanged() SAL_OVERRIDE;
+ virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE;
+ virtual void ViewChanged() SAL_OVERRIDE;
+ virtual void MakeVisible() SAL_OVERRIDE;
public:
SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& );
@@ -44,7 +44,7 @@ public:
sal_Bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; }
- virtual void FormatChanged();
+ virtual void FormatChanged() SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 0b71ec5caf16..b62004f25dbc 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -260,7 +260,7 @@ protected:
sal_Bool bChg : 1;
sal_Bool bParked : 1; // Table-cursor was parked.
- virtual bool IsSelOvrCheck(int eFlags);
+ virtual bool IsSelOvrCheck(int eFlags) SAL_OVERRIDE;
public:
SwTableCursor( const SwPosition &rPos, SwPaM* pRing = 0 );
@@ -268,8 +268,8 @@ public:
virtual ~SwTableCursor();
virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
- sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr );
- virtual bool GotoTable( const OUString& rName );
+ sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ) SAL_OVERRIDE;
+ virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE;
void InsertBox( const SwTableBox& rTblBox );
void DeleteBox(size_t nPos);
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 2e8b61ad842c..7b01d9aad4ad 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -41,8 +41,8 @@ public:
SwDDEFieldType* GetDDEFldType();
inline const SwDDEFieldType* GetDDEFldType() const;
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
- virtual void SwClientNotify( const SwModify&, const SfxHint& );
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
};
// ----------- Inlines -----------------------------
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index 4a611d2218a0..afc0050e0f61 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.hxx
@@ -29,8 +29,8 @@ public:
void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
sal_uInt32* pValues );
- 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/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 08d57d718853..2a1bc0486d89 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -108,9 +108,9 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C
sal_Bool bEmbeddedLoadSave : 1;
// Catch hint for DocInfo.
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
- virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE;
protected:
// Envelopes, labels.
@@ -212,9 +212,9 @@ public:
SwFldUpdateFlags GetFldUpdateFlags( sal_Bool bWeb ) const;
// Virtual methods for options dialog.
- virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
- virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
- virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
+ virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
// Pool is created here and set at SfxShell.
void InitAttrPool();
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 8be8e92ea532..606dc10d2852 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -62,7 +62,7 @@ public:
virtual bool GetData( ::com::sun::star::uno::Any & rData,
const OUString & rMimeType,
- bool bSynchron = false );
+ bool bSynchron = false ) SAL_OVERRIDE;
sal_Bool SetData( const OUString & rMimeType,
const ::com::sun::star::uno::Any& rData );
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 4968bd7b2f4c..e003e2ffbe38 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -124,7 +124,7 @@ protected:
bool IsModifyLocked(){ return bModifyLocked;}
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
enum SearchType
@@ -302,7 +302,7 @@ public:
SwSelBoxes& rBoxes, bool bToTop = true ) const;
// Get information from client.
- virtual bool GetInfo( SfxPoolItem& ) const;
+ virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
// Search in format for registered table.
static SwTable * FindTable( SwFrmFmt const*const pFmt );
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index ec696082ab0c..914e8c6c7838 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -78,7 +78,7 @@ protected:
{}
// For recognition of changes (especially TableBoxAttribute).
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); // Already in base class Content.
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index dd25833392e7..6976500c543a 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -51,15 +51,15 @@ public:
virtual ~SwTextGridItem();
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
SwTextGridItem& operator=( const SwTextGridItem& );
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 43122d2cce04..a3108fb10daf 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -77,7 +77,7 @@ class SW_DLLPUBLIC SwTOXMark
protected:
// SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); // rtti
@@ -90,8 +90,8 @@ public:
SwTOXMark& operator=( const SwTOXMark& rCopy );
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
void InvalidateTOXMark();
@@ -475,7 +475,7 @@ public:
SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 );
virtual ~SwTOXBase();
- virtual bool GetInfo( SfxPoolItem& rInfo ) const;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
// a kind of CopyCtor - check if the TOXBase is at TOXType of the doc.
// If not, so create it an copy all other used things. The return is this
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 92e1cb0495b9..fe4fad242796 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -129,7 +129,7 @@ protected:
public:
SwTxtAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
- virtual sal_Int32* GetEnd();
+ virtual sal_Int32* GetEnd() SAL_OVERRIDE;
};
// --------------- Inline Implementations ------------------------
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 1f80016d9141..b727106b41f5 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -86,13 +86,13 @@ class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient
{
SwTxtNode* m_pTxtNode;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
virtual ~SwTxtRuby();
TYPEINFO_OVERRIDE();
- virtual bool GetInfo( SfxPoolItem& rInfo ) const;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index b973aaadd469..7ce306e1b5c3 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -81,11 +81,11 @@ public:
virtual ~SwTxtInputFld();
- virtual sal_Int32* GetEnd();
+ virtual sal_Int32* GetEnd() SAL_OVERRIDE;
void LockNotifyContentChange();
void UnlockNotifyContentChange();
- virtual void NotifyContentChange( SwFmtFld& rFmtFld );
+ virtual void NotifyContentChange( SwFmtFld& rFmtFld ) SAL_OVERRIDE;
void UpdateTextNodeContent( const OUString& rNewContent );
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 174cb1fba814..28fa9d73ef64 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -35,14 +35,14 @@ class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient
bool m_bVisitedValid : 1; // is m_bVisited valid?
protected:
-virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
virtual ~SwTxtINetFmt();
TYPEINFO_OVERRIDE();
- virtual bool GetInfo( SfxPoolItem& rInfo ) const;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index b4f560c8ba5b..78fac9723424 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -35,7 +35,7 @@ public:
SwTxtRefMark( SwFmtRefMark& rAttr,
sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
- virtual sal_Int32* GetEnd(); // SwTxtAttr
+ virtual sal_Int32* GetEnd() SAL_OVERRIDE; // SwTxtAttr
// get and set TxtNode pointer
inline const SwTxtNode& GetTxtNode() const;
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 755905391582..e767bd759d28 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -37,7 +37,7 @@ public:
sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
virtual ~SwTxtTOXMark();
- virtual sal_Int32 *GetEnd(); // SwTxtAttr
+ virtual sal_Int32 *GetEnd() SAL_OVERRIDE; // SwTxtAttr
void CopyTOXMark( SwDoc* pDestDoc );
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 39e3fe074d3a..9c0ff35df8ab 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -72,7 +72,7 @@ protected:
virtual SwRewriter GetRewriter() const;
// return type is sal_uInt16 because this overrides SfxUndoAction::GetId()
- virtual sal_uInt16 GetId() const { return static_cast<sal_uInt16>(m_nId); }
+ virtual sal_uInt16 GetId() const SAL_OVERRIDE { return static_cast<sal_uInt16>(m_nId); }
// the 4 methods that derived classes have to override
// base implementation does nothing
@@ -84,12 +84,12 @@ public: // should not be public, but ran into trouble in untbl.cxx
private:
// SfxUndoAction
- virtual void Undo();
- virtual void Redo();
- virtual void UndoWithContext(SfxUndoContext &);
- virtual void RedoWithContext(SfxUndoContext &);
- virtual void Repeat(SfxRepeatTarget &);
- virtual bool CanRepeat(SfxRepeatTarget &) const;
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
+ virtual void UndoWithContext(SfxUndoContext &) SAL_OVERRIDE;
+ virtual void RedoWithContext(SfxUndoContext &) SAL_OVERRIDE;
+ virtual void Repeat(SfxRepeatTarget &) SAL_OVERRIDE;
+ virtual bool CanRepeat(SfxRepeatTarget &) const SAL_OVERRIDE;
public:
SwUndo(SwUndoId const nId);
@@ -104,7 +104,7 @@ public:
@return textual comment for this undo object
*/
- virtual OUString GetComment() const;
+ virtual OUString GetComment() const SAL_OVERRIDE;
// UndoObject remembers which mode was turned on.
// In Undo/Redo/Repeat this remembered mode is switched on.
@@ -236,9 +236,9 @@ protected:
public:
virtual ~SwUndoInserts();
- 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;
// Set destination range after reading.
void SetInsertRange( const SwPaM&, bool bScanFlys = true,
@@ -288,11 +288,11 @@ public:
virtual ~SwUndoInsLayFmt();
- 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 OUString GetComment() const;
+ virtual OUString GetComment() const SAL_OVERRIDE;
};
@@ -302,14 +302,14 @@ class SwUndoDelLayFmt : public SwUndoFlyBase
public:
SwUndoDelLayFmt( SwFrmFmt* pFormat );
- 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 RedoForRollback();
void ChgShowSel( bool bNew ) { bShowSelFrm = bNew; }
- virtual SwRewriter GetRewriter() const;
+ virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
};
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 73b01130d2dd..917bbd7276e8 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -158,36 +158,36 @@ class SwChartDataProvider :
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwChartDataProvider( const SwDoc* pDoc );
virtual ~SwChartDataProvider();
// XDataProvider
- virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) 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::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XRangeXMLConversion
virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- 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);
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL dispose( ) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 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;
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
@@ -226,12 +226,12 @@ public:
virtual ~SwChartDataSource();
// XDataSource
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) 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;
};
typedef cppu::WeakImplHelper10
@@ -278,7 +278,7 @@ class SwChartDataSequence :
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwChartDataSequence( SwChartDataProvider &rProvider,
@@ -289,62 +289,62 @@ public:
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 >& 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;
// XDataSequence
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getSourceRangeRepresentation()
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin eLabelOrigin )
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTextualDataSequence
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData()
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
// XNumericalDataSequence
virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData()
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
// XCloneable
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) 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;
// 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;
// XModifiable
- virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XModifyBroadcaster
- virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
- 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;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- 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);
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL dispose( ) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
sal_Bool DeleteBox( const SwTableBox &rBox );
@@ -386,33 +386,33 @@ public:
virtual ~SwChartLabeledDataSequence();
// XLabeledDataSequence
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCloneable
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) 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;
// XEventListener
- 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;
// XModifyListener
- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XModifyBroadcaster
- virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- 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);
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL dispose( ) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 9fec2d44349b..f055acc10859 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -275,22 +275,22 @@ public:
SwXTextTables(SwDoc* pDoc);
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static ::com::sun::star::text::XTextTable* GetObject( SwFrmFmt& rFmt );
};
@@ -314,25 +314,25 @@ public:
SwXFrames(SwDoc* pDoc, FlyCntType eSet);
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
FlyCntType GetType()const{return eType;}
static SwXFrame* GetObject( SwFrmFmt& rFmt, FlyCntType eType );
@@ -347,9 +347,9 @@ public:
SwXTextFrames(SwDoc* pDoc);
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -361,9 +361,9 @@ public:
SwXTextGraphicObjects(SwDoc* pDoc);
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -375,9 +375,9 @@ public:
SwXTextEmbeddedObjects(SwDoc* pDoc);
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -390,22 +390,22 @@ public:
SwXTextSections(SwDoc* pDoc);
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt );
};
@@ -419,22 +419,22 @@ class SwXBookmarks : public SwCollectionBaseClass,
SwXBookmarks(SwDoc* pDoc);
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -451,12 +451,12 @@ public:
SwXNumberingRulesCollection( SwDoc* pDoc );
//XIndexAccess
- virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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;
};
typedef
@@ -478,17 +478,17 @@ public:
SwXFootnotes(sal_Bool bEnd, SwDoc* pDoc);
//XIndexAccess
- virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt );
};
@@ -502,22 +502,22 @@ public:
SwXReferenceMarks(SwDoc* pDoc);
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static SwXReferenceMark* GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark );
};
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index d2830284ed0e..2ce45aaf442f 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -34,8 +34,8 @@ public:
protected:
virtual const SwCntntFrm* DoSetBidiLevelLeftRight(
- sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr);
- virtual void DoSetBidiLevelUpDown();
+ sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr) SAL_OVERRIDE;
+ virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE;
public:
@@ -44,19 +44,19 @@ public:
virtual sal_Bool IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ));
+ nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE;
- virtual bool IsReadOnlyAvailable() const;
+ virtual bool IsReadOnlyAvailable() const SAL_OVERRIDE;
sal_Bool IsRemainInSection() const { return bRemainInSection; }
void SetRemainInSection( sal_Bool bFlag ) { bRemainInSection = bFlag; }
- virtual sal_Bool IsSkipOverProtectSections() const
+ virtual sal_Bool IsSkipOverProtectSections() const SAL_OVERRIDE
{ return bSkipOverProtectSections; }
void SetSkipOverProtectSections( sal_Bool bFlag )
{ bSkipOverProtectSections = bFlag; }
- virtual sal_Bool IsSkipOverHiddenSections() const
+ virtual sal_Bool IsSkipOverHiddenSections() const SAL_OVERRIDE
{ return bSkipOverHiddenSections; }
void SetSkipOverHiddenSections( sal_Bool bFlag )
{ bSkipOverHiddenSections = bFlag; }
@@ -85,9 +85,9 @@ public:
virtual sal_Bool IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ));
+ nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE;
- virtual SwUnoTableCrsr * Clone() const;
+ virtual SwUnoTableCrsr * Clone() const SAL_OVERRIDE;
void MakeBoxSels();
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 631f72ccc3e3..da3ddf32cf1a 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -46,7 +46,7 @@ protected:
// Create a SdrObject according to a description. Can be used by derived classes to
// support own ::com::sun::star::drawing::Shapes (e.g. controls).
- virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) throw (std::exception);
+ virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) throw (std::exception) SAL_OVERRIDE;
public:
SwFmDrawPage( SdrPage* pPage );
@@ -63,7 +63,7 @@ public:
// The following method is called when a SvxShape-object is to be created.
// Derived classes may obtain at this point a derivation or an object
// that is aggregating a SvxShape.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (std::exception) SAL_OVERRIDE;
};
typedef cppu::WeakAggImplHelper4
@@ -84,33 +84,33 @@ public:
~SwXDrawPage();
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- 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 ::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::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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;
//XShapes
- virtual void SAL_CALL add(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL remove(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL add(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL remove(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XShapeGrouper
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > SAL_CALL group(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes)
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) 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 );
- 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
SwFmDrawPage* GetSvxPage();
// renamed and outlined to detect where it's called
@@ -218,54 +218,54 @@ class SwXShape : public SwXShapeBaseClass,
protected:
virtual ~SwXShape();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwXShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape);
TYPEINFO_OVERRIDE();
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
- 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 ::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::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ 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;
//XUnoTunnel
- 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;
//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, std::exception );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ 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 ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XComponent
- virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL dispose(void) 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 > & aListener) 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 > & aListener) 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 );
- 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
@@ -284,21 +284,21 @@ protected:
public:
SwXGroupShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape);
- 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;
//XShapes
- virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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;
};
#endif
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index f28096b99153..6465c46b804e 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -47,30 +47,30 @@ 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;
// 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;
// XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName(
const OUString& rName)
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;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -95,41 +95,41 @@ public:
SwXTextFieldTypes(SwDoc* pDoc);
// SwUnoCollection
- virtual void Invalidate();
+ virtual void Invalidate() 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;
// 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;
// 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;
};
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index cc63fd73959b..30f11c9ec80c 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -75,7 +75,7 @@ private:
protected:
com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily;
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
virtual ~SwXFrame();
public:
@@ -88,37 +88,37 @@ public:
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 >& 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;
TYPEINFO_OVERRIDE();
//XNamed
- virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setName(const OUString& Name_) 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;
//XShape
- virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XShapeDescriptor
- virtual OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//Base implementation
//XComponent
@@ -129,9 +129,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -162,12 +162,12 @@ class SwXTextFrame : public SwXTextFrameBaseClass,
public SwXFrame
{
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 ~SwXTextFrame();
public:
@@ -177,50 +177,50 @@ public:
// FIXME: EVIL HACK: make available for SwXFrame::attachToRange
void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); };
- 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;
//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;
//XTextFrame
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XEnumerationAccess - frueher XParagraphEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) 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;
//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);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ 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) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XComponent
- virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- 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);
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL dispose( ) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 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 );
- 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XUnoTunnel
- 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;
//XPropertySet
- 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 ::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;
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
@@ -241,30 +241,30 @@ public:
SwXTextGraphicObject( SwDoc *pDoc );
SwXTextGraphicObject(SwFrmFmt& rFmt);
- 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;
//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;
//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 );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ 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 ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XComponent
- virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL dispose(void) 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 > & aListener) 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 > & aListener) 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 );
- 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
};
@@ -287,37 +287,37 @@ public:
SwXTextEmbeddedObject( SwDoc *pDoc );
SwXTextEmbeddedObject(SwFrmFmt& rFmt);
- 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;
//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;
//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 );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ 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 ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XComponent
- virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL dispose(void) 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 > & aListener) 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 > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XEmbeddedObjectSupplier2
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::sal_Int64 SAL_CALL getAspect() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::sal_Int64 SAL_CALL getAspect() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() 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 );
- 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
};
@@ -337,13 +337,13 @@ public:
TYPEINFO_OVERRIDE();
// ::com::sun::star::lang::XEventListener
- 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;
// ::com::sun::star::util::XModifyListener
- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx
index 7b545ca7e6c3..faae97c89886 100644
--- a/sw/inc/unoidxcoll.hxx
+++ b/sw/inc/unoidxcoll.hxx
@@ -36,38 +36,38 @@ 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;
// 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;
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount()
- 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 getByIndex(sal_Int32 nIndex)
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName(
const OUString& rName)
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;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 6769a167a2a4..ede6304de43c 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -97,44 +97,44 @@ public:
void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
// 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)
@@ -142,62 +142,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(
@@ -208,28 +208,28 @@ 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;
// XTolerantMultiPropertySet
virtual ::com::sun::star::uno::Sequence<
@@ -240,65 +240,65 @@ public:
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& rValues)
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::Sequence<
::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL
getPropertyValuesTolerant(
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 ::com::sun::star::uno::Sequence<
::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL
getDirectPropertyValuesTolerant(
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;
// 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;
// XContentEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
createContentEnumeration(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
getAvailableServiceNames()
- 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);
+ 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;
};
@@ -326,21 +326,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/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 4f605be8f6b6..55dcdd0676c7 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -34,28 +34,28 @@ class SwXRedlineText :
public ::com::sun::star::container::XEnumerationAccess
{
SwNodeIndex aNodeIndex;
- virtual const SwStartNode *GetStartNode() const;
+ virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE;
public:
SwXRedlineText(SwDoc* pDoc, SwNodeIndex aNodeIndex);
- 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(){OWeakObject::acquire();}
- virtual void SAL_CALL release( ) throw(){OWeakObject::release();}
+ 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 {OWeakObject::acquire();}
+ virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {OWeakObject::release();}
- 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;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) 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 > & aTextPosition) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XElementAccess (via XEnumerationAccess)
- 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;
};
typedef
@@ -77,37 +77,37 @@ public:
TYPEINFO_OVERRIDE();
- 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(){OWeakObject::acquire();}
- virtual void SAL_CALL release( ) throw(){OWeakObject::release();}
+ 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 {OWeakObject::acquire();}
+ virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {OWeakObject::release();}
- 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;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) 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 > & aTextPosition) 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;
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) 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;
const SwRangeRedline* GetRedline() const {return pRedline;}
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 42e4cf94f4e1..8d096d5946cd 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -46,20 +46,20 @@ public:
SwXRedlines(SwDoc* pDoc);
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XEnumerationAccess - was: XParagraphEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) 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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static ::com::sun::star::beans::XPropertySet* GetObject( SwRangeRedline& rRedline, SwDoc& rDoc );
};
@@ -76,16 +76,16 @@ public:
SwXRedlineEnumeration(SwDoc& rDoc);
//XEnumeration
- virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) 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;
};
#endif
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 315cb77b7b8f..658bbc9d8632 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -52,18 +52,18 @@ public:
SwXFootnoteProperties(SwDoc* pDoc);
//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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void Invalidate() {pDoc = 0;}
};
@@ -82,18 +82,18 @@ public:
SwXEndnoteProperties(SwDoc* pDoc);
//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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void Invalidate() {pDoc = 0;}
};
@@ -112,18 +112,18 @@ public:
SwXLineNumberingProperties(SwDoc* pDoc);
//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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void Invalidate() {pDoc = 0;}
};
@@ -150,7 +150,7 @@ protected:
virtual ~SwXNumberingRules();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering
@@ -159,36 +159,36 @@ public:
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;
//XIndexReplace
- virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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;
//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;
//XNamed
- virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setName(const OUString& Name_) 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 );
- 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>
@@ -216,9 +216,9 @@ public:
void Invalidate() {SwXNumberingRules::Invalidate();}
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -255,28 +255,28 @@ public:
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 >& 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;
//XTextColumns
- virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int16 SAL_CALL getColumnCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn >& Columns ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getColumnCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn >& Columns ) 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;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Int32 GetSepLineWidth() const {return nSepLineWidth;}
sal_Int32 GetSepLineColor() const {return nSepLineColor;}
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 03a724219cd5..0d8f7f05aa8b 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -71,37 +71,37 @@ public:
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 >& 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;
//XSearchDescriptor
- virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XReplaceDescriptor
- virtual OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) 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;
//XPropertyReplace
- virtual sal_Bool SAL_CALL getValueSearch(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setSearchAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL getValueSearch(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setSearchAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void FillSearchItemSet(SfxItemSet& rSet) const;
void FillReplaceItemSet(SfxItemSet& rSet) const;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index c5ad1a24540b..bde8eba77cd0 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -73,29 +73,29 @@ public:
SwXStyleFamilies(SwDocShell& rDocShell);
//XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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;
//XStyleLoader
virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions)
throw (::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) 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 );
- 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
class SwXStyleFamily : public cppu::WeakImplHelper4
@@ -117,39 +117,39 @@ public:
~SwXStyleFamily();
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XNameContainer
- virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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 replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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 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& Name, const ::com::sun::star::uno::Any& Element) 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 replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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;
+ 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;
//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;
//SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
class SwXStyle : public cppu::WeakImplHelper7
@@ -197,7 +197,7 @@ protected:
std::exception);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::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:
SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, sal_Bool bConditional = sal_False);
SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam,
@@ -211,52 +211,52 @@ public:
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 >& 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;
//XNamed
- virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XStyle
- virtual sal_Bool SAL_CALL isUserDefined(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL isInUse(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual OUString SAL_CALL getParentStyle(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL isUserDefined(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isInUse(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getParentStyle(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::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;
//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;
//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;
//XMultiPropertyStates
- virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) 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(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
OUString GetStyleName() const { return m_sStyleName;}
SfxStyleFamily GetFamily() const {return eFamily;}
@@ -284,13 +284,13 @@ public:
SwXFrameStyle( SwDoc *pDoc );
~SwXFrameStyle();
- virtual void SAL_CALL acquire( ) throw(){SwXStyle::acquire();}
- virtual void SAL_CALL release( ) throw(){SwXStyle::release();}
+ virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE {SwXStyle::acquire();}
+ virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {SwXStyle::release();}
- 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::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 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::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
friend class SwFrameStyleEventDescriptor;
};
@@ -313,11 +313,11 @@ public:
SwXPageStyle(SwDocShell* pDocSh);
~SwXPageStyle();
- 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 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 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 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;
};
@@ -337,17 +337,17 @@ public:
SwXAutoStyles(SwDocShell& rDocShell);
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
//XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -359,21 +359,21 @@ class SwXAutoStyleFamily : public cppu::WeakImplHelper1< com::sun::star::style::
IStyleAccess::SwAutoStyleFamily eFamily;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwXAutoStyleFamily(SwDocShell* pDocShell, IStyleAccess::SwAutoStyleFamily eFamily);
virtual ~SwXAutoStyleFamily();
//XAutoStyleFamily
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyle > SAL_CALL insertStyle( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Values ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyle > SAL_CALL insertStyle( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Values ) 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);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
class SwXAutoStylesEnumerator : public cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >,
@@ -385,10 +385,10 @@ public:
virtual ~SwXAutoStylesEnumerator();
//XEnumeration
- virtual sal_Bool SAL_CALL hasMoreElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- 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);
+ virtual sal_Bool SAL_CALL hasMoreElements( ) 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) SAL_OVERRIDE;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
// an automatic style
@@ -411,36 +411,36 @@ public:
virtual ~SwXAutoStyle();
//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;
//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;
//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;
//XMultiPropertyStates
- virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Special
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 86a5254bd65d..13e655fb4ec5 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -81,19 +81,19 @@ class SwXCell : public SwXCellBaseClass,
static size_t const NOTFOUND = SAL_MAX_SIZE;
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;
bool IsValid() const;
virtual ~SwXCell();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND);
@@ -104,49 +104,49 @@ public:
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 >& 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;
- 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;
//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;
//XCell
- virtual OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
- 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 > & aTextPosition) 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::XTextCursor > SAL_CALL createTextCursor(void) 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 > & aTextPosition) 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;
//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;
//XServiceInfo