summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /sw
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/AnnotationWin.hxx26
-rw-r--r--sw/inc/PostItMgr.hxx6
-rw-r--r--sw/inc/SidebarWin.hxx16
-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.hxx4
-rw-r--r--sw/inc/TextCursorHelper.hxx2
-rw-r--r--sw/inc/ToxTabStopTokenHandler.hxx2
-rw-r--r--sw/inc/accmap.hxx14
-rw-r--r--sw/inc/anchoreddrawobject.hxx26
-rw-r--r--sw/inc/authfld.hxx22
-rw-r--r--sw/inc/calbck.hxx16
-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.hxx4
-rw-r--r--sw/inc/crsrsh.hxx12
-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.hxx6
-rw-r--r--sw/inc/docary.hxx4
-rw-r--r--sw/inc/docsh.hxx88
-rw-r--r--sw/inc/docstyle.hxx60
-rw-r--r--sw/inc/docufld.hxx248
-rw-r--r--sw/inc/dpage.hxx10
-rw-r--r--sw/inc/drawdoc.hxx6
-rw-r--r--sw/inc/editsh.hxx4
-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/finalthreadmanager.hxx20
-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.hxx12
-rw-r--r--sw/inc/fmtautofmt.hxx12
-rw-r--r--sw/inc/fmtclbl.hxx4
-rw-r--r--sw/inc/fmtclds.hxx12
-rw-r--r--sw/inc/fmtcnct.hxx8
-rw-r--r--sw/inc/fmtcntnt.hxx6
-rw-r--r--sw/inc/fmtcol.hxx10
-rw-r--r--sw/inc/fmteiro.hxx6
-rw-r--r--sw/inc/fmtflcnt.hxx4
-rw-r--r--sw/inc/fmtfld.hxx10
-rw-r--r--sw/inc/fmtfollowtextflow.hxx6
-rw-r--r--sw/inc/fmtfordr.hxx4
-rw-r--r--sw/inc/fmtfsize.hxx12
-rw-r--r--sw/inc/fmtftn.hxx6
-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.hxx28
-rw-r--r--sw/inc/fmtpdsc.hxx16
-rw-r--r--sw/inc/fmtrfmrk.hxx6
-rw-r--r--sw/inc/fmtrowsplt.hxx4
-rw-r--r--sw/inc/fmtruby.hxx10
-rw-r--r--sw/inc/fmtsrnd.hxx14
-rw-r--r--sw/inc/fmturl.hxx10
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx10
-rw-r--r--sw/inc/format.hxx4
-rw-r--r--sw/inc/frmfmt.hxx30
-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.hxx46
-rw-r--r--sw/inc/node.hxx6
-rw-r--r--sw/inc/numrule.hxx10
-rw-r--r--sw/inc/pagedesc.hxx4
-rw-r--r--sw/inc/paratr.hxx34
-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.hxx6
-rw-r--r--sw/inc/swatrset.hxx4
-rw-r--r--sw/inc/swbaslnk.hxx4
-rw-r--r--sw/inc/swcli.hxx8
-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.hxx8
-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.hxx2
-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.hxx124
-rw-r--r--sw/inc/unocoll.hxx142
-rw-r--r--sw/inc/unocrsr.hxx18
-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.hxx80
-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.hxx322
-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.hxx52
-rw-r--r--sw/inc/unotxdoc.hxx266
-rw-r--r--sw/inc/usrfld.hxx34
-rw-r--r--sw/inc/view.hxx50
-rw-r--r--sw/inc/viscrs.hxx30
-rw-r--r--sw/inc/wdocsh.hxx2
-rw-r--r--sw/qa/core/filters-test.cxx6
-rw-r--r--sw/qa/core/macros-test.cxx4
-rw-r--r--sw/qa/core/test_ToxLinkProcessor.cxx4
-rw-r--r--sw/qa/core/test_ToxTextGenerator.cxx8
-rw-r--r--sw/qa/core/uwriter.cxx12
-rw-r--r--sw/qa/extras/htmlexport/htmlexport.cxx8
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx18
-rw-r--r--sw/qa/extras/mailmerge/mailmerge.cxx6
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx8
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx4
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport2.cxx4
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport3.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport4.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport5.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport6.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport7.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlw14export.cxx2
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx4
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx4
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx4
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx2
-rw-r--r--sw/qa/tiledrendering/tiledrendering.cxx6
-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.hxx64
-rw-r--r--sw/source/core/access/accembedded.hxx16
-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/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/CntntIdxStore.cxx10
-rw-r--r--sw/source/core/doc/acmplwrd.cxx2
-rw-r--r--sw/source/core/doc/doccomp.cxx26
-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/DocumentChartDataProviderManager.hxx6
-rw-r--r--sw/source/core/inc/DocumentContentOperationsManager.hxx46
-rw-r--r--sw/source/core/inc/DocumentDeviceManager.hxx20
-rw-r--r--sw/source/core/inc/DocumentDrawModelManager.hxx28
-rw-r--r--sw/source/core/inc/DocumentExternalDataManager.hxx4
-rw-r--r--sw/source/core/inc/DocumentFieldsManager.hxx52
-rw-r--r--sw/source/core/inc/DocumentLayoutManager.hxx24
-rw-r--r--sw/source/core/inc/DocumentLinksAdministrationManager.hxx22
-rw-r--r--sw/source/core/inc/DocumentListItemsManager.hxx8
-rw-r--r--sw/source/core/inc/DocumentListsManager.hxx18
-rw-r--r--sw/source/core/inc/DocumentOutlineNodesManager.hxx10
-rw-r--r--sw/source/core/inc/DocumentRedlineManager.hxx68
-rw-r--r--sw/source/core/inc/DocumentSettingManager.hxx32
-rw-r--r--sw/source/core/inc/DocumentStateManager.hxx18
-rw-r--r--sw/source/core/inc/DocumentStatisticsManager.hxx10
-rw-r--r--sw/source/core/inc/DocumentStylePoolManager.hxx18
-rw-r--r--sw/source/core/inc/DocumentTimerManager.hxx10
-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.hxx82
-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.hxx18
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx36
-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.hxx16
-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.hxx56
-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.hxx20
-rw-r--r--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.hxx72
-rw-r--r--sw/source/core/inc/cellfrm.hxx14
-rw-r--r--sw/source/core/inc/cntfrm.hxx16
-rw-r--r--sw/source/core/inc/colfrm.hxx6
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx14
-rw-r--r--sw/source/core/inc/dflyobj.hxx58
-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/flyfrm.hxx50
-rw-r--r--sw/source/core/inc/flyfrms.hxx36
-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.hxx20
-rw-r--r--sw/source/core/inc/notxtfrm.hxx14
-rw-r--r--sw/source/core/inc/observablethread.hxx4
-rw-r--r--sw/source/core/inc/pagefrm.hxx24
-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.hxx20
-rw-r--r--sw/source/core/inc/rowfrm.hxx14
-rw-r--r--sw/source/core/inc/sectfrm.hxx22
-rw-r--r--sw/source/core/inc/swfntcch.hxx2
-rw-r--r--sw/source/core/inc/tabfrm.hxx26
-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/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.hxx34
-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.hxx52
-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/unoport.hxx78
-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.hxx20
-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/swg/SwXMLBlockImport.cxx10
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/pordrop.hxx8
-rw-r--r--sw/source/core/text/porexp.hxx32
-rw-r--r--sw/source/core/text/porfld.hxx42
-rw-r--r--sw/source/core/text/porfly.hxx10
-rw-r--r--sw/source/core/text/porftn.hxx24
-rw-r--r--sw/source/core/text/porglue.hxx8
-rw-r--r--sw/source/core/text/porhyph.hxx26
-rw-r--r--sw/source/core/text/porlay.hxx6
-rw-r--r--sw/source/core/text/porlin.hxx2
-rw-r--r--sw/source/core/text/pormulti.hxx14
-rw-r--r--sw/source/core/text/porref.hxx12
-rw-r--r--sw/source/core/text/porrst.hxx32
-rw-r--r--sw/source/core/text/portab.hxx10
-rw-r--r--sw/source/core/text/portox.hxx12
-rw-r--r--sw/source/core/text/portxt.hxx42
-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/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/unoobj2.cxx46
-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/core/unocore/unotextmarkup.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.hxx4
-rw-r--r--sw/source/filter/inc/fltini.hxx12
-rw-r--r--sw/source/filter/inc/fltshell.hxx18
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx308
-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.hxx282
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx62
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx8
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx12
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx92
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx282
-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.hxx120
-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.hxx26
-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.hxx4
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx8
-rw-r--r--sw/source/filter/xml/xmltexti.hxx30
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx10
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx10
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx10
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx28
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx10
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx6
-rw-r--r--sw/source/ui/dbui/mmmergepage.hxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx10
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx12
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hxx2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hxx6
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx298
-rw-r--r--sw/source/ui/envelp/envfmt.hxx10
-rw-r--r--sw/source/ui/envelp/envprt.hxx10
-rw-r--r--sw/source/ui/envelp/labfmt.hxx16
-rw-r--r--sw/source/ui/envelp/labprt.hxx10
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx4
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx40
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx2
-rw-r--r--sw/source/ui/fldui/flddb.hxx10
-rw-r--r--sw/source/ui/fldui/flddinf.hxx10
-rw-r--r--sw/source/ui/fldui/flddok.hxx10
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx10
-rw-r--r--sw/source/ui/fldui/fldpage.hxx2
-rw-r--r--sw/source/ui/fldui/fldref.hxx10
-rw-r--r--sw/source/ui/fldui/fldvar.hxx12
-rw-r--r--sw/source/ui/frmdlg/cption.cxx4
-rw-r--r--sw/source/ui/index/cnttab.cxx42
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx4
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/ui/misc/impfnote.hxx6
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/table/tautofmt.cxx8
-rw-r--r--sw/source/ui/uno/swdetect.hxx8
-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/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
-rw-r--r--sw/source/uibase/config/StoredChapterNumbering.cxx26
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx10
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx8
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx4
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx4
-rw-r--r--sw/source/uibase/docvw/AnchorOverlayObject.cxx4
-rw-r--r--sw/source/uibase/docvw/AnchorOverlayObject.hxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.hxx10
-rw-r--r--sw/source/uibase/docvw/OverlayRanges.hxx2
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx6
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.cxx4
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.hxx2
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.hxx28
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.cxx22
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.hxx2
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.hxx2
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx4
-rw-r--r--sw/source/uibase/inc/DashedLine.hxx2
-rw-r--r--sw/source/uibase/inc/DropDownFieldDialog.hxx4
-rw-r--r--sw/source/uibase/inc/FrameControl.hxx6
-rw-r--r--sw/source/uibase/inc/HeaderFooterWin.hxx14
-rw-r--r--sw/source/uibase/inc/PageBreakWin.hxx16
-rw-r--r--sw/source/uibase/inc/SwSpellDialogChildWindow.hxx18
-rw-r--r--sw/source/uibase/inc/SwXFilterOptions.hxx18
-rw-r--r--sw/source/uibase/inc/abstract.hxx2
-rw-r--r--sw/source/uibase/inc/actctrl.hxx4
-rw-r--r--sw/source/uibase/inc/annotsh.hxx2
-rw-r--r--sw/source/uibase/inc/ascfldlg.hxx2
-rw-r--r--sw/source/uibase/inc/autoedit.hxx2
-rw-r--r--sw/source/uibase/inc/barcfg.hxx4
-rw-r--r--sw/source/uibase/inc/bmpwin.hxx4
-rw-r--r--sw/source/uibase/inc/bookctrl.hxx6
-rw-r--r--sw/source/uibase/inc/bookmark.hxx6
-rw-r--r--sw/source/uibase/inc/break.hxx4
-rw-r--r--sw/source/uibase/inc/cfgitems.hxx20
-rw-r--r--sw/source/uibase/inc/changedb.hxx4
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx8
-rw-r--r--sw/source/uibase/inc/colex.hxx10
-rw-r--r--sw/source/uibase/inc/column.hxx16
-rw-r--r--sw/source/uibase/inc/conarc.hxx8
-rw-r--r--sw/source/uibase/inc/concustomshape.hxx10
-rw-r--r--sw/source/uibase/inc/condedit.hxx4
-rw-r--r--sw/source/uibase/inc/conform.hxx6
-rw-r--r--sw/source/uibase/inc/conpoly.hxx8
-rw-r--r--sw/source/uibase/inc/conrect.hxx6
-rw-r--r--sw/source/uibase/inc/content.hxx4
-rw-r--r--sw/source/uibase/inc/conttree.hxx92
-rw-r--r--sw/source/uibase/inc/convert.hxx2
-rw-r--r--sw/source/uibase/inc/cption.hxx6
-rw-r--r--sw/source/uibase/inc/dbconfig.hxx4
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx6
-rw-r--r--sw/source/uibase/inc/dbtree.hxx10
-rw-r--r--sw/source/uibase/inc/dbui.hxx6
-rw-r--r--sw/source/uibase/inc/docfnote.hxx2
-rw-r--r--sw/source/uibase/inc/docstdlg.hxx6
-rw-r--r--sw/source/uibase/inc/drpcps.hxx8
-rw-r--r--sw/source/uibase/inc/drwtxtsh.hxx2
-rw-r--r--sw/source/uibase/inc/dselect.hxx4
-rw-r--r--sw/source/uibase/inc/edtwin.hxx38
-rw-r--r--sw/source/uibase/inc/envimg.hxx12
-rw-r--r--sw/source/uibase/inc/envlop.hxx22
-rw-r--r--sw/source/uibase/inc/fldedt.hxx4
-rw-r--r--sw/source/uibase/inc/fldtdlg.hxx8
-rw-r--r--sw/source/uibase/inc/fldwrap.hxx4
-rw-r--r--sw/source/uibase/inc/fontcfg.hxx4
-rw-r--r--sw/source/uibase/inc/formedt.hxx4
-rw-r--r--sw/source/uibase/inc/frmdlg.hxx2
-rw-r--r--sw/source/uibase/inc/frmpage.hxx32
-rw-r--r--sw/source/uibase/inc/glosbib.hxx8
-rw-r--r--sw/source/uibase/inc/gloslst.hxx2
-rw-r--r--sw/source/uibase/inc/glossary.hxx16
-rw-r--r--sw/source/uibase/inc/glshell.hxx4
-rw-r--r--sw/source/uibase/inc/hyp.hxx10
-rw-r--r--sw/source/uibase/inc/inpdlg.hxx6
-rw-r--r--sw/source/uibase/inc/inputwin.hxx10
-rw-r--r--sw/source/uibase/inc/insfnote.hxx4
-rw-r--r--sw/source/uibase/inc/instable.hxx2
-rw-r--r--sw/source/uibase/inc/javaedit.hxx4
-rw-r--r--sw/source/uibase/inc/label.hxx4
-rw-r--r--sw/source/uibase/inc/labelcfg.hxx4
-rw-r--r--sw/source/uibase/inc/labimg.hxx8
-rw-r--r--sw/source/uibase/inc/linenum.hxx2
-rw-r--r--sw/source/uibase/inc/mailconfigpage.hxx6
-rw-r--r--sw/source/uibase/inc/maildispatcher.hxx4
-rw-r--r--sw/source/uibase/inc/mailmergechildwindow.hxx4
-rw-r--r--sw/source/uibase/inc/mailmergehelper.hxx76
-rw-r--r--sw/source/uibase/inc/mailmergewizard.hxx10
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx8
-rw-r--r--sw/source/uibase/inc/mergetbl.hxx4
-rw-r--r--sw/source/uibase/inc/multmrk.hxx4
-rw-r--r--sw/source/uibase/inc/navicfg.hxx4
-rw-r--r--sw/source/uibase/inc/navipi.hxx14
-rw-r--r--sw/source/uibase/inc/num.hxx14
-rw-r--r--sw/source/uibase/inc/numberingtypelistbox.hxx4
-rw-r--r--sw/source/uibase/inc/numfmtlb.hxx2
-rw-r--r--sw/source/uibase/inc/numpara.hxx8
-rw-r--r--sw/source/uibase/inc/numprevw.hxx2
-rw-r--r--sw/source/uibase/inc/optcomp.hxx6
-rw-r--r--sw/source/uibase/inc/optload.hxx20
-rw-r--r--sw/source/uibase/inc/optpage.hxx62
-rw-r--r--sw/source/uibase/inc/outline.hxx16
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx10
-rw-r--r--sw/source/uibase/inc/pggrid.hxx10
-rw-r--r--sw/source/uibase/inc/popbox.hxx6
-rw-r--r--sw/source/uibase/inc/pview.hxx26
-rw-r--r--sw/source/uibase/inc/redlndlg.hxx12
-rw-r--r--sw/source/uibase/inc/regionsw.hxx26
-rw-r--r--sw/source/uibase/inc/rowht.hxx4
-rw-r--r--sw/source/uibase/inc/scroll.hxx2
-rw-r--r--sw/source/uibase/inc/selglos.hxx2
-rw-r--r--sw/source/uibase/inc/splittbl.hxx4
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx28
-rw-r--r--sw/source/uibase/inc/srcview.hxx6
-rw-r--r--sw/source/uibase/inc/srtdlg.hxx4
-rw-r--r--sw/source/uibase/inc/swdtflvr.hxx12
-rw-r--r--sw/source/uibase/inc/swlbox.hxx4
-rw-r--r--sw/source/uibase/inc/swmessdialog.hxx2
-rw-r--r--sw/source/uibase/inc/swmodalredlineacceptdlg.hxx4
-rw-r--r--sw/source/uibase/inc/swrenamexnameddlg.hxx2
-rw-r--r--sw/source/uibase/inc/swruler.hxx12
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx8
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx48
-rw-r--r--sw/source/uibase/inc/swuiidxmrk.hxx8
-rw-r--r--sw/source/uibase/inc/swuipardlg.hxx2
-rw-r--r--sw/source/uibase/inc/swwrtshitem.hxx4
-rw-r--r--sw/source/uibase/inc/syncbtn.hxx2
-rw-r--r--sw/source/uibase/inc/tabledlg.hxx2
-rw-r--r--sw/source/uibase/inc/tautofmt.hxx2
-rw-r--r--sw/source/uibase/inc/tbxanchr.hxx6
-rw-r--r--sw/source/uibase/inc/titlepage.hxx2
-rw-r--r--sw/source/uibase/inc/tmpdlg.hxx6
-rw-r--r--sw/source/uibase/inc/tmplctrl.hxx6
-rw-r--r--sw/source/uibase/inc/uiitems.hxx28
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx6
-rw-r--r--sw/source/uibase/inc/unoatxt.hxx114
-rw-r--r--sw/source/uibase/inc/unodispatch.hxx26
-rw-r--r--sw/source/uibase/inc/unomailmerge.hxx34
-rw-r--r--sw/source/uibase/inc/unomod.hxx46
-rw-r--r--sw/source/uibase/inc/unotools.hxx6
-rw-r--r--sw/source/uibase/inc/unotxvw.hxx160
-rw-r--r--sw/source/uibase/inc/usrpref.hxx20
-rw-r--r--sw/source/uibase/inc/viewlayoutctrl.hxx8
-rw-r--r--sw/source/uibase/inc/wordcountctrl.hxx2
-rw-r--r--sw/source/uibase/inc/wordcountdialog.hxx4
-rw-r--r--sw/source/uibase/inc/workctrl.hxx24
-rw-r--r--sw/source/uibase/inc/wrap.hxx12
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx14
-rw-r--r--sw/source/uibase/inc/wview.hxx2
-rw-r--r--sw/source/uibase/inc/zoomctrl.hxx6
-rw-r--r--sw/source/uibase/lingu/sdrhhcwrap.hxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx4
-rw-r--r--sw/source/uibase/shells/grfsh.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/StylePresetsPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/SwPanelFactory.cxx8
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.hxx4
-rw-r--r--sw/source/uibase/table/tablepg.hxx26
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--sw/source/uibase/uiview/viewling.cxx2
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.hxx28
-rw-r--r--sw/source/uibase/uno/unodefaults.hxx2
-rw-r--r--sw/source/uibase/uno/unomailmerge.cxx6
-rw-r--r--sw/source/uibase/uno/unomodule.hxx18
-rw-r--r--sw/source/uibase/utlui/bookctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx2
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx2
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx2
669 files changed, 6870 insertions, 6870 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index f72468059736..7296528e9f5b 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -37,29 +37,29 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
SwSidebarItem& rSidebarItem,
SwFormatField* aField );
virtual ~SwAnnotationWin();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
- virtual void UpdateData() SAL_OVERRIDE;
- virtual void SetPostItText() SAL_OVERRIDE;
- virtual void Delete() SAL_OVERRIDE;
- virtual void GotoPos() SAL_OVERRIDE;
+ virtual void UpdateData() override;
+ virtual void SetPostItText() override;
+ virtual void Delete() override;
+ virtual void GotoPos() override;
- virtual OUString GetAuthor() SAL_OVERRIDE;
- virtual Date GetDate() SAL_OVERRIDE;
- virtual tools::Time GetTime() SAL_OVERRIDE;
+ virtual OUString GetAuthor() override;
+ virtual Date GetDate() override;
+ virtual tools::Time GetTime() override;
- virtual sal_uInt32 MoveCaret() SAL_OVERRIDE;
+ virtual sal_uInt32 MoveCaret() override;
- virtual bool CalcFollow() SAL_OVERRIDE;
+ virtual bool CalcFollow() override;
void InitAnswer(OutlinerParaObject* pText);
- virtual bool IsProtected() SAL_OVERRIDE;
+ virtual bool IsProtected() override;
protected:
- virtual VclPtr<MenuButton> CreateMenuButton() SAL_OVERRIDE;
+ virtual VclPtr<MenuButton> CreateMenuButton() override;
private:
- virtual SvxLanguageItem GetLanguage() SAL_OVERRIDE;
+ virtual SvxLanguageItem GetLanguage() override;
sal_uInt32 CountFollowing();
SwFormatField* mpFormatField;
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 0172fac75359..752cd2a01f92 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -102,7 +102,7 @@ class SwNoteProps: public utl::ConfigItem
private:
bool bIsShowAnchor;
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwNoteProps()
@@ -133,7 +133,7 @@ class SwNoteProps: public utl::ConfigItem
return aNames;
}
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
};
class SwPostItMgr: public SfxListener
@@ -197,7 +197,7 @@ class SwPostItMgr: public SfxListener
const_iterator begin() const { return mvPostItFields.begin(); }
const_iterator end() const { return mvPostItFields.end(); }
- void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
void LayoutPostIts();
bool CalcRects();
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 93d5b22159d8..e01c269327c4 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -66,7 +66,7 @@ class SwSidebarWin : public vcl::Window
SwPostItBits aBits,
SwSidebarItem& rSidebarItem );
virtual ~SwSidebarWin();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetSize( const Size& rNewSize );
void SetPosSizePixelRect( long nX,
@@ -174,18 +174,18 @@ class SwSidebarWin : public vcl::Window
void SetLanguage(const SvxLanguageItem& rNewItem);
void ChangeSidebarItem( SwSidebarItem& rSidebarItem );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
- virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) SAL_OVERRIDE;
+ virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) override;
protected:
- virtual void DataChanged( const DataChangedEvent& aEvent) SAL_OVERRIDE;
- virtual void LoseFocus() SAL_OVERRIDE;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
- virtual void GetFocus() SAL_OVERRIDE;
+ virtual void DataChanged( const DataChangedEvent& aEvent) override;
+ virtual void LoseFocus() override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+ virtual void GetFocus() override;
virtual VclPtr<MenuButton> CreateMenuButton() = 0;
- void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE;
+ void SetSizePixel( const Size& rNewSize ) override;
SfxItemSet DefaultItem();
DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void);
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 7741771a4153..ec1682c04b7b 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -39,17 +39,17 @@ public:
void ChangeNumRule( SwNumRule& rNumRule );
SwTextNode* GetTextNode() const { return mpTextNode;}
- virtual bool IsNotificationEnabled() const SAL_OVERRIDE;
+ virtual bool IsNotificationEnabled() const override;
- virtual bool IsContinuous() const SAL_OVERRIDE;
+ virtual bool IsContinuous() const override;
- virtual bool IsCounted() const SAL_OVERRIDE;
+ virtual bool IsCounted() const override;
- virtual bool LessThan(const SwNumberTreeNode & rNode) const SAL_OVERRIDE;
+ virtual bool LessThan(const SwNumberTreeNode & rNode) const override;
- virtual bool IsRestart() const SAL_OVERRIDE;
+ virtual bool IsRestart() const override;
- virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const SAL_OVERRIDE;
+ virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const override;
SwPosition GetPosition() const;
@@ -71,16 +71,16 @@ public:
const SwNodeNum* GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const;
protected:
- virtual SwNumberTreeNode * Create() const SAL_OVERRIDE;
+ virtual SwNumberTreeNode * Create() const override;
// --> #i64010#
- virtual bool HasCountedChildren() const SAL_OVERRIDE;
- virtual bool IsCountedForNumbering() const SAL_OVERRIDE;
+ virtual bool HasCountedChildren() const override;
+ virtual bool IsCountedForNumbering() const override;
// method called before this tree node has been added to the list tree
- virtual void PreAdd() SAL_OVERRIDE;
+ virtual void PreAdd() override;
// method called at a child after this child has been removed from the list tree
- virtual void PostRemove() SAL_OVERRIDE;
+ virtual void PostRemove() override;
private:
SwTextNode * mpTextNode;
SwNumRule * mpNumRule;
@@ -90,11 +90,11 @@ private:
SwNodeNum( const SwNodeNum& ) = delete;
SwNodeNum& operator=( const SwNodeNum& ) = delete;
- virtual bool IsCountPhantoms() const SAL_OVERRIDE;
+ virtual bool IsCountPhantoms() const override;
- virtual bool IsNotifiable() const SAL_OVERRIDE;
+ virtual bool IsNotifiable() const override;
- virtual void NotifyNode() SAL_OVERRIDE;
+ virtual void NotifyNode() override;
};
#endif // INCLUDED_SW_INC_SWNODENUM_HXX
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index e11f1f303f5d..13c3399667ac 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -35,10 +35,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) SAL_OVERRIDE;
+ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 2a8a6b4540d9..95e842b8fb6a 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -57,9 +57,9 @@ public:
virtual ~SwUndoFieldFromDoc();
- virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) override;
};
class SwUndoFieldFromAPI : public SwUndoField
@@ -76,9 +76,9 @@ public:
sal_uInt16 nWhich);
virtual ~SwUndoFieldFromAPI();
- virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) override;
};
#endif // INCLUDED_SW_INC_SWUNDOFIELD_HXX
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index f6090c7f61ae..981f5aa3eabd 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 ) SAL_OVERRIDE;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) 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 ) SAL_OVERRIDE;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
virtual ~SvXMLSectionListContext();
};
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index e6563e3f4824..07f2472694d3 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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual const SwPaM* GetPaM() const = 0;
virtual SwPaM* GetPaM() = 0;
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index 7e5be38eac81..8f015b0d3a0f 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -84,7 +84,7 @@ public:
*/
ToxTabStopTokenHandler::HandledTabStopToken
HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
- const SwRootFrm *currentLayout) const SAL_OVERRIDE;
+ const SwRootFrm *currentLayout) const override;
private:
/** Test whether the page layout can be obtained by a layout rectangle.
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 19453289d593..749f3e5ec944 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -260,9 +260,9 @@ public:
// IAccessibleViewForwarder
- 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 Rectangle GetVisibleArea() const override;
+ virtual Point LogicToPixel (const Point& rPoint) const override;
+ virtual Size LogicToPixel (const Size& rSize) const override;
// IAccessibleParent
virtual bool ReplaceChild (
@@ -270,13 +270,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) SAL_OVERRIDE;
+ ) throw (::com::sun::star::uno::RuntimeException) override;
virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
(::com::sun::star::beans::XPropertySet* pSet)
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException) override;
// additional Core/Pixel conversions for internal use; also works
// for preview
@@ -306,7 +306,7 @@ private:
void GetMapMode( const Point& _rPoint,
MapMode& _orMapMode ) const;
public:
- virtual bool IsDocumentSelAll() SAL_OVERRIDE;
+ virtual bool IsDocumentSelAll() 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 1a869f1fd2bc..695beed6f7ae 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() SAL_OVERRIDE;
+ virtual void ObjectAttachedToAnchorFrame() override;
/** method to assure that anchored object is registered at the correct
page frame
@author OD
*/
- virtual void RegisterAtCorrectPage() SAL_OVERRIDE;
+ virtual void RegisterAtCorrectPage() override;
- virtual bool _SetObjTop( const SwTwips _nTop) SAL_OVERRIDE;
- virtual bool _SetObjLeft( const SwTwips _nLeft) SAL_OVERRIDE;
+ virtual bool _SetObjTop( const SwTwips _nTop) override;
+ virtual bool _SetObjLeft( const SwTwips _nLeft) override;
- virtual const SwRect GetObjBoundRect() const SAL_OVERRIDE;
+ virtual const SwRect GetObjBoundRect() const 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() SAL_OVERRIDE;
- virtual void InvalidateObjPos() SAL_OVERRIDE;
+ virtual void MakeObjPos() override;
+ virtual void InvalidateObjPos() override;
inline bool IsValidPos() const
{
return mbValidPos;
}
// accessors to the format
- virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE;
- virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE;
+ virtual SwFrameFormat& GetFrameFormat() override;
+ virtual const SwFrameFormat& GetFrameFormat() const override;
// accessors to the object area and its position
- virtual const SwRect GetObjRect() const SAL_OVERRIDE;
+ virtual const SwRect GetObjRect() const override;
// Return value can be NULL.
const Rectangle* GetLastObjRect() const { return mpLastObjRect;}
@@ -171,7 +171,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
*/
virtual void NotifyBackground( SwPageFrm* _pPageFrm,
const SwRect& _rRect,
- PrepareHint _eHint ) SAL_OVERRIDE;
+ PrepareHint _eHint ) 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() SAL_OVERRIDE;
+ virtual void UpdateLayoutDir() 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( ) const SAL_OVERRIDE { return "SwAnchoredDrawObject"; }
+ virtual const char* getElementName( ) const override { return "SwAnchoredDrawObject"; }
};
#endif
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 845bcc3c032c..4240f9bd5048 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -72,16 +72,16 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType
OUString m_sSortAlgorithm;
protected:
-virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
SwAuthorityFieldType(SwDoc* pDoc);
virtual ~SwAuthorityFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const 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;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override;
inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; }
SwDoc* GetDoc(){ return m_pDoc; }
@@ -148,8 +148,8 @@ class SwAuthorityField : public SwField
sal_IntPtr m_nHandle;
mutable sal_IntPtr m_nTempSequencePos;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
/// For internal use only, in general continue using ExpandField() instead.
@@ -164,15 +164,15 @@ public:
OUString GetFieldText(ToxAuthorityField eField) const;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
- virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) override;
+ virtual SwFieldType* ChgTyp( SwFieldType* ) 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;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override;
sal_IntPtr GetHandle() const { return m_nHandle; }
- virtual OUString GetDescription() const SAL_OVERRIDE;
+ virtual OUString GetDescription() const override;
};
inline OUString SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index f4eb80690fc7..c283a96686df 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -110,14 +110,14 @@ protected:
public:
SwClient() : pRegisteredIn(nullptr) {}
- virtual ~SwClient() SAL_OVERRIDE;
+ virtual ~SwClient() override;
// callbacks received from SwModify (friend class - so these methods can be private)
// should be called only from SwModify the client is registered in
// mba: IMHO this method should be pure virtual
// DO NOT USE IN NEW CODE! use SwClientNotify instead.
virtual void Modify(const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue);
// when overriding this, you MUST call SwClient::SwClientModify() in the override!
- virtual void SwClientNotify(const SwModify&, const SfxHint& rHint) SAL_OVERRIDE;
+ virtual void SwClientNotify(const SwModify&, const SfxHint& rHint) override;
// in case an SwModify object is destroyed that itself is registered in another SwModify,
// its SwClient objects can decide to get registered to the latter instead by calling this method
@@ -155,7 +155,7 @@ class SW_DLLPUBLIC SwModify: public SwClient
// mba: IMHO this method should be pure virtual
// DO NOT USE IN NEW CODE! use CallSwClientNotify instead.
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override
{ NotifyClients( pOld, pNew ); };
SwModify(SwModify&) = delete;
@@ -186,7 +186,7 @@ public:
bool HasWriterListeners() const { return m_pWriterListeners; }
// get information about attribute
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
void LockModify() { m_bModifyLocked = true; }
void UnlockModify() { m_bModifyLocked = false; }
@@ -218,17 +218,17 @@ public:
SwClient* GetToTell() { return m_pToTell; }
/** get Client information */
- virtual bool GetInfo( SfxPoolItem& rInfo) const SAL_OVERRIDE
+ virtual bool GetInfo( SfxPoolItem& rInfo) const override
{ return m_pToTell == nullptr || m_pToTell->GetInfo( rInfo ); }
protected:
- virtual void Modify( const SfxPoolItem* pOldValue, const SfxPoolItem *pNewValue ) SAL_OVERRIDE
+ virtual void Modify( const SfxPoolItem* pOldValue, const SfxPoolItem *pNewValue ) override
{
if( pNewValue && pNewValue->Which() == RES_OBJECTDYING )
CheckRegistration(pOldValue,pNewValue);
else if( m_pToTell )
m_pToTell->ModifyNotification(pOldValue, pNewValue);
}
- virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) SAL_OVERRIDE
+ virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) override
{ if(m_pToTell) m_pToTell->SwClientNotifyCall(rModify, rHint); }
};
@@ -264,7 +264,7 @@ namespace sw
m_pPosition = m_pPosition->m_pLeft;
return m_pCurrent = m_pPosition;
}
- ~ClientIteratorBase() SAL_OVERRIDE
+ ~ClientIteratorBase() override
{
assert(our_pClientIters);
if(our_pClientIters == this)
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 293339ec4c9f..4eb89f1e9c74 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 SAL_OVERRIDE;
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual bool operator==( const SfxPoolItem& ) const override;
static inline const CommandStruct* GetCmds() { return aCmds; }
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index ce677d9c746c..3f7ae81a3f52 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -36,8 +36,8 @@ public:
bool bAuto = false );
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr )
{
@@ -60,14 +60,14 @@ public:
virtual ~SwTableBoxFormula() {};
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
inline void ChgDefinedIn( const SwModify* pNew )
{ pDefinedIn = const_cast<SwModify*>(pNew); }
// BoxAttribut -> BoxStartNode
- virtual const SwNode* GetNodeOfFormula() const SAL_OVERRIDE;
+ virtual const SwNode* GetNodeOfFormula() const override;
SwTableBox* GetTableBox();
const SwTableBox* GetTableBox() const
@@ -85,8 +85,8 @@ public:
SwTableBoxValue( const double aVal );
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
inline SwTableBoxValue& operator=( const SwTableBoxValue& rCmp )
{
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 5f22ceb36ec5..637879936211 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -42,7 +42,7 @@ class SW_DLLPUBLIC SwChapterFieldType : public SwFieldType
public:
SwChapterFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
@@ -56,8 +56,8 @@ class SW_DLLPUBLIC SwChapterField : public SwField
OUString sPre;
OUString sPost;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwChapterField(SwChapterFieldType*, sal_uInt32 nFormat = 0);
@@ -73,8 +73,8 @@ public:
inline OUString GetNumber() const;
inline OUString GetTitle() 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; }
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 1e466c477f4f..98e69ad60302 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -33,13 +33,13 @@ class SwTableWidthDlg : public SvxStandardDialog
SwTableFUNC &rFnc;
protected:
- virtual void Apply() SAL_OVERRIDE;
+ virtual void Apply() override;
DECL_LINK(LoseFocusHdl, void * = 0);
public:
SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc );
virtual ~SwTableWidthDlg();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
};
#endif
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 9c44b6a72479..ba454d9c8c0d 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -296,7 +296,7 @@ protected:
SAL_DLLPRIVATE void UpdateMarkedListLevel();
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
TYPEINFO_OVERRIDE();
@@ -306,8 +306,8 @@ public:
virtual ~SwCrsrShell();
// create new cursor and append the old one
- virtual SwPaM & CreateNewShellCursor() SAL_OVERRIDE;
- virtual SwPaM & GetCurrentShellCursor() SAL_OVERRIDE;
+ virtual SwPaM & CreateNewShellCursor() override;
+ virtual SwPaM & GetCurrentShellCursor() override;
SwPaM * CreateCrsr();
///< delete the current cursor and make the following into the current
@@ -398,12 +398,12 @@ public:
* scrolling is done. The passed Rectangle lays on pixel borders to avoid
* pixel errors.
*/
- virtual void VisPortChgd( const SwRect & ) SAL_OVERRIDE;
+ virtual void VisPortChgd( const SwRect & ) override;
/*
* virtual paint method to make selection visible again after Paint
*/
- void Paint(vcl::RenderContext& rRenderContext, const Rectangle & rRect) SAL_OVERRIDE;
+ void Paint(vcl::RenderContext& rRenderContext, const Rectangle & rRect) override;
// Areas
inline void SetMark();
@@ -846,7 +846,7 @@ public:
*/
OUString GetCrsrDescr() const;
- virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
/// Implementation of lok::Document::getPartPageRectangles() for Writer.
OUString getPageRectangles();
};
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 690beef2e4c9..3aa70cca7fd8 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -40,8 +40,8 @@ public:
SwDBFieldType(SwDoc* pDocPtr, const OUString& rColumnName, const SwDBData& rDBData);
virtual ~SwDBFieldType();
- virtual OUString GetName() const SAL_OVERRIDE;
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual OUString GetName() const override;
+ virtual SwFieldType* Copy() const override;
inline void AddRef() { nRefCnt++; }
void ReleaseRef();
@@ -49,8 +49,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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Classes derived from SwFields. They overlay the expand-function.
@@ -64,22 +64,22 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
bool bValidValue : 1;
bool bInitialized : 1;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwDBField(SwDBFieldType*, sal_uLong nFormat = 0);
virtual ~SwDBField();
- virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE;
+ virtual SwFieldType* ChgTyp( SwFieldType* ) override;
/// Current text.
inline void SetExpansion(const OUString& rStr);
- virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
- virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nType) override;
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
/// For calculations in expressions.
void ChgValue( double d, bool bVal );
@@ -98,15 +98,15 @@ public:
inline void SetInitialized() { bInitialized = true; }
/// Get name.
- virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
/// access to the command string
void SetFieldCode(const OUString& rStr) { sFieldCode = rStr; }
/// DBName
inline const SwDBData& GetDBData() const { return static_cast<SwDBFieldType*>(GetTyp())->GetDBData(); }
- 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL );
@@ -139,12 +139,12 @@ public:
SwDBData GetDBData(SwDoc* pDoc);
void SetDBData(const SwDBData& rDBData);
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const 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;
- 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 override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nType) override;
};
// Database field next record.
@@ -153,7 +153,7 @@ class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType
public:
SwDBNextSetFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
// Next data record with condition.
@@ -166,18 +166,18 @@ public:
SwDBNextSetField( SwDBNextSetFieldType*,
const OUString& rCond, const OUString& rDummy, const SwDBData& rDBData);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
void Evaluate(SwDoc*);
inline void SetCondValid(bool bCond);
inline bool IsCondValid() const;
// Condition
- 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;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
inline bool SwDBNextSetField::IsCondValid() const
@@ -192,7 +192,7 @@ class SwDBNumSetFieldType : public SwFieldType
public:
SwDBNumSetFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
// Data record with number xxx.
@@ -206,24 +206,24 @@ class SwDBNumSetField : public SwDBNameInfField
public:
SwDBNumSetField(SwDBNumSetFieldType*, const OUString& rCond, const OUString& rDBNum, const SwDBData& rDBData);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
inline bool IsCondValid() const;
inline void SetCondValid(bool bCond);
void Evaluate(SwDoc*);
// Condition
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
// Number of data record.
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
// Number of data record is in nFormat!!
- 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
inline bool SwDBNumSetField::IsCondValid() const
@@ -240,7 +240,7 @@ public:
SwDBNameFieldType(SwDoc*);
OUString Expand(sal_uLong) const;
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
// Database field.
@@ -249,10 +249,10 @@ class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
public:
SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
- 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;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Number of data record.
@@ -261,7 +261,7 @@ class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType
public:
SwDBSetNumberFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
// Database field.
@@ -271,14 +271,14 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
public:
SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const 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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
inline long SwDBSetNumberField::GetSetNumber() const
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index a08ca490cc23..b5ca6c211e0a 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -192,7 +192,7 @@ private:
SwFlyDrawObj* mpMasterObj;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
TYPEINFO_OVERRIDE();
@@ -201,22 +201,22 @@ public:
SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
virtual ~SwFlyDrawContact();
- virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
- virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE;
+ virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override;
+ virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override;
- virtual const SdrObject* GetMaster() const SAL_OVERRIDE;
- virtual SdrObject* GetMaster() SAL_OVERRIDE;
- virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE;
+ virtual const SdrObject* GetMaster() const override;
+ virtual SdrObject* GetMaster() override;
+ virtual void SetMaster( SdrObject* _pNewMaster ) 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 ) SAL_OVERRIDE;
- virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) SAL_OVERRIDE;
+ virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj ) override;
+ virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) override;
/** get data collection of anchored objects handled by with contact
*/
- virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE;
+ virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const override;
};
/** new class for re-direct methods calls at a 'virtual'
@@ -238,7 +238,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() SAL_OVERRIDE;
+ virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
public:
TYPEINFO_OVERRIDE();
@@ -248,9 +248,9 @@ class SwDrawVirtObj : public SdrVirtObj
virtual ~SwDrawVirtObj();
/// access to offset
- virtual const Point GetOffset() const SAL_OVERRIDE;
+ virtual const Point GetOffset() const override;
- virtual SwDrawVirtObj* Clone() const SAL_OVERRIDE;
+ virtual SwDrawVirtObj* Clone() const override;
SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj);
/// connection to writer layout
@@ -268,47 +268,47 @@ class SwDrawVirtObj : public SdrVirtObj
/ to drawing layer. */
bool IsConnected() const;
- virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE;
+ virtual void NbcSetAnchorPos(const Point& rPnt) override;
/// All overridden methods which need to use the offset
- 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 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 nAngle, double sn, double cs) SAL_OVERRIDE;
- virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nAngle, 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 nAngle, double sn, double cs) SAL_OVERRIDE;
- virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void Shear(const Point& rRef, long nAngle, 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;
+ virtual void RecalcBoundRect() override;
+ virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const override;
+ virtual ::basegfx::B2DPolyPolygon TakeContour() const override;
+ virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override;
+ virtual void NbcMove(const Size& rSiz) override;
+ virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override;
+ virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override;
+ virtual void Move(const Size& rSiz) override;
+ virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) override;
+ virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs) override;
+ virtual void Mirror(const Point& rRef1, const Point& rRef2) override;
+ virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override;
+ virtual void RecalcSnapRect() override;
+ virtual const Rectangle& GetSnapRect() const override;
+ virtual void SetSnapRect(const Rectangle& rRect) override;
+ virtual void NbcSetSnapRect(const Rectangle& rRect) override;
+ virtual const Rectangle& GetLogicRect() const override;
+ virtual void SetLogicRect(const Rectangle& rRect) override;
+ virtual void NbcSetLogicRect(const Rectangle& rRect) override;
+ virtual Point GetSnapPoint(sal_uInt32 i) const override;
+ virtual Point GetPoint(sal_uInt32 i) const override;
+ virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override;
+
+ virtual bool HasTextEdit() const override;
+
+ virtual SdrLayerID GetLayer() const override;
+ virtual void NbcSetLayer(SdrLayerID nLayer) override;
+ virtual void SetLayer(SdrLayerID nLayer) override;
/// FullDrag support
- virtual bool supportsFullDrag() const SAL_OVERRIDE;
- virtual SdrObject* getFullDragClone() const SAL_OVERRIDE;
+ virtual bool supportsFullDrag() const override;
+ virtual SdrObject* getFullDragClone() const override;
- virtual void SetBoundRectDirty() SAL_OVERRIDE;
- virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE;
- virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE;
+ virtual void SetBoundRectDirty() override;
+ virtual const Rectangle& GetCurrentBoundRect() const override;
+ virtual const Rectangle& GetLastBoundRect() const override;
};
bool CheckControlLayer( const SdrObject *pObj );
@@ -385,7 +385,7 @@ class SwDrawContact : public SwContact
protected:
/// virtuelle Methoden von SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
TYPEINFO_OVERRIDE();
@@ -393,12 +393,12 @@ class SwDrawContact : public SwContact
SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj );
virtual ~SwDrawContact();
- virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
- virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE;
+ virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override;
+ virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override;
- virtual const SdrObject* GetMaster() const SAL_OVERRIDE;
- virtual SdrObject* GetMaster() SAL_OVERRIDE;
- virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE;
+ virtual const SdrObject* GetMaster() const override;
+ virtual SdrObject* GetMaster() override;
+ virtual void SetMaster( SdrObject* _pNewMaster ) override;
const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = 0L ) const;
SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = 0L );
@@ -443,7 +443,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) SAL_OVERRIDE;
+ virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) override;
/** Used by Changed() and by UndoDraw.
Notifies paragraphs that have to get out of the way. */
@@ -460,7 +460,7 @@ class SwDrawContact : public SwContact
*/
static void GetTextObjectsFromFormat( std::list<SdrTextObj*>&, SwDoc* );
- virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE;
+ virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const override;
};
#endif
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index b4f5bedef4c8..492421fe7f0e 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -49,11 +49,11 @@ public:
void SetExpansion( const OUString& rStr ) { aExpansion = rStr;
bCRLFFlag = false; }
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
- virtual OUString GetName() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
+ virtual OUString GetName() const 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;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
OUString GetCmd() const;
void SetCmd( const OUString& aStr );
@@ -84,8 +84,8 @@ public:
class SwDDEField : public SwField
{
private:
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwDDEField(SwDDEFieldType*);
@@ -93,11 +93,11 @@ public:
/** Get parameter via types.
Name cannot be changed. */
- virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
// Command
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
};
#endif // INCLUDED_SW_INC_DDEFLD_HXX
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 261a70a9433f..cf2748be98ee 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -65,14 +65,14 @@ public:
virtual ~SwLinguServiceEventListener();
/// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
/// XLinguServiceEventListener
- virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ 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) override;
+ virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index bf5ced4daeff..8cdda43be771 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -478,9 +478,9 @@ public:
SwNodes const& GetNodes() const { return *m_pNodes; }
// IInterface
- virtual sal_Int32 acquire() SAL_OVERRIDE;
- virtual sal_Int32 release() SAL_OVERRIDE;
- virtual sal_Int32 getReferenceCount() const SAL_OVERRIDE;
+ virtual sal_Int32 acquire() override;
+ virtual sal_Int32 release() override;
+ virtual sal_Int32 getReferenceCount() const override;
// IDocumentSettingAccess
IDocumentSettingAccess const & getIDocumentSettingAccess() const; //The IDocumentSettingAccess interface
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index f690261308b5..d319c70aaa19 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -120,10 +120,10 @@ protected:
: SwVectorModifyBase<Value>(policy) {}
public:
- virtual size_t GetFormatCount() const SAL_OVERRIDE
+ virtual size_t GetFormatCount() const override
{ return std::vector<Value>::size(); }
- virtual Value GetFormat(size_t idx) const SAL_OVERRIDE
+ virtual Value GetFormat(size_t idx) const override
{ return std::vector<Value>::operator[](idx); }
inline size_t GetPos(const SwFormat *p) const
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 097b85083927..3a9199337775 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -92,28 +92,28 @@ class SW_DLLPUBLIC SwDocShell
SAL_DLLPRIVATE void RemoveLink();
/// Catch hint for DocInfo.
- SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
/// FileIO
- 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 InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
+ SAL_DLLPRIVATE virtual bool Load( SfxMedium& rMedium ) override;
+ SAL_DLLPRIVATE virtual bool LoadFrom( SfxMedium& rMedium ) override;
+ SAL_DLLPRIVATE virtual bool ConvertFrom( SfxMedium &rMedium ) override;
+ SAL_DLLPRIVATE virtual bool ConvertTo( SfxMedium &rMedium ) override;
+ SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium& rMedium ) override;
+ SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
- SAL_DLLPRIVATE virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool PrepareClose( bool bUI = true ) override;
SAL_DLLPRIVATE virtual bool InsertGeneratedStream(SfxMedium& rMedium,
css::uno::Reference<css::text::XTextRange> const& xInsertPosition)
- SAL_OVERRIDE;
+ override;
/// Make DocInfo known to the Doc.
SAL_DLLPRIVATE virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(
- vcl::Window *pParent, const SfxItemSet &) SAL_OVERRIDE;
+ vcl::Window *pParent, const SfxItemSet &) override;
/// OLE-stuff
- SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) override;
/// Methods for StyleSheets
@@ -152,7 +152,7 @@ class SW_DLLPUBLIC SwDocShell
protected:
/// override to update text fields
- virtual void DoFlushDocInfo() SAL_OVERRIDE;
+ virtual void DoFlushDocInfo() override;
public:
/// but we implement this ourselves.
@@ -177,15 +177,15 @@ public:
DECL_LINK_TYPED( Ole2ModifiedHdl, bool, void );
/// OLE-stuff.
- 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 SetVisArea( const Rectangle &rRect ) override;
+ virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const override;
+ virtual Printer *GetDocumentPrinter() override;
+ virtual OutputDevice* GetDocumentRefDev() override;
+ virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ) override;
+ virtual sal_uLong GetMiscStatus() const override;
- virtual void PrepareReload() SAL_OVERRIDE;
- virtual void SetModified( bool = true ) SAL_OVERRIDE;
+ virtual void PrepareReload() override;
+ virtual void SetModified( bool = true ) override;
/// Dispatcher
void Execute(SfxRequest &);
@@ -204,11 +204,11 @@ public:
void UpdateChildWindows();
/// global IO.
- virtual bool Save() SAL_OVERRIDE;
+ virtual bool Save() override;
/// For Style PI.
- virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE;
- virtual sfx2::StyleManager* GetStyleManager() SAL_OVERRIDE;
+ virtual SfxStyleSheetBasePool* GetStyleSheetPool() override;
+ virtual sfx2::StyleManager* GetStyleManager() override;
/// Set View for actions via Shell.
void SetView(SwView* pVw);
@@ -233,12 +233,12 @@ public:
#if defined WNT
virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType,
- ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
+ ::com::sun::star::uno::Any & rValue ) override;
virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType,
- const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
+ const ::com::sun::star::uno::Any & rValue ) override;
#endif
- virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) SAL_OVERRIDE;
- virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE;
+ virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) override;
+ virtual void ReconnectDdeLink(SfxObjectShell& rServer) override;
virtual void FillClass( SvGlobalName * pClassName,
SotClipboardFormatId * pClipFormat,
@@ -246,11 +246,11 @@ public:
OUString * pLongUserName,
OUString * pUserName,
sal_Int32 nFileFormat,
- bool bTemplate = false ) const SAL_OVERRIDE;
+ bool bTemplate = false ) const override;
- virtual std::set<Color> GetDocColors() SAL_OVERRIDE;
+ virtual std::set<Color> GetDocColors() override;
- virtual void LoadStyles( SfxObjectShell& rSource ) SAL_OVERRIDE;
+ virtual void LoadStyles( SfxObjectShell& rSource ) override;
void _LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument );
@@ -270,7 +270,7 @@ public:
void LoadingFinished();
/// Cancel transfer (called from SFX).
- virtual void CancelTransfers() SAL_OVERRIDE;
+ virtual void CancelTransfers() override;
/// Re-read Doc from Html-source.
void ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView );
@@ -284,15 +284,15 @@ public:
void InvalidateModel();
void ReactivateModel();
- virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames() SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames() override;
/// #i20883# Digital Signatures and Encryption
- virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ) SAL_OVERRIDE;
+ virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ) 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() SAL_OVERRIDE;
+ virtual void UpdateLinks() override;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
GetController();
@@ -301,18 +301,18 @@ public:
SAL_DLLPRIVATE bool IsTemplate() { return m_IsATemplate; }
SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { m_IsATemplate = bValue; }
- virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const SAL_OVERRIDE;
+ virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const override;
/** passwword protection for Writer (derived from SfxObjectShell)
see also: FN_REDLINE_ON, FN_REDLINE_ON */
- 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;
-
- virtual void libreOfficeKitCallback(int nType, const char* pPayload) const SAL_OVERRIDE;
- virtual bool isTiledRendering() const SAL_OVERRIDE;
+ virtual bool IsChangeRecording() const override;
+ virtual bool HasChangeRecordProtection() const override;
+ virtual void SetChangeRecording( bool bActivate ) override;
+ virtual bool SetProtectionPassword( const OUString &rPassword ) override;
+ virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) override;
+
+ virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override;
+ virtual bool isTiledRendering() const override;
};
/** Find the right DocShell and create a new one:
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index e1d29247f2e1..df68df3488ee 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -88,8 +88,8 @@ public:
bool IsPhysical() const { return bPhysical; }
void SetPhysical(bool bPhys);
- virtual void SetHidden( bool bHidden ) SAL_OVERRIDE;
- virtual bool IsHidden( ) const SAL_OVERRIDE;
+ virtual void SetHidden( bool bHidden ) override;
+ virtual bool IsHidden( ) const override;
void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
@@ -100,16 +100,16 @@ public:
void SetItemSet( const SfxItemSet& rSet,
const bool bResetIndentAttrsAtParagraphStyle = false );
- virtual SfxItemSet& GetItemSet() SAL_OVERRIDE;
+ virtual SfxItemSet& GetItemSet() override;
virtual std::unique_ptr<SfxItemSet> GetItemSetForPreview() 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 SAL_OVERRIDE;
- virtual const OUString& GetFollow() const SAL_OVERRIDE;
+ virtual const OUString& GetParent() const override;
+ virtual const OUString& GetFollow() const override;
- virtual sal_uLong GetHelpId( OUString& rFile ) SAL_OVERRIDE;
- virtual void SetHelpId( const OUString& r, sal_uLong nId ) SAL_OVERRIDE;
+ virtual sal_uLong GetHelpId( OUString& rFile ) override;
+ virtual void SetHelpId( const OUString& r, sal_uLong nId ) override;
/** Preset the members without physical access.
Used by StyleSheetPool. */
@@ -118,14 +118,14 @@ public:
void PresetParent(const OUString& rName){ aParent = rName; }
void PresetFollow(const OUString& rName){ aFollow = rName; }
- virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) SAL_OVERRIDE;
- virtual bool SetParent( const OUString& rStr) SAL_OVERRIDE;
- virtual bool SetFollow( const OUString& rStr) SAL_OVERRIDE;
+ virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) override;
+ virtual bool SetParent( const OUString& rStr) override;
+ virtual bool SetFollow( const OUString& rStr) override;
- virtual bool HasFollowSupport() const SAL_OVERRIDE;
- virtual bool HasParentSupport() const SAL_OVERRIDE;
- virtual bool HasClearParentSupport() const SAL_OVERRIDE;
- virtual OUString GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE;
+ virtual bool HasFollowSupport() const override;
+ virtual bool HasParentSupport() const override;
+ virtual bool HasClearParentSupport() const override;
+ virtual OUString GetDescription(SfxMapUnit eUnit) override;
SwCharFormat* GetCharFormat();
SwTextFormatColl* GetCollection();
@@ -134,7 +134,7 @@ public:
const SwNumRule* GetNumRule();
void SetNumRule(const SwNumRule& rRule);
- virtual bool IsUsed() const SAL_OVERRIDE;
+ virtual bool IsUsed() const override;
};
// Iterator for Pool.
@@ -176,13 +176,13 @@ public:
SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL );
virtual ~SwStyleSheetIterator();
- 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 sal_uInt16 Count() override;
+ virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx) override;
+ virtual SfxStyleSheetBase* First() override;
+ virtual SfxStyleSheetBase* Next() override;
+ virtual SfxStyleSheetBase* Find(const OUString& rStr) override;
- virtual void Notify( SfxBroadcaster&, const SfxHint& ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster&, const SfxHint& ) override;
void InvalidateIterator();
};
@@ -193,8 +193,8 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool
SwDoc& rDoc;
bool bOrganizer : 1; ///< Organizer
- virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask) SAL_OVERRIDE;
- virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ) SAL_OVERRIDE;
+ virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask) override;
+ virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ) override;
using SfxStyleSheetBasePool::Find;
@@ -202,26 +202,26 @@ public:
SwDocStyleSheetPool( SwDoc&, bool bOrganizer = false );
virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily,
- sal_uInt16 nMask) SAL_OVERRIDE;
+ sal_uInt16 nMask) override;
virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam,
- sal_uInt16 n=SFXSTYLEBIT_ALL ) SAL_OVERRIDE;
+ sal_uInt16 n=SFXSTYLEBIT_ALL ) override;
virtual bool SetParent( SfxStyleFamily eFam, const OUString &rStyle,
- const OUString &rParent ) SAL_OVERRIDE;
+ const OUString &rParent ) override;
- virtual void Remove( SfxStyleSheetBase* pStyle) SAL_OVERRIDE;
+ virtual void Remove( SfxStyleSheetBase* pStyle) override;
bool IsOrganizerMode() const { return bOrganizer; }
- virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask ) SAL_OVERRIDE;
+ virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask ) override;
SwDoc& GetDoc() const { return rDoc; }
void dispose();
- virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE;
- virtual void SAL_CALL release( ) throw () SAL_OVERRIDE;
+ virtual void SAL_CALL acquire( ) throw () override;
+ virtual void SAL_CALL release( ) throw () override;
void InvalidateIterator();
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 1636a5f64a78..56f73b66f4d7 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -141,7 +141,7 @@ public:
sal_uInt16 const nMaxPage, const OUString& ) const;
void ChangeExpansion( SwDoc* pDoc,
bool bVirtPageNum, const sal_Int16* pNumFormat = 0 );
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
// Page numbering.
@@ -163,15 +163,15 @@ public:
void ChangeExpansion(sal_uInt16 const nPageNumber,
sal_uInt16 const nMaxPage);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
- 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;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
OUString GetUserString() const { return sUserStr; }
void SetUserString( const OUString& rS ) { sUserStr = rS; }
@@ -183,7 +183,7 @@ public:
SwAuthorFieldType();
static OUString Expand(sal_uLong);
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SwAuthorField : public SwField
@@ -193,14 +193,14 @@ class SwAuthorField : public SwField
public:
SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFormat = 0);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const 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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
class SwFileNameFieldType : public SwFieldType
@@ -210,7 +210,7 @@ public:
SwFileNameFieldType(SwDoc*);
OUString Expand(sal_uLong) const;
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SW_DLLPUBLIC SwFileNameField : public SwField
@@ -220,14 +220,14 @@ class SW_DLLPUBLIC SwFileNameField : public SwField
public:
SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFormat = 0);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const 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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
class SwTemplNameFieldType : public SwFieldType
@@ -237,7 +237,7 @@ public:
SwTemplNameFieldType(SwDoc*);
OUString Expand(sal_uLong) const;
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SW_DLLPUBLIC SwTemplNameField : public SwField
@@ -245,10 +245,10 @@ class SW_DLLPUBLIC SwTemplNameField : public SwField
public:
SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFormat = 0);
- 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;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Document statistics
@@ -260,7 +260,7 @@ class SwDocStatFieldType : public SwFieldType
public:
SwDocStatFieldType(SwDoc*);
OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const;
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
inline void SetNumFormat( sal_Int16 eFormat ) { nNumberingType = eFormat; }
};
@@ -275,13 +275,13 @@ public:
void ChangeExpansion( const SwFrm* pFrm );
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
- 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;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nSub) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
class SwHiddenTextFieldType : public SwFieldType
@@ -290,7 +290,7 @@ class SwHiddenTextFieldType : public SwFieldType
public:
SwHiddenTextFieldType(bool bSetHidden = true);
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
void SetHiddenFlag( bool bSetHidden = true );
inline bool GetHiddenFlag() const { return bHidden; }
@@ -309,8 +309,8 @@ class SwHiddenTextField : public SwField
bool bIsHidden : 1; ///< Is it not visible?
bool bValid : 1; ///< Is DB-field evaluated?
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwHiddenTextField( SwHiddenTextFieldType*,
@@ -326,7 +326,7 @@ public:
const OUString& rFalse,
sal_uInt16 nSubType = TYP_HIDDENTXTFLD);
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
void Evaluate(SwDoc*);
@@ -335,17 +335,17 @@ public:
static OUString GetDBName(const OUString& rName, SwDoc *pDoc);
/// Condition
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
- virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual void SetPar1(const OUString& rStr) override;
+ virtual OUString GetPar1() const override;
/// True/False - String
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
- virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) override;
+ virtual OUString GetPar2() const override;
- virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const 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;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Field that expands to an empty line (without height).
@@ -354,7 +354,7 @@ class SwHiddenParaFieldType : public SwFieldType
public:
SwHiddenParaFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SwHiddenParaField : public SwField
@@ -365,17 +365,17 @@ public:
/// Direct input, delete old value.
SwHiddenParaField(SwHiddenParaFieldType*, const OUString& rCond);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
void SetHidden(bool bHidden) { bIsHidden = bHidden; }
bool IsHidden() const { return bIsHidden; }
/// Query, set condition.
- 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;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
class SwMacroFieldType : public SwFieldType
@@ -385,7 +385,7 @@ class SwMacroFieldType : public SwFieldType
public:
SwMacroFieldType(SwDoc*);
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SW_DLLPUBLIC SwMacroField : public SwField
@@ -394,8 +394,8 @@ class SW_DLLPUBLIC SwMacroField : public SwField
OUString aText;
bool bIsScriptURL;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
/// Direct input, delete old value.
@@ -407,17 +407,17 @@ public:
OUString GetMacroName() const;
SvxMacro GetSvxMacro() const;
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
/// Library and FileName
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
/// Macrotext
- 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;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
static void CreateMacroString( OUString& rMacro,
const OUString& rMacroName,
@@ -433,7 +433,7 @@ private:
public:
SwPostItFieldType(SwDoc* pDoc);
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
SwDoc* GetDoc() const
{
@@ -460,20 +460,20 @@ public:
const DateTime& rDate);
virtual ~SwPostItField();
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
inline const DateTime GetDateTime() const { return aDateTime; }
inline const Date GetDate() const { return aDateTime.GetDate(); }
inline const tools::Time GetTime() const { return aDateTime.GetTime(); }
/// Author
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
/// Text
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
const OUString& GetText() const { return sText; }
const OUString& GetInitials() const { return sInitials;}
void SetName(const OUString& rStr);
@@ -484,9 +484,9 @@ public:
sal_Int32 GetNumberOfParagraphs() 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;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
+ virtual OUString GetDescription() const override;
};
class SwDocInfoFieldType : public SwValueFieldType
@@ -495,7 +495,7 @@ public:
SwDocInfoFieldType(SwDoc* pDc);
OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, sal_uInt16 nLang, const OUString& rName) const;
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SW_DLLPUBLIC SwDocInfoField : public SwValueField
@@ -504,22 +504,22 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField
OUString aContent;
OUString aName;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFormat=0);
SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat=0);
- 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;
+ virtual void SetSubType(sal_uInt16) override;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetLanguage(sal_uInt16 nLng) override;
+ virtual OUString GetFieldName() const 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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Extended User settings.
@@ -529,7 +529,7 @@ public:
SwExtUserFieldType();
static OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat);
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SwExtUserField : public SwField
@@ -540,16 +540,16 @@ class SwExtUserField : public SwField
public:
SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFormat=0);
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
- virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
- virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nSub) override;
inline void SetExpansion(const OUString& rStr) { aContent = rStr; }
- 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Relative page numbers - field.
@@ -558,11 +558,11 @@ class SwRefPageSetFieldType : public SwFieldType
public:
SwRefPageSetFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
protected:
/// Overlay, because there is nothing to update!
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override;
};
// Relative page numbering.
@@ -575,18 +575,18 @@ public:
SwRefPageSetField( SwRefPageSetFieldType*, short nOff = 0,
bool bOn = true );
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Relative page numbers - query field.
@@ -598,10 +598,10 @@ class SwRefPageGetFieldType : public SwFieldType
void UpdateField( SwTextField* pTextField, _SetGetExpFields& rSetList );
protected:
/// overwritten to update all RefPageGet fields
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override;
public:
SwRefPageGetFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
bool MakeSetList( _SetGetExpFields& rTmpLst );
SwDoc* GetDoc() const { return pDoc; }
};
@@ -613,14 +613,14 @@ class SwRefPageGetField : public SwField
public:
SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFormat );
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
void SetText( const OUString& rText ) { sText = rText; }
void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField );
- 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Field to jump to and edit.
@@ -631,7 +631,7 @@ class SwJumpEditFieldType : public SwFieldType
public:
SwJumpEditFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
SwCharFormat* GetCharFormat();
};
@@ -643,21 +643,21 @@ public:
SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
const OUString& sText, const OUString& sHelp );
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
/// Placeholder-Text
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
/// Hint-Text
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
SwCharFormat* GetCharFormat() const
{ return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFormat(); }
- 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
class SwScriptFieldType : public SwFieldType
@@ -666,7 +666,7 @@ class SwScriptFieldType : public SwFieldType
public:
SwScriptFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SwScriptField : public SwField
@@ -681,22 +681,22 @@ public:
SwScriptField( SwScriptFieldType*, const OUString& rType,
const OUString& rCode, bool bURL=false );
- virtual OUString GetDescription() const SAL_OVERRIDE;
+ virtual OUString GetDescription() const override;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
/// Type
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
/// Text
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
bool IsCodeURL() const { return bCodeURL; }
void SetCodeURL( bool bURL ) { bCodeURL = bURL; }
- 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Combined Character Fieldtype
@@ -705,7 +705,7 @@ class SwCombinedCharFieldType : public SwFieldType
public:
SwCombinedCharFieldType();
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
// ScriptField
@@ -718,15 +718,15 @@ class SW_DLLPUBLIC SwCombinedCharField : public SwField
public:
SwCombinedCharField( SwCombinedCharFieldType*, const OUString& rChars );
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
/// Characters
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) 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;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
#endif // INCLUDED_SW_INC_DOCUFLD_HXX
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index e04b06329783..2c53228a6ce3 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -37,20 +37,20 @@ public:
explicit SwDPage(SwDrawModel& rNewModel, bool bMasterPage=false);
virtual ~SwDPage();
- virtual SwDPage* Clone() const SAL_OVERRIDE;
- virtual SwDPage* Clone(SdrModel* pNewModel) const SAL_OVERRIDE;
+ virtual SwDPage* Clone() const override;
+ virtual SwDPage* Clone(SdrModel* pNewModel) const override;
// #i3694#
// This GetOffset() method is not needed anymore, it even leads to errors.
// virtual Point GetOffset() const;
- virtual SdrObject* ReplaceObject( SdrObject* pNewObj, size_t nObjNum ) SAL_OVERRIDE;
+ virtual SdrObject* ReplaceObject( SdrObject* pNewObj, size_t nObjNum ) override;
virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV,
- const Rectangle *pRect) const SAL_OVERRIDE;
+ const Rectangle *pRect) const override;
bool RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override;
protected:
void lateInit(const SwDPage& rPage, SwDrawModel* pNewModel = 0);
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index 386eb81499f1..5b36a54864c2 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -38,14 +38,14 @@ public:
/// Put needed items for XPropertyList entries from the DrawModel.
void PutAreaListItems(SfxItemSet& rSet) const;
- virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE;
+ virtual SdrPage* AllocPage(bool bMasterPage) override;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::embed::XStorage> GetDocumentStorage() const SAL_OVERRIDE;
+ ::com::sun::star::embed::XStorage> GetDocumentStorage() const override;
protected:
/// override of <SdrModel::createUnoModel()> is needed to provide corresponding uno model.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override;
};
#endif
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8010898fef90..140f044c941a 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -577,7 +577,7 @@ public:
void EndAllAction();
/// To enable set up of StartActions and EndActions.
- virtual void CalcLayout() SAL_OVERRIDE;
+ virtual void CalcLayout() override;
/// Determine form of content. Return Type at CurCrsr->SPoint.
sal_uInt16 GetCntType() const;
@@ -586,7 +586,7 @@ public:
bool HasOtherCnt() const;
/// Apply ViewOptions with Start-/EndAction.
- virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE;
+ virtual void ApplyViewOptions( const SwViewOption &rOpt ) 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 4aef0156d792..b643db82b46f 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 SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const 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 ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
};
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
@@ -90,15 +90,15 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
bool bLateInitialization; // #i82544#
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwGetExpField( SwGetExpFieldType*, const OUString& rFormel,
sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFormat = 0);
- virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
- virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
+ virtual void SetValue( const double& rVal ) override;
+ virtual void SetLanguage(sal_uInt16 nLng) 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 SwTextField& );
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
/// Change formula.
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
- 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;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nType) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
static sal_Int32 GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint = 0);
// #i82544#
@@ -155,13 +155,13 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
bool bDeleted;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
SwSetExpFieldType( SwDoc* pDoc, const OUString& rName,
sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR );
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
- virtual OUString GetName() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
+ virtual OUString GetName() const override;
inline void SetType(sal_uInt16 nTyp);
inline sal_uInt16 GetType() const;
@@ -191,8 +191,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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp )
@@ -216,8 +216,8 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
sal_uInt16 nSubType;
SwFormatField * mpFormatField; /// pool item to which the SwSetExpField belongs
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFormat = 0);
@@ -225,7 +225,7 @@ public:
void SetFormatField(SwFormatField & rFormatField);
SwFormatField* GetFormatField() { return mpFormatField;}
- virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
+ virtual void SetValue( const double& rVal ) override;
inline OUString GetExpStr() const;
@@ -237,10 +237,10 @@ public:
inline void SetInputFlag(bool bInp);
inline bool GetInputFlag() const;
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
- virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
- virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nType) override;
inline bool IsSequenceField() const;
@@ -249,13 +249,13 @@ public:
inline sal_uInt16 GetSeqNumber() const { return nSeqNo; }
/// Query name only.
- virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
/// Query formula.
- 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;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
inline OUString SwSetExpField::GetExpStr() const
@@ -285,7 +285,7 @@ class SwInputFieldType : public SwFieldType
public:
SwInputFieldType( SwDoc* pDoc );
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
SwDoc* GetDoc() const { return pDoc; }
};
@@ -301,8 +301,8 @@ class SW_DLLPUBLIC SwInputField : public SwField
SwFormatField* mpFormatField; // attribute to which the <SwInputField> belongs to
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
// Accessing Input Field's content
const OUString& getContent() const { return aContent;}
@@ -330,15 +330,15 @@ public:
bool isFormField() const;
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
/// Content
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
/// aPromptText
- virtual OUString GetPar2() const SAL_OVERRIDE;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
OUString GetHelp() const;
void SetHelp(const OUString & rStr);
@@ -346,10 +346,10 @@ public:
OUString GetToolTip() const;
void SetToolTip(const OUString & rStr);
- 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;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nSub) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
// Sorted list of input fields and DropDown fields
@@ -382,7 +382,7 @@ class SwTableFieldType : public SwValueFieldType
{
public:
SwTableFieldType(SwDoc* pDocPtr);
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
};
class SwTableField : public SwValueField, public SwTableFormula
@@ -390,11 +390,11 @@ class SwTableField : public SwValueField, public SwTableFormula
OUString sExpand;
sal_uInt16 nSubType;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
/// Search TextNode containing the field.
- virtual const SwNode* GetNodeOfFormula() const SAL_OVERRIDE;
+ virtual const SwNode* GetNodeOfFormula() const override;
OUString GetCommand();
@@ -402,22 +402,22 @@ public:
SwTableField( SwTableFieldType*, const OUString& rFormel,
sal_uInt16 nSubType = 0, sal_uLong nFormat = 0);
- virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
- virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
- virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
+ virtual void SetValue( const double& rVal ) override;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nType) override;
OUString GetExpStr() const { return sExpand; }
void ChgExpStr(const OUString& rStr) { sExpand = rStr; }
void CalcField( SwTableCalcPara& rCalcPara );
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
/// The formula.
- 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;
+ virtual OUString GetPar2() const override;
+ virtual void SetPar2(const OUString& rStr) override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
#endif // INCLUDED_SW_INC_EXPFLD_HXX
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index b8f9931c5fb9..c4385177158e 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -42,7 +42,7 @@ public:
/// @@@ public copy ctor, but no copy assignment?
SwFormatCharFormat( const SwFormatCharFormat& rAttr );
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
private:
/// @@@ public copy ctor, but no copy assignment?
@@ -52,18 +52,18 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const 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 ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
void SetCharFormat( SwFormat* pFormat ) { pFormat->Add(this); }
SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); }
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index cb6d9f477d8e..fd8a78bd697c 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -355,7 +355,7 @@ public:
void SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr, int nOffset = 1 );
/// Show current selection (frame / draw object as required).
- virtual void MakeSelVisible() SAL_OVERRIDE;
+ virtual void MakeSelVisible() override;
/** @return FrameFormat of object that may be under Point.
Object does not become selected! */
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index 11856738d459..ba4f1cbc822c 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -42,24 +42,24 @@ public:
explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context);
// ::com::sun::star::lang::XServiceInfo:
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) 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;
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override;
// ::com::sun::star::util::XJobManager:
- virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception) override;
// ::com::sun::star::frame::XTerminateListener2
- virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// ::com::sun::star::frame::XTerminateListener (inherited via com::sun::star::frame::XTerminateListener2)
- virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener)
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
private:
FinalThreadManager(FinalThreadManager &) = delete;
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index ea30632226ad..d18dded7f501 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -409,8 +409,8 @@ protected:
public:
virtual ~SwValueField();
- virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE;
- virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
+ virtual SwFieldType* ChgTyp( SwFieldType* ) override;
+ virtual void SetLanguage(sal_uInt16 nLng) override;
inline SwDoc* GetDoc() const { return static_cast<const SwValueFieldType*>(GetTyp())->GetDoc(); }
@@ -433,7 +433,7 @@ protected:
SwFormulaField( const SwFormulaField& rField );
public:
- virtual OUString GetFormula() const SAL_OVERRIDE;
+ virtual OUString GetFormula() const override;
void SetFormula(const OUString& rStr);
void SetExpandedFormula(const OUString& rStr);
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index f99eb558d7ab..d39c7f257ac2 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 SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const 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 SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
public:
SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD,
sal_uLong nFormat = 0, sal_uInt16 nLng = 0);
- virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
- virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType(sal_uInt16 nSub) override;
- virtual double GetValue() const SAL_OVERRIDE;
+ virtual double GetValue() const override;
- virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
- virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual void SetPar2(const OUString& rStr) override;
+ virtual OUString GetPar2() const override;
inline 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 SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) override;
};
#endif // INCLUDED_SW_INC_FLDDAT_HXX
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 4992d1e639e0..6507aab94273 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 SAL_OVERRIDE;
+ virtual SwFieldType * Copy () const override;
};
/**
@@ -90,14 +90,14 @@ class SW_DLLPUBLIC SwDropDownField : public SwField
@return the expanded value of the field
*/
- virtual OUString Expand() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
/**
Creates a copy of this field.
@return the copy of this field
*/
- virtual SwField * Copy() const SAL_OVERRIDE;
+ virtual SwField * Copy() const override;
public:
/**
@@ -126,14 +126,14 @@ public:
@return the selected value
*/
- virtual OUString GetPar1() const SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
/**
Returns the name of the field.
@return the name of the field
*/
- virtual OUString GetPar2() const SAL_OVERRIDE;
+ virtual OUString GetPar2() const 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) SAL_OVERRIDE;
+ virtual void SetPar1(const OUString & rStr) override;
/**
Sets the name of the field.
@param rStr the new name of the field
*/
- virtual void SetPar2(const OUString & rStr) SAL_OVERRIDE;
+ virtual void SetPar2(const OUString & rStr) 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 SAL_OVERRIDE;
+ virtual bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const 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) SAL_OVERRIDE;
+ virtual bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) override;
};
#endif
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 1dc702ba6bb9..4d4926eaa60d 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -51,16 +51,16 @@ public:
SwFormatAnchor &operator=( const SwFormatAnchor& );
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const 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 ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
RndStdIds GetAnchorId() const { return nAnchorId; }
sal_uInt16 GetPageNum() const { return nPageNum; }
@@ -72,7 +72,7 @@ public:
void SetPageNum( sal_uInt16 nNew ) { nPageNum = nNew; }
void SetAnchor( const SwPosition *pPos );
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatAnchor &SwAttrSet::GetAnchor(bool bInP) const
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 00b64d83db89..a5a9aa301e93 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -43,21 +43,21 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const 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 ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
#endif
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index cd4a34ab2768..f7ac3d18d561 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -32,8 +32,8 @@ public:
: SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {}
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 0213c20c3709..f62148ddf9e1 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -101,16 +101,16 @@ public:
SwFormatCol& operator=( const SwFormatCol& );
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const 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 ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
const SwColumns &GetColumns() const { return m_aColumns; }
SwColumns &GetColumns() { return m_aColumns; }
@@ -162,7 +162,7 @@ public:
that corresponds to what constitutes the column for the user. */
sal_uInt16 CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatCol &SwAttrSet::GetCol(bool bInP) const
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index ce848e2ae4b9..535a6e89e385 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -40,15 +40,15 @@ public:
inline SwFormatChain &operator=( const SwFormatChain& );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); }
SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); }
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 31406601b350..d170da60c970 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -39,13 +39,13 @@ public:
virtual ~SwFormatContent();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
const SwNodeIndex *GetContentIdx() const { return pStartNode; }
void SetNewContentIdx( const SwNodeIndex *pIdx );
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatContent &SwAttrSet::GetContent(bool bInP) const
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 788b2d678196..7315e51720ab 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -87,7 +87,7 @@ protected:
}
/// To get UL- / LR- / FontHeight-changes.
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
public:
@@ -119,12 +119,12 @@ public:
/** Override to recognize changes on the <SwNumRuleItem> and register/unregister
the paragragh style at the corresponding <SwNumRule> instance. */
- virtual bool SetFormatAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
- virtual bool SetFormatAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
+ virtual bool SetFormatAttr( const SfxPoolItem& rAttr ) override;
+ virtual bool SetFormatAttr( const SfxItemSet& rSet ) override;
+ virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) override;
/// Override <ResetAllFormatAttr()> to stay assigned to list level of outline style.
- virtual sal_uInt16 ResetAllFormatAttr() SAL_OVERRIDE;
+ virtual sal_uInt16 ResetAllFormatAttr() override;
inline bool StayAssignedToListLevelOfOutlineStyle() const
{
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index 6d2625579bd5..8070ddf1f54b 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -33,13 +33,13 @@ public:
bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {}
/// "pure virtual methos" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 72a61013e44b..7b678c0d47ea 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -39,8 +39,8 @@ class SwFormatFlyCnt : public SfxPoolItem
public:
SwFormatFlyCnt( SwFrameFormat *pFrameFormat );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
inline SwFrameFormat *GetFrameFormat() const { return pFormat; }
/// 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 4934f479fa59..6babe6652cfe 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -54,8 +54,8 @@ class SW_DLLPUBLIC SwFormatField
SwFormatField& operator=(const SwFormatField& rField) = delete;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
- virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
+ virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) override;
public:
TYPEINFO_OVERRIDE();
@@ -69,10 +69,10 @@ public:
virtual ~SwFormatField();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
- virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
void InvalidateField();
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 431eb4d3fddd..0ce283f38984 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -35,14 +35,14 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 259a5dc7c9da..2389f6566275 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -40,8 +40,8 @@ public:
inline SwFormatFillOrder &operator=( const SwFormatFillOrder &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
- virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual sal_uInt16 GetValueCount() const override;
SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); }
};
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 40cc4dd01f4b..2a9516be2925 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -65,15 +65,15 @@ public:
SwFormatFrmSize& operator=( const SwFormatFrmSize& rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
SwFrmSize GetHeightSizeType() const { return m_eFrmHeightType; }
void SetHeightSizeType( SwFrmSize eSize ) { m_eFrmHeightType = eSize; }
@@ -101,7 +101,7 @@ public:
void SetWidthPercent ( sal_uInt8 n ) { m_nWidthPercent = n; }
void SetWidthPercentRelation ( sal_Int16 n ) { m_eWidthPercentRelation = n; }
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 04eb026f5617..a7025d32747d 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -55,12 +55,12 @@ public:
virtual ~SwFormatFootnote();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
// SwClient
virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
- SAL_OVERRIDE;
+ override;
void InvalidateFootnote();
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index f8bc16050776..493e85a57cb4 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -52,18 +52,18 @@ protected:
{}
public:
- virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
+ virtual sal_uInt16 GetValueCount() const override;
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const 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 ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
@@ -91,7 +91,7 @@ public:
: SwFormatFootnoteEndAtTextEnd( RES_FTN_AT_TXTEND, ePos )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
};
class SW_DLLPUBLIC SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd
@@ -103,7 +103,7 @@ public:
SetNumType( SVX_NUM_ROMAN_LOWER );
}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
};
inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 0aca211e3890..7434c1acb301 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 SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
@@ -77,13 +77,13 @@ public:
TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 5703c95e03b5..293dfeaee675 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 SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) override;
const SwTextINetFormat* GetTextINetFormat() const
{
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 090565a60a84..1364906135f5 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 SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
sal_uLong GetStartValue() const { return nStartValue; }
bool IsCount() const { return bCountLines; }
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index d08dd84fe6d0..84dac2749389 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -32,12 +32,12 @@ public:
SwFormatLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 1ce349367e5c..472460013f9d 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -109,8 +109,8 @@ public:
virtual ~SwFormatMeta();
/// SfxPoolItem
- virtual bool operator==( const SfxPoolItem & ) const SAL_OVERRIDE;
- virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem & ) const override;
+ virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const override;
/// notify clients registered at m_pMeta that this meta is being (re-)moved
void NotifyChangeTextNode(SwTextNode *const pTextNode);
@@ -151,19 +151,19 @@ protected:
{ m_wXMeta = xMeta; }
/// SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
explicit Meta(SwFormatMeta * const i_pFormat = 0);
virtual ~Meta();
/// sfx2::Metadatable
- 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 ::sfx2::IXmlIdRegistry& GetRegistry() override;
+ virtual bool IsInClipboard() const override;
+ virtual bool IsInUndo() const override;
+ virtual bool IsInContent() const override;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE;
+ ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override;
};
class MetaField
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 88b6d580bca8..714938e9fbc7 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -42,18 +42,18 @@ public:
inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
- SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
+ SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const override;
+ SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const override;
sal_Int16 GetVertOrient() const { return m_eOrient; }
sal_Int16 GetRelationOrient() const { return m_eRelation; }
@@ -63,7 +63,7 @@ public:
SwTwips GetPos() const { return m_nYPos; }
void SetPos( SwTwips nNew ) { m_nYPos = nNew; }
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem
@@ -79,15 +79,15 @@ public:
inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
sal_Int16 GetHoriOrient() const { return m_eOrient; }
sal_Int16 GetRelationOrient() const { return m_eRelation; }
@@ -100,7 +100,7 @@ public:
bool IsPosToggle() const { return m_bPosToggle; }
void SetPosToggle( bool bNew ) { m_bPosToggle = bNew; }
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy )
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index a42ce1bb6069..826129d7ce71 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -43,8 +43,8 @@ class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient
SwModify* pDefinedIn; /**< Points to the object in which the
attribute was set (ContentNode/Format). */
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
- virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) override;
public:
SwFormatPageDesc( const SwPageDesc *pDesc = 0 );
@@ -55,15 +55,15 @@ public:
TYPEINFO_OVERRIDE();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
SwPageDesc *GetPageDesc() { return static_cast<SwPageDesc*>(GetRegisteredIn()); }
const SwPageDesc *GetPageDesc() const { return static_cast<const SwPageDesc*>(GetRegisteredIn()); }
@@ -76,7 +76,7 @@ public:
void ChgDefinedIn( const SwModify* pNew ) { pDefinedIn = const_cast<SwModify*>(pNew); }
void RegisterToPageDesc( SwPageDesc& );
bool KnowsPageDesc() const;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index e9907b425841..6f6521926c24 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -51,12 +51,12 @@ public:
virtual ~SwFormatRefMark( );
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
// SwClient
virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
- SAL_OVERRIDE;
+ override;
void InvalidateRefMark();
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index dd2dceebecd8..5238a5f047c4 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -32,12 +32,12 @@ public:
SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index b4dcad384a80..78824083469c 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -42,19 +42,19 @@ public:
SwFormatRuby& operator=( const SwFormatRuby& rAttr );
// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) override;
const SwTextRuby* GetTextRuby() const { return pTextAttr; }
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 837af21aef49..b92959535857 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -39,16 +39,16 @@ public:
inline SwFormatSurround &operator=( const SwFormatSurround &rCpy );
// "Pure virtual Methods" of SfxPoolItem.
- 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 bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
+ virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
SwSurround GetSurround()const { return SwSurround( GetValue() ); }
bool IsAnchorOnly() const { return bAnchorOnly; }
@@ -59,7 +59,7 @@ public:
void SetContour( bool bNew ) { bContour = bNew; }
void SetOutside( bool bNew ) { bOutside = bNew; }
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline SwFormatSurround &SwFormatSurround::operator=( const SwFormatSurround &rCpy )
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 561a047ba1d2..ec28de2248d2 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -49,15 +49,15 @@ public:
virtual ~SwFormatURL();
/// "Pure virtual methods" of SfxPoolItem.
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) 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 d83ecbb76db8..e5ff4c0ba3c0 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -44,11 +44,11 @@ public:
const SwFormatWrapInfluenceOnObjPos& _rSource );
/// pure virtual methods of class <SfxPoolItem>
- virtual bool operator==( const SfxPoolItem& _rAttr ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& _rAttr ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const 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 ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
/// direct accessors to data
void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition );
@@ -57,7 +57,7 @@ public:
sal_Int16 GetWrapInfluenceOnObjPos(
const bool _bIterativeAsOnceConcurrent = false ) const;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
inline const SwFormatWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 25bc4127384d..db1233119b61 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -67,7 +67,7 @@ protected:
SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges,
SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
SwFormat( const SwFormat& rFormat );
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
@@ -79,7 +79,7 @@ public:
sal_uInt16 Which() const { return m_nWhichId; }
/// Query format information.
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
/// Copy attributes even among documents.
void CopyAttrs( const SwFormat&, bool bReplace=true );
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 88e0c3747ec1..edbfc8177297 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -63,7 +63,7 @@ protected:
sal_uInt16 nFormatWhich = RES_FRMFMT,
const sal_uInt16* pWhichRange = 0);
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
@@ -138,8 +138,8 @@ public:
void RegisterToFormat( SwFormat& rFormat );
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
- virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
- virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
+ virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
+ virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
@@ -176,7 +176,7 @@ public:
virtual ~SwFlyFrameFormat();
/// Creates the views.
- virtual void MakeFrms() SAL_OVERRIDE;
+ virtual void MakeFrms() override;
SwFlyFrm* GetFrm( const Point* pDocPos = 0,
const bool bCalcFrm = false ) const;
@@ -184,9 +184,9 @@ public:
SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0,
const bool bCalcFrm = false ) const;
- virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE;
+ virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) override;
- virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
OUString GetObjTitle() const;
void SetObjTitle( const OUString& rTitle, bool bBroadcast = false );
@@ -204,7 +204,7 @@ public:
@return true, if background color is transparent, but not "no fill"
or a existing background graphic is transparent.
*/
- virtual bool IsBackgroundTransparent() const SAL_OVERRIDE;
+ virtual bool IsBackgroundTransparent() const override;
/** SwFlyFrameFormat::IsBackgroundBrushInherited
@@ -273,24 +273,24 @@ public:
/** DrawObjects are removed from the arrays at the layout.
The DrawObjects are marked as deleted. */
- virtual void DelFrms() SAL_OVERRIDE;
+ virtual void DelFrms() override;
/** Register DrawObjects in the arrays at layout.
Reset delete marks. */
- virtual void MakeFrms() SAL_OVERRIDE;
+ virtual void MakeFrms() override;
- virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE;
+ virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) override;
- virtual SwFrameFormat::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
- virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
+ virtual SwFrameFormat::tLayoutDir GetLayoutDir() const override;
+ virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) override;
- virtual sal_Int16 GetPositionLayoutDir() const SAL_OVERRIDE;
- virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) SAL_OVERRIDE;
+ virtual sal_Int16 GetPositionLayoutDir() const override;
+ virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) override;
inline bool IsPosAttrSet() const { return mbPosAttrSet; }
inline void PosAttrSet() { mbPosAttrSet = true; }
- virtual OUString GetDescription() const SAL_OVERRIDE;
+ virtual OUString GetDescription() const override;
DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrameFormat);
};
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index adc84bbeffab..ae6820ae6c79 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
OUString sSuffix;
protected:
bool m_bEndNote;
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
SvxNumberType aFormat;
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index 256c9a3b455b..09f933afd0c5 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -37,7 +37,7 @@ public:
OUString * pLongUserName,
OUString * pUserName,
sal_Int32 nFileFormat,
- bool bTemplate = false ) const SAL_OVERRIDE;
+ bool bTemplate = false ) const override;
};
#endif
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 27f5803052c4..bd3cdc06dbea 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -52,21 +52,21 @@ public:
{}
// pure virtual methods of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetValueCount() const override;
+ virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) override;
inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
{
@@ -88,7 +88,7 @@ public:
sal_Int32 nTop, sal_Int32 nBottom );
// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
};
class SwRotationGrf : public SfxUInt16Item
@@ -103,17 +103,17 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) override;
const Size& GetUnrotatedSize() const { return aUnrotatedSize; }
};
@@ -126,12 +126,12 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
class SW_DLLPUBLIC SwContrastGrf : public SfxInt16Item
@@ -142,12 +142,12 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
class SwChannelGrf : public SfxInt16Item
@@ -163,7 +163,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
class SwChannelRGrf : public SwChannelGrf
@@ -172,7 +172,7 @@ public:
SwChannelRGrf( sal_Int16 nVal = 0 )
: SwChannelGrf( nVal, RES_GRFATR_CHANNELR )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
};
class SwChannelGGrf : public SwChannelGrf
{
@@ -180,7 +180,7 @@ public:
SwChannelGGrf( sal_Int16 nVal = 0 )
: SwChannelGrf( nVal, RES_GRFATR_CHANNELG )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
};
class SwChannelBGrf : public SwChannelGrf
{
@@ -188,7 +188,7 @@ public:
SwChannelBGrf( sal_Int16 nVal = 0 )
: SwChannelGrf( nVal, RES_GRFATR_CHANNELB )
{}
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
};
class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem
@@ -210,18 +210,18 @@ public:
}
// pure virtual methods from SfxEnumItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) override;
const double& GetValue() const { return nValue; }
void SetValue( const double& rVal ) { nValue = rVal; }
@@ -235,12 +235,12 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
class SwTransparencyGrf : public SfxByteItem
@@ -251,16 +251,16 @@ public:
{}
// pure virtual methods from SfxInt16Item
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) override;
};
class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem
@@ -271,20 +271,20 @@ public:
{}
// pure virtual methods of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
+ virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) override;
};
// Implementation of graphics attributes methods of SwAttr
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index f648b84083b9..1a3b407cc068 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -32,12 +32,12 @@ public:
bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {}
// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 61c8c437558f..6da69ddec718 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -75,18 +75,18 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
protected:
virtual void GetNextPortion( OUString& rNextPortion,
LanguageType& rLangOfPortion,
- bool bAllowImplicitChangesForNotConvertibleText ) SAL_OVERRIDE;
+ bool bAllowImplicitChangesForNotConvertibleText ) override;
virtual void HandleNewUnit( const sal_Int32 nUnitStart,
- const sal_Int32 nUnitEnd ) SAL_OVERRIDE;
+ const sal_Int32 nUnitEnd ) 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 ) SAL_OVERRIDE;
+ LanguageType *pNewUnitLanguage ) override;
- virtual bool HasRubySupport() const SAL_OVERRIDE;
+ virtual bool HasRubySupport() const override;
public:
SwHHCWrapper(
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 5920b042f270..c48705ae7c5d 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -42,8 +42,8 @@ public:
SwMsgPoolItem( sal_uInt16 nWhich );
// "Overhead" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
};
// SwPtrMsgPoolItem (old SwObjectDying!)
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index bbd7a5a8b001..68c5626caead 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient /**< purpose of derivation
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* ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
public:
SwLineNumberInfo();
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 279423870900..46771c355bd9 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -77,13 +77,13 @@ class SwRevisionConfig : public utl::ConfigItem
static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwRevisionConfig();
virtual ~SwRevisionConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -101,13 +101,13 @@ class SwCompareConfig : public utl::ConfigItem
static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwCompareConfig();
virtual ~SwCompareConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) SAL_OVERRIDE { };
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) override { };
void Load();
void SetModified() {ConfigItem::SetModified(); }
};
@@ -129,13 +129,13 @@ class SwInsertConfig : public utl::ConfigItem
const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwInsertConfig(bool bWeb);
virtual ~SwInsertConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -156,13 +156,13 @@ class SwTableConfig : public utl::ConfigItem
static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwTableConfig(bool bWeb);
virtual ~SwTableConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -186,13 +186,13 @@ class SwMiscConfig : public utl::ConfigItem
static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwMiscConfig();
virtual ~SwMiscConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index bef476592e34..7de4410e39b7 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -121,7 +121,7 @@ public:
const Graphic& GetGrf(bool bWait = false) const;
const GraphicObject& GetGrfObj(bool bWait = false) const;
const GraphicObject* GetReplacementGrfObj() const;
- virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
+ virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
/// isolated only way to set GraphicObject to allow more actions when doing so
void SetGraphic(const Graphic& rGraphic, const OUString& rLink);
@@ -130,7 +130,7 @@ public:
void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); }
void StopGraphicAnimation(OutputDevice* pOut = NULL, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); }
- virtual Size GetTwipSize() const SAL_OVERRIDE;
+ virtual Size GetTwipSize() const override;
void SetTwipSize( const Size& rSz );
bool IsTransparent() const;
@@ -153,7 +153,7 @@ public:
void SetScaleImageMap( bool b ) { bScaleImageMap = b; }
/// in ndcopy.cxx
- virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const override;
/** Re-read in case graphic was not OK. The current one
gets replaced by the new one. */
@@ -174,8 +174,8 @@ public:
bool IsSelected() const;
/// Communicate to graphic that node is in Undo-range.
- virtual bool SavePersistentData() SAL_OVERRIDE;
- virtual bool RestorePersistentData() SAL_OVERRIDE;
+ virtual bool SavePersistentData() override;
+ virtual bool RestorePersistentData() override;
/// Query link-data.
bool IsGrfLink() const { return refLink.Is(); }
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 02a3adb2fd2f..caa537b1e5bd 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
// Creates for all derivations an AttrSet with ranges for frame- and
// graphics-attributes (only called by SwContentNode).
- virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
+ virtual void NewAttrSet( SwAttrPool& ) override;
SwNoTextNode( const SwNoTextNode& ) = delete;
SwNoTextNode &operator=( const SwNoTextNode& ) = delete;
@@ -51,7 +51,7 @@ protected:
public:
virtual ~SwNoTextNode();
- virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+ virtual SwContentFrm *MakeFrm( SwFrm* ) override;
inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index ac3e1699f506..0d5451e24327 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -97,19 +97,19 @@ public:
SwOLEObj& GetOLEObj() { return aOLEObj; }
virtual ~SwOLENode();
- virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
+ virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
/// Is in ndcopy.cxx.
- virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const override;
- virtual Size GetTwipSize() const SAL_OVERRIDE;
+ virtual Size GetTwipSize() const override;
const Graphic* GetGraphic();
void GetNewReplacement();
- virtual bool SavePersistentData() SAL_OVERRIDE;
- virtual bool RestorePersistentData() SAL_OVERRIDE;
+ virtual bool SavePersistentData() override;
+ virtual bool RestorePersistentData() override;
bool IsInGlobalDocSection() const;
bool IsOLEObjectDeleted() const;
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index ba56bb5d6359..b80ffc1c4556 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -136,7 +136,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
SAL_DLLPRIVATE void MoveTextAttr_To_AttrSet(); // Called by SplitNode.
/// Create the specific AttrSet.
- SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) override;
/// Optimization: Asking for information about hidden characters at SwScriptInfo
/// updates these flags.
@@ -210,8 +210,8 @@ public:
protected:
/// for hanging TextFormatCollections somewhere else (Outline-Numbering!)
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
- virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& ) override;
public:
using SwContentNode::GetAttr;
@@ -231,18 +231,18 @@ public:
virtual ~SwTextNode();
- virtual sal_Int32 Len() const SAL_OVERRIDE;
+ virtual sal_Int32 Len() const 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 bool SetAttr( const SfxPoolItem& ) SAL_OVERRIDE;
- virtual bool SetAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
- virtual bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) SAL_OVERRIDE;
- virtual sal_uInt16 ResetAllAttr() SAL_OVERRIDE;
+ virtual bool SetAttr( const SfxPoolItem& ) override;
+ virtual bool SetAttr( const SfxItemSet& rSet ) override;
+ virtual bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) override;
+ virtual bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) override;
+ virtual sal_uInt16 ResetAllAttr() override;
/// insert text content
/// @param rStr text to insert; in case it does not fit into the capacity
@@ -353,10 +353,10 @@ public:
const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets );
/// Virtual methods from ContentNode.
- virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
- virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
- virtual SwContentNode *JoinNext() SAL_OVERRIDE;
- virtual SwContentNode *JoinPrev() SAL_OVERRIDE;
+ virtual SwContentFrm *MakeFrm( SwFrm* ) override;
+ virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
+ virtual SwContentNode *JoinNext() override;
+ virtual SwContentNode *JoinPrev() override;
SwContentNode *AppendNode( const SwPosition & );
@@ -412,7 +412,7 @@ public:
bool Convert( SwConversionArgs & );
inline SwTextFormatColl *GetTextColl() const;
- virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) SAL_OVERRIDE;
+ virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) override;
void _ChgTextCollUpdateNum( const SwTextFormatColl* pOld,
const SwTextFormatColl* pNew );
@@ -673,7 +673,7 @@ public:
/// in ndcopy.cxx
bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
- virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const override;
/// Interactive hyphenation: we find TextFrm and call its CalcHyph.
bool Hyphenate( SwInterHyphInfo &rHyphInf );
@@ -745,7 +745,7 @@ public:
SwIndex const & rPos,
const sal_Int32 nChangeLen,
const bool bNegative = false,
- const bool bDelete = false ) SAL_OVERRIDE;
+ const bool bDelete = false ) override;
/// change text to Upper/Lower/Hiragana/Katagana/...
void TransliterateText( utl::TransliterationWrapper& rTrans,
@@ -789,16 +789,16 @@ public:
{ m_wXParagraph = xParagraph; }
/// sfx2::Metadatable
- 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 ::sfx2::IXmlIdRegistry& GetRegistry() override;
+ virtual bool IsInClipboard() const override;
+ virtual bool IsInUndo() const override;
+ virtual bool IsInContent() const override;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE;
+ ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override;
bool IsCollapse() const;
- virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
sal_uInt32 GetParRsid() const;
@@ -810,7 +810,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode)
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
- virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
+ virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
/// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index a892d7659866..e24ae4b2521e 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -321,7 +321,7 @@ public:
/// Call ChkCondcoll to all ContentNodes of section.
void CheckSectionCondColl() const;
- virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
private:
SwStartNode( const SwStartNode & rNode ) = delete;
@@ -376,7 +376,7 @@ protected:
SwAttrSet (handle): */
sal_uInt16 ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds );
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
TYPEINFO_OVERRIDE(); /// Already contained in base class Client.
@@ -432,7 +432,7 @@ public:
virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
/// Get information from Client.
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
/// SS for PoolItems: hard attributation.
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index ad2283d08aa6..8ad9031e2b61 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -58,7 +58,7 @@ class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient
using SvxNumberFormat::operator !=;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
SwNumFormat();
@@ -76,16 +76,16 @@ public:
void SetCharFormat( SwCharFormat* );
void SetCharFormatName(const OUString& rSet);
- virtual OUString GetCharFormatName() const SAL_OVERRIDE;
+ virtual OUString GetCharFormatName() const 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) SAL_OVERRIDE;
+ virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0) override;
- virtual void SetVertOrient(sal_Int16 eSet) SAL_OVERRIDE;
- virtual sal_Int16 GetVertOrient() const SAL_OVERRIDE;
+ virtual void SetVertOrient(sal_Int16 eSet) override;
+ virtual sal_Int16 GetVertOrient() const override;
const SwFormatVertOrient* GetGraphicOrientation() const;
bool IsEnumeration() const; // #i22362#
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 5bacf498cd10..074620c6a090 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -159,7 +159,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrameFormat*, SwDoc *pDc );
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) override;
public:
OUString GetName() const { return m_StyleName; }
@@ -233,7 +233,7 @@ public:
void SetPoolHlpFileId(sal_uInt8 const nId) { m_Master.SetPoolHlpFileId(nId); }
/// Query information from Client.
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
const SwFrameFormat* GetPageFormatOfNode( const SwNode& rNd,
bool bCheckForThisPgDc = true ) const;
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 67da97977320..b570e9cc7b7e 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -71,20 +71,20 @@ private:
SwFormatDrop & operator= (const SwFormatDrop &) = delete;
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
public:
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
inline sal_uInt8 GetLines() const { return nLines; }
inline sal_uInt8 &GetLines() { return nLines; }
@@ -102,7 +102,7 @@ public:
inline SwCharFormat *GetCharFormat() { return static_cast<SwCharFormat*>(GetRegisteredIn()); }
void SetCharFormat( SwCharFormat *pNew );
/// Get information from Client.
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
/// Get and set Modify pointer.
inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
@@ -121,12 +121,12 @@ public:
inline SwRegisterItem& operator=( const SwRegisterItem& rRegister );
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
inline SwRegisterItem::SwRegisterItem( const bool bRegister ) :
@@ -158,18 +158,18 @@ public:
{ SetValue( rCpy.GetValue() ); return *this; }
/// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
- 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;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
class SwParaConnectBorderItem : public SfxBoolItem
@@ -183,12 +183,12 @@ public:
inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect );
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
};
inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) :
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 47e8c3fb9721..dd3e4b45014b 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -136,13 +136,13 @@ public:
{
}
- virtual SwPosition GetAnchorPosition() const SAL_OVERRIDE;
- virtual bool UseElement() SAL_OVERRIDE;
- virtual const SwFormatField& GetFormatField() const SAL_OVERRIDE
+ virtual SwPosition GetAnchorPosition() const override;
+ virtual bool UseElement() override;
+ virtual const SwFormatField& GetFormatField() const override
{
return mrFormatField;
}
- virtual const SfxBroadcaster* GetBroadCaster() const SAL_OVERRIDE
+ virtual const SfxBroadcaster* GetBroadCaster() const override
{
return dynamic_cast<const SfxBroadcaster *> (&mrFormatField);
}
@@ -150,7 +150,7 @@ public:
SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr,
- SwPostItBits aBits ) SAL_OVERRIDE;
+ SwPostItBits aBits ) override;
private:
SwFormatField& mrFormatField;
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index c610a13ab7f9..1c99618ec190 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -29,14 +29,14 @@ private:
com::sun::star::uno::Sequence<OUString> GetPropertyNames();
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwPrintOptions(bool bWeb);
virtual ~SwPrintOptions();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
- virtual void doSetModified( ) SAL_OVERRIDE { bModified = true; SetModified();}
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void doSetModified( ) override { bModified = true; SetModified();}
SwPrintOptions& operator=(const SwPrintData& rData)
{
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 69a26db466b0..9aa157e0c93c 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -59,9 +59,9 @@ public:
SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId,
const SfxItemSet* pSet = 0 );
virtual ~SwRedlineExtraData_FormatColl();
- virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE;
- virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
- virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
+ virtual SwRedlineExtraData* CreateNew() const override;
+ virtual void Reject( SwPaM& rPam ) const override;
+ virtual bool operator == ( const SwRedlineExtraData& ) const 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 SAL_OVERRIDE;
- virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
- virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
+ virtual SwRedlineExtraData* CreateNew() const override;
+ virtual void Reject( SwPaM& rPam ) const override;
+ virtual bool operator == ( const SwRedlineExtraData& ) const 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 SAL_OVERRIDE;
- virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
- virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
+ virtual SwRedlineExtraData* CreateNew() const override;
+ virtual void Reject( SwPaM& rPam ) const override;
+ virtual bool operator == ( const SwRedlineExtraData& ) const override;
SfxItemSet* GetItemSet( ) const { return pSet; }
};
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index a6ececb2cd96..592fa846de34 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -65,10 +65,10 @@ class SwGetRefFieldType : public SwFieldType
SwDoc* pDoc;
protected:
/// Overlay in order to update all ref-fields.
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
public:
SwGetRefFieldType(SwDoc* pDoc );
- virtual SwFieldType* Copy() const SAL_OVERRIDE;
+ virtual SwFieldType* Copy() const override;
SwDoc* GetDoc() const { return pDoc; }
@@ -87,8 +87,8 @@ private:
sal_uInt16 nSubType;
sal_uInt16 nSeqNo;
- virtual OUString Expand() const SAL_OVERRIDE;
- virtual SwField* Copy() const SAL_OVERRIDE;
+ virtual OUString Expand() const override;
+ virtual SwField* Copy() const override;
// #i81002#
static OUString MakeRefNumStr( const SwTextNode& rTextNodeOfField,
@@ -101,7 +101,7 @@ public:
virtual ~SwGetRefField();
- virtual OUString GetFieldName() const SAL_OVERRIDE;
+ virtual OUString GetFieldName() const override;
OUString GetSetRefName() const { return sSetRefName; }
@@ -117,8 +117,8 @@ public:
void SetExpand( const OUString& rStr ) { sText = rStr; }
/// Get/set sub type.
- virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
- virtual void SetSubType( sal_uInt16 n ) SAL_OVERRIDE;
+ virtual sal_uInt16 GetSubType() const override;
+ virtual void SetSubType( sal_uInt16 n ) override;
// --> #i81002#
bool IsRefToHeadingCrossRefBookmark() const;
@@ -132,16 +132,16 @@ public:
void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; }
// Name of reference.
- virtual OUString GetPar1() const SAL_OVERRIDE;
- virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE;
+ virtual OUString GetPar1() const override;
+ virtual void SetPar1(const OUString& rStr) override;
- 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;
+ virtual OUString GetPar2() const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override;
void ConvertProgrammaticToUIName();
- virtual OUString GetDescription() const SAL_OVERRIDE;
+ virtual OUString GetDescription() const override;
};
#endif /// INCLUDED_SW_INC_REFFLD_HXX
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 1649ffe5e978..0635a8d3f1ac 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -156,7 +156,7 @@ private:
bool const bHidden, bool const bCondition);
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
TYPEINFO_OVERRIDE(); // rtti
@@ -290,20 +290,20 @@ class SW_DLLPUBLIC SwSectionFormat
protected:
SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc );
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
TYPEINFO_OVERRIDE(); // Already contained in base class client.
virtual ~SwSectionFormat();
// Deletes all Frms in aDepend (Frms are recognized via dynamic_cast).
- virtual void DelFrms() SAL_OVERRIDE;
+ virtual void DelFrms() override;
// Creates views.
- virtual void MakeFrms() SAL_OVERRIDE;
+ virtual void MakeFrms() override;
// Get information from Format.
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
SwSection* GetSection() const;
inline SwSectionFormat* GetParent() const;
@@ -335,12 +335,12 @@ public:
{ m_wXTextSection = xTextSection; }
// sfx2::Metadatable
- 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 ::sfx2::IXmlIdRegistry& GetRegistry() override;
+ virtual bool IsInClipboard() const override;
+ virtual bool IsInUndo() const override;
+ virtual bool IsInContent() const override;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE;
+ ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override;
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index d3bf6424b90b..942df36332b4 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -274,7 +274,7 @@ private:
class AsciiReader: public Reader
{
friend class SwReader;
- virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
+ virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override;
public:
AsciiReader(): Reader() {}
};
@@ -284,9 +284,9 @@ class SW_DLLPUBLIC StgReader : public Reader
OUString aFltName;
public:
- virtual int GetReaderType() SAL_OVERRIDE;
+ virtual int GetReaderType() override;
OUString GetFltName() { return aFltName; }
- virtual void SetFltName( const OUString& r ) SAL_OVERRIDE;
+ virtual void SetFltName( const OUString& r ) override;
};
// The given stream has to be created dynamically and must
@@ -465,7 +465,7 @@ protected:
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg;
// Create error at call.
- virtual sal_uLong WriteStream() SAL_OVERRIDE;
+ virtual sal_uLong WriteStream() override;
virtual sal_uLong WriteStorage() = 0;
virtual sal_uLong WriteMedium( SfxMedium& ) = 0;
@@ -474,10 +474,10 @@ protected:
public:
StgWriter() : Writer() {}
- virtual bool IsStgWriter() const SAL_OVERRIDE;
+ virtual bool IsStgWriter() const override;
- 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;
+ virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ) override;
+ virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ) override;
SotStorage& GetStorage() const { return *pStg; }
};
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 4accac06eaff..6353462c8eda 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -107,7 +107,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 ) SAL_OVERRIDE = 0;
+ virtual void EndDialog(long ) override = 0;
};
class AbstractInsFootNoteDlg : public VclAbstractDialog
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index f913d8162dd3..bec06f078bc4 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -36,14 +36,14 @@ class SW_DLLPUBLIC SwAutoCorrect : public SvxAutoCorrect
protected:
// Return replacement text (only for SWG-format, all others can be obtained from wordlist!).
// rShort is stream-name - encrypted!
- virtual bool GetLongText( const OUString& rShort, OUString& rLong ) SAL_OVERRIDE;
+ virtual bool GetLongText( const OUString& rShort, OUString& rLong ) override;
- virtual void refreshBlockList( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& ) SAL_OVERRIDE;
+ virtual void refreshBlockList( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& ) 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& ) SAL_OVERRIDE;
+ const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ) override;
public:
SwAutoCorrect( const SvxAutoCorrect& rACorr );
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index c40e2662a513..2f6eaba131af 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -176,7 +176,7 @@ class SW_DLLPUBLIC SwAttrSet : public SfxItemSet
SwAttrSet *pOldSet, *pNewSet;
// Notification-Callback
- virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ) SAL_OVERRIDE;
+ virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ) override;
void PutChgd( const SfxPoolItem& rI ) { SfxItemSet::PutDirect( rI ); }
public:
@@ -184,7 +184,7 @@ public:
SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable );
SwAttrSet( const SwAttrSet& );
- virtual SfxItemSet* Clone(bool bItems = true, SfxItemPool *pToPool = 0) const SAL_OVERRIDE;
+ virtual SfxItemSet* Clone(bool bItems = true, SfxItemPool *pToPool = 0) const 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 5dcf33a5d9a7..9e10394e6ce3 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -44,9 +44,9 @@ public:
virtual ~SwBaseLink();
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
- virtual void Closed() SAL_OVERRIDE;
+ virtual void Closed() override;
virtual const SwNode* GetAnchor() const;
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index 632a7aba7284..492b02de3957 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -32,9 +32,9 @@ class SwOleClient : public SfxInPlaceClient
bool m_IsInDoVerb;
bool m_IsOldCheckForOLEInCaption;
- virtual void ObjectAreaChanged() SAL_OVERRIDE;
- virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE;
- virtual void ViewChanged() SAL_OVERRIDE;
+ virtual void ObjectAreaChanged() override;
+ virtual void RequestNewObjectArea( Rectangle& ) override;
+ virtual void ViewChanged() override;
public:
SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& );
@@ -43,7 +43,7 @@ public:
bool IsCheckForOLEInCaption() const { return m_IsOldCheckForOLEInCaption; }
- virtual void FormatChanged() SAL_OVERRIDE;
+ virtual void FormatChanged() override;
};
#endif
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 58aa03d360f6..a7fc3d1d7014 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -261,7 +261,7 @@ protected:
bool m_bChanged : 1;
bool m_bParked : 1; // Table-cursor was parked.
- virtual bool IsSelOvrCheck(int eFlags) SAL_OVERRIDE;
+ virtual bool IsSelOvrCheck(int eFlags) override;
public:
SwTableCursor( const SwPosition &rPos, SwPaM* pRing = 0 );
@@ -269,8 +269,8 @@ public:
virtual ~SwTableCursor();
virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
- bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) SAL_OVERRIDE;
- virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE;
+ bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) override;
+ virtual bool GotoTable( const OUString& rName ) override;
void InsertBox( const SwTableBox& rTableBox );
void DeleteBox(size_t nPos);
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index ec76169e7309..808a2c98ddfa 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -41,8 +41,8 @@ public:
SwDDEFieldType* GetDDEFieldType();
inline const SwDDEFieldType* GetDDEFieldType() const;
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
- virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& ) override;
};
inline const SwDDEFieldType* SwDDETable::GetDDEFieldType() const
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index b7ebce565036..5e013c6f4e34 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.hxx
@@ -24,7 +24,7 @@
class SW_DLLPUBLIC SwFilterOptions : public utl::ConfigItem
{
private:
- virtual void ImplCommit() SAL_OVERRIDE;
+ virtual void ImplCommit() override;
public:
SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames,
@@ -32,7 +32,7 @@ public:
void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
sal_uInt32* pValues );
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
};
#endif
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index b2d01cd85434..db7c33733a85 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
bool m_bEmbeddedLoadSave : 1;
// Catch hint for DocInfo.
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE;
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override;
protected:
// Envelopes, labels.
@@ -217,9 +217,9 @@ public:
SwFieldUpdateFlags GetFieldUpdateFlags( bool bWeb ) const;
// Virtual methods for options dialog.
- virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
- virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) override;
+ virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
+ virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override;
// Pool is created here and set at SfxShell.
void InitAttrPool();
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 053912718280..1ff0dd1a497e 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 ) SAL_OVERRIDE;
+ bool bSynchron = false ) override;
void SendDataChanged( const SwPosition& rPos );
void SendDataChanged( const SwPaM& rRange );
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index e37b95232c35..86ebd8ce81cc 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -125,7 +125,7 @@ protected:
bool IsModifyLocked(){ return bModifyLocked;}
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
enum SearchType
@@ -306,7 +306,7 @@ public:
SwSelBoxes& rBoxes, bool bToTop = true );
// Get information from client.
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
// Search in format for registered table.
static SwTable * FindTable( SwFrameFormat const*const pFormat );
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 336bb39a0193..6ace791b7e8b 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -42,7 +42,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat)
- virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
+ virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
};
class SwTableLineFormat : public SwFrameFormat
@@ -64,7 +64,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat)
- virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
+ virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
};
class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat
@@ -82,14 +82,14 @@ protected:
{}
// For recognition of changes (especially TableBoxAttribute).
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
public:
TYPEINFO_OVERRIDE(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat)
- virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
+ virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
};
#endif
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 807350aa7630..b37e061057ed 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 SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- 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 ) SAL_OVERRIDE;
+ const IntlWrapper* pIntl = 0 ) const override;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
SwTextGridItem& operator=( const SwTextGridItem& );
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 8e1dfcfc2bed..ccd41a71682a 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -81,7 +81,7 @@ class SW_DLLPUBLIC SwTOXMark
protected:
// SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
TYPEINFO_OVERRIDE(); // rtti
@@ -94,8 +94,8 @@ public:
SwTOXMark& operator=( const SwTOXMark& rCopy );
// "pure virtual methods" of SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
void InvalidateTOXMark();
@@ -432,7 +432,7 @@ public:
SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 );
virtual ~SwTOXBase();
- virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const 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 eeb2edb65ec4..b31feacf7757 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -129,7 +129,7 @@ protected:
public:
SwTextAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
- virtual sal_Int32* GetEnd() SAL_OVERRIDE;
+ virtual sal_Int32* GetEnd() override;
};
// attribute that must not overlap others
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 73700587611a..a31cb125cdc9 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -74,13 +74,13 @@ class SW_DLLPUBLIC SwTextRuby : public SwTextAttrNesting, public SwClient
{
SwTextNode* m_pTextNode;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
virtual ~SwTextRuby();
TYPEINFO_OVERRIDE();
- virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
SAL_DLLPRIVATE void InitRuby(SwTextNode & rNode);
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 92a6d7cb2b39..2c8decf4f29f 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -89,7 +89,7 @@ public:
void LockNotifyContentChange();
void UnlockNotifyContentChange();
- virtual void NotifyContentChange( SwFormatField& rFormatField ) SAL_OVERRIDE;
+ virtual void NotifyContentChange( SwFormatField& rFormatField ) override;
void UpdateTextNodeContent( const OUString& rNewContent );
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 9a08f70faa67..e16b36ec944a 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -33,14 +33,14 @@ class SW_DLLPUBLIC SwTextINetFormat : public SwTextAttrNesting, public SwClient
bool m_bVisitedValid : 1; // is m_bVisited valid?
protected:
-virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
virtual ~SwTextINetFormat();
TYPEINFO_OVERRIDE();
- virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
SAL_DLLPRIVATE void InitINetFormat(SwTextNode & rNode);
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index ab72f76d3cf0..eaff28f8c7cc 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -33,7 +33,7 @@ public:
SwTextRefMark( SwFormatRefMark& rAttr,
sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
- virtual sal_Int32* GetEnd() SAL_OVERRIDE; // SwTextAttr
+ virtual sal_Int32* GetEnd() override; // SwTextAttr
// get and set TextNode pointer
inline const SwTextNode& GetTextNode() const;
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index f935254fc682..40c4024f4494 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -35,7 +35,7 @@ public:
sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
virtual ~SwTextTOXMark();
- virtual sal_Int32 *GetEnd() SAL_OVERRIDE; // SwTextAttr
+ virtual sal_Int32 *GetEnd() override; // SwTextAttr
void CopyTOXMark( SwDoc* pDestDoc );
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 400d1d7a6040..be74d1a3c210 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -70,7 +70,7 @@ protected:
virtual SwRewriter GetRewriter() const;
// return type is sal_uInt16 because this overrides SfxUndoAction::GetId()
- virtual sal_uInt16 GetId() const SAL_OVERRIDE { return static_cast<sal_uInt16>(m_nId); }
+ virtual sal_uInt16 GetId() const override { return static_cast<sal_uInt16>(m_nId); }
// the 4 methods that derived classes have to override
// base implementation does nothing
@@ -82,12 +82,12 @@ public: // should not be public, but ran into trouble in untbl.cxx
private:
// SfxUndoAction
- 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;
+ virtual void Undo() override;
+ virtual void Redo() override;
+ virtual void UndoWithContext(SfxUndoContext &) override;
+ virtual void RedoWithContext(SfxUndoContext &) override;
+ virtual void Repeat(SfxRepeatTarget &) override;
+ virtual bool CanRepeat(SfxRepeatTarget &) const override;
public:
SwUndo(SwUndoId const nId);
@@ -102,7 +102,7 @@ public:
@return textual comment for this undo object
*/
- virtual OUString GetComment() const SAL_OVERRIDE;
+ virtual OUString GetComment() const override;
// UndoObject remembers which mode was turned on.
// In Undo/Redo/Repeat this remembered mode is switched on.
@@ -234,9 +234,9 @@ protected:
public:
virtual ~SwUndoInserts();
- virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) override;
// Set destination range after reading.
void SetInsertRange( const SwPaM&, bool bScanFlys = true,
@@ -286,11 +286,11 @@ public:
virtual ~SwUndoInsLayFormat();
- virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RepeatImpl( ::sw::RepeatContext & ) override;
- virtual OUString GetComment() const SAL_OVERRIDE;
+ virtual OUString GetComment() const override;
};
@@ -300,14 +300,14 @@ class SwUndoDelLayFormat : public SwUndoFlyBase
public:
SwUndoDelLayFormat( SwFrameFormat* pFormat );
- virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+ virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
+ virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
void RedoForRollback();
void ChgShowSel( bool bNew ) { bShowSelFrm = bNew; }
- virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
+ virtual SwRewriter GetRewriter() const override;
};
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 72ce273cde97..b926379ac7a5 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -155,41 +155,41 @@ class SwChartDataProvider :
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) 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) 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;
+ 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) 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) 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) override;
+ virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference<css::chart2::data::XDataSequence>
SAL_CALL createDataSequenceByValueArray(
const OUString& aRole, const OUString& aRangeRepresentation )
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
// XRangeXMLConversion
virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException,
- 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;
+ std::exception) override;
+ virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
// XComponent
- 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;
+ virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override;
// XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
void AddDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
void RemoveDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
@@ -225,12 +225,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) SAL_OVERRIDE;
+ 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) override;
// XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
};
typedef cppu::WeakImplHelper
@@ -275,7 +275,7 @@ class SwChartDataSequence :
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
SwChartDataSequence( SwChartDataProvider &rProvider,
@@ -286,62 +286,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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
// XDataSequence
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
throw (::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ std::exception) override;
virtual OUString SAL_CALL getSourceRangeRepresentation()
throw (::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ std::exception) 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) 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;
+ std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
// XTextualDataSequence
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData()
throw (::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ std::exception) override;
// XNumericalDataSequence
virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData()
throw (::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ std::exception) override;
// XCloneable
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
// XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XModifiable
- 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;
+ virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) 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) 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;
+ 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) 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) override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XComponent
- 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;
+ virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override;
SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
bool DeleteBox( const SwTableBox &rBox );
@@ -383,33 +383,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) 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) override;
// XCloneable
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XModifyListener
- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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;
+ 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) 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) override;
// XComponent
- 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;
+ virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override;
};
#endif
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index f786b22b9d3d..2f829df71165 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -273,22 +273,22 @@ public:
SwXTextTables(SwDoc* pDoc);
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat);
};
@@ -312,25 +312,25 @@ public:
SwXFrames(SwDoc* pDoc, FlyCntType eSet);
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
class SwXTextFrames : public SwXFrames
@@ -341,9 +341,9 @@ public:
SwXTextFrames(SwDoc* pDoc);
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
@@ -355,9 +355,9 @@ public:
SwXTextGraphicObjects(SwDoc* pDoc);
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
@@ -369,9 +369,9 @@ public:
SwXTextEmbeddedObjects(SwDoc* pDoc);
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
@@ -384,22 +384,22 @@ public:
SwXTextSections(SwDoc* pDoc);
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFormat& rFormat );
};
@@ -413,22 +413,22 @@ class SwXBookmarks : public SwCollectionBaseClass,
SwXBookmarks(SwDoc* pDoc);
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
@@ -445,12 +445,12 @@ public:
SwXNumberingRulesCollection( SwDoc* pDoc );
//XIndexAccess
- virtual sal_Int32 SAL_CALL 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;
+ virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
typedef
@@ -472,17 +472,17 @@ public:
SwXFootnotes(bool bEnd, SwDoc* pDoc);
//XIndexAccess
- virtual sal_Int32 SAL_CALL 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;
+ virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat );
};
@@ -496,22 +496,22 @@ public:
SwXReferenceMarks(SwDoc* pDoc);
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 55063694c9dc..de8bd3756330 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -45,8 +45,8 @@ public:
protected:
virtual const SwContentFrm* DoSetBidiLevelLeftRight(
- bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) SAL_OVERRIDE;
- virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE;
+ bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) override;
+ virtual void DoSetBidiLevelUpDown() override;
public:
@@ -55,19 +55,19 @@ public:
virtual bool IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE;
+ nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) override;
- virtual bool IsReadOnlyAvailable() const SAL_OVERRIDE;
+ virtual bool IsReadOnlyAvailable() const override;
bool IsRemainInSection() const { return m_bRemainInSection; }
void SetRemainInSection( bool bFlag ) { m_bRemainInSection = bFlag; }
- virtual bool IsSkipOverProtectSections() const SAL_OVERRIDE
+ virtual bool IsSkipOverProtectSections() const override
{ return m_bSkipOverProtectSections; }
void SetSkipOverProtectSections( bool bFlag )
{ m_bSkipOverProtectSections = bFlag; }
- virtual bool IsSkipOverHiddenSections() const SAL_OVERRIDE
+ virtual bool IsSkipOverHiddenSections() const override
{ return m_bSkipOverHiddenSections; }
void SetSkipOverHiddenSections( bool bFlag )
{ m_bSkipOverHiddenSections = bFlag; }
@@ -93,7 +93,7 @@ public:
virtual bool IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE;
+ nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) override;
void MakeBoxSels();
@@ -122,12 +122,12 @@ namespace sw
if(m_pCursor)
m_pCursor->Add(this);
}
- virtual ~UnoCursorPointer() SAL_OVERRIDE
+ virtual ~UnoCursorPointer() override
{
if(m_pCursor)
m_pCursor->Remove(this);
}
- virtual void SwClientNotify(const SwModify& rModify, const SfxHint& rHint) SAL_OVERRIDE
+ virtual void SwClientNotify(const SwModify& rModify, const SfxHint& rHint) override
{
SwClient::SwClientNotify(rModify, rHint);
if(m_pCursor)
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 35d9a6d8aaac..ec6d9fdce129 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -47,7 +47,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 (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) override;
public:
SwFmDrawPage( SdrPage* pPage );
@@ -64,7 +64,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 (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
};
typedef cppu::WeakAggImplHelper4
@@ -85,33 +85,33 @@ public:
virtual ~SwXDrawPage();
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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::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) override;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) 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;
+ 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 ) 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 ) 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) 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;
+ std::exception) 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 ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
SwFmDrawPage* GetSvxPage();
// renamed and outlined to detect where it's called
@@ -222,54 +222,54 @@ class SwXShape : public SwXShapeBaseClass,
protected:
virtual ~SwXShape();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) 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) 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;
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) 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) 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;
+ 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) 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) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) 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) 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 ) 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;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XComponent
- 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 > & 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;
+ virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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 ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- 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;
+ virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) override;
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
@@ -288,21 +288,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) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
- virtual void SAL_CALL release( ) throw() 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) override;
+ virtual void SAL_CALL acquire( ) throw() override;
+ virtual void SAL_CALL release( ) throw() 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) 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;
+ 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) 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) override;
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 30cf0dbd4571..3bb0ad204e2b 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
};
@@ -95,41 +95,41 @@ public:
SwXTextFieldTypes(SwDoc* pDoc);
// SwUnoCollection
- virtual void Invalidate() SAL_OVERRIDE;
+ virtual void Invalidate() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
createEnumeration()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XRefreshable
virtual void SAL_CALL refresh()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index c2445b8d21eb..f33a466ffa86 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -73,7 +73,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) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
virtual ~SwXFrame();
@@ -91,37 +91,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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
TYPEINFO_OVERRIDE();
//XNamed
- virtual OUString SAL_CALL getName() 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;
+ virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) 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) 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;
+ 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) 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) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) 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) override;
//XShape
- 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 ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override;
//XShapeDescriptor
- virtual OUString SAL_CALL getShapeType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getShapeType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//Base implementation
//XComponent
@@ -132,9 +132,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception );
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
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, std::exception);
@@ -171,12 +171,12 @@ class SwXTextFrame : public SwXTextFrameBaseClass,
protected:
friend class SwXFrame; // just for CreateXFrame
- virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE;
+ virtual const SwStartNode *GetStartNode() const override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor >
CreateCursor()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException) override;
virtual ~SwXTextFrame();
@@ -190,50 +190,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) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
- virtual void SAL_CALL release( ) throw() 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) override;
+ virtual void SAL_CALL acquire( ) throw() override;
+ virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- 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;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XTextFrame
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() 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 ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XEnumerationAccess - frueher XParagraphEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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;
+ 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) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XComponent
- 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;
+ virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XEventsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) 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) 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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override;
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
@@ -261,30 +261,30 @@ public:
static css::uno::Reference<css::text::XTextContent>
CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
- virtual void SAL_CALL release( ) throw() SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acquire( ) throw() override;
+ virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- 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;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) 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;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XComponent
- 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 > & 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;
+ virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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 ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XEventsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) 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) override;
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
};
@@ -314,37 +314,37 @@ public:
static css::uno::Reference<css::text::XTextContent>
CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
- virtual void SAL_CALL release( ) throw() SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acquire( ) throw() override;
+ virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- 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;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) 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;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XComponent
- 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 > & 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;
+ virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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 ) override;
//XEmbeddedObjectSupplier2
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::sal_Int64 SAL_CALL getAspect() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XEventsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) 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) override;
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
};
@@ -364,13 +364,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) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
};
#endif
diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx
index faae97c89886..3308a70fc83b 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index a3fbfa33afab..7d08dcf746b7 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -97,44 +97,44 @@ public:
void attachToText(SwXText & rParent, SwTextNode & rTextNode);
// MetadatableMixin
- virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE;
+ virtual ::sfx2::Metadatable* GetCoreObject() override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
- GetModel() SAL_OVERRIDE;
+ GetModel() 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyToDefault(
const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
createEnumeration()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) 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;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XTextRange
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
SAL_CALL getText()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getStart()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getString()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setString(const OUString& rString)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 5739d9c30aa5..9c4cb5ea2a5e 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 SAL_OVERRIDE;
+ virtual const SwStartNode *GetStartNode() const 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) 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::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acquire( ) throw() override {OWeakObject::acquire();}
+ virtual void SAL_CALL release( ) throw() 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) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) 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) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() 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 ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess (via XEnumerationAccess)
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acquire( ) throw() override {OWeakObject::acquire();}
+ virtual void SAL_CALL release( ) throw() 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) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) 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) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() 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 ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
const SwRangeRedline* GetRedline() const {return pRedline;}
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
};
#endif
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 886bd51ae059..572a6a2c74df 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) 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;
+ virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) override;
//XEnumerationAccess - was: XParagraphEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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() 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;
+ virtual sal_Bool SAL_CALL hasMoreElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
protected:
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
};
#endif
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 94935ad8a2ac..c133f6bdb745 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -53,18 +53,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) 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
void Invalidate() {pDoc = 0;}
};
@@ -83,18 +83,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) 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
void Invalidate() {pDoc = 0;}
};
@@ -113,18 +113,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) 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
void Invalidate() {pDoc = 0;}
};
@@ -151,7 +151,7 @@ protected:
virtual ~SwXNumberingRules();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering
@@ -160,36 +160,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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ 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) override;
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XNamed
- virtual OUString SAL_CALL getName() 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;
+ virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>
@@ -230,9 +230,9 @@ public:
void Invalidate() {SwXNumberingRules::Invalidate();}
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
@@ -269,28 +269,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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XTextColumns
- 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;
+ virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getColumnCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 7867f502447b..b1cf646f4a39 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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XSearchDescriptor
- 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;
+ virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XReplaceDescriptor
- virtual OUString SAL_CALL getReplaceString() 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;
+ virtual OUString SAL_CALL getReplaceString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XPropertyReplace
- virtual sal_Bool SAL_CALL getValueSearch() 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() 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() 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;
+ virtual sal_Bool SAL_CALL getValueSearch() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
void FillSearchItemSet(SfxItemSet& rSet) const;
void FillReplaceItemSet(SfxItemSet& rSet) const;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index a8cd73d55080..a49290f8fa12 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
class SwXStyleFamily : public cppu::WeakImplHelper
@@ -117,39 +117,39 @@ public:
virtual ~SwXStyleFamily();
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) 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;
+ 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 ) 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 ) 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 ) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
class SwXStyle : public cppu::WeakImplHelper
@@ -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, std::exception);
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, bool bConditional = 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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XNamed
- virtual OUString SAL_CALL getName() 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;
+ virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XStyle
- virtual sal_Bool SAL_CALL isUserDefined() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isInUse() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual OUString SAL_CALL getParentStyle() 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;
+ virtual sal_Bool SAL_CALL isUserDefined() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL isInUse() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getParentStyle() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) 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) 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;
+ 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) 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) 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) 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) 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) 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) 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;
+ 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) 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) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) 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) override;
//XMultiPropertyStates
- 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;
+ virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
OUString GetStyleName() const { return m_sStyleName;}
SfxStyleFamily GetFamily() const {return eFamily;}
@@ -284,13 +284,13 @@ public:
SwXFrameStyle( SwDoc *pDoc );
virtual ~SwXFrameStyle();
- virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE {SwXStyle::acquire();}
- virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {SwXStyle::release();}
+ virtual void SAL_CALL acquire( ) throw() override {SwXStyle::acquire();}
+ virtual void SAL_CALL release( ) throw() 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) 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::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) 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) override;
friend class SwFrameStyleEventDescriptor;
};
@@ -313,11 +313,11 @@ public:
SwXPageStyle(SwDocShell* pDocSh);
virtual ~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) 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 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) 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) 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) 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 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) 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) override;
};
@@ -337,17 +337,17 @@ public:
SwXAutoStyles(SwDocShell& rDocShell);
//XIndexAccess
- 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;
+ virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ 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 ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
@@ -359,21 +359,21 @@ class SwXAutoStyleFamily : public cppu::WeakImplHelper< com::sun::star::style::X
IStyleAccess::SwAutoStyleFamily eFamily;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) 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) SAL_OVERRIDE;
+ 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) override;
//XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
@@ -386,10 +386,10 @@ public:
virtual ~SwXAutoStylesEnumerator();
//XEnumeration
- 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;
+ virtual sal_Bool SAL_CALL hasMoreElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) override;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
};
// an automatic style
@@ -414,36 +414,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) 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) 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) 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;
+ 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) 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) 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) 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) 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) 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) 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;
+ 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) 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) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) 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) override;
//XMultiPropertyStates
- 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;
+ virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override;
// Special
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
};
#endif
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 8b600dc9270a..75793b5e536f 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -78,20 +78,20 @@ class SwXCell SAL_FINAL : public SwXCellBaseClass,
static size_t const NOTFOUND = SAL_MAX_SIZE;
protected:
- virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE;
+ virtual const SwStartNode *GetStartNode() const override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor >
CreateCursor()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException) override;
bool IsValid() const;
virtual ~SwXCell();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
- virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
+ virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
public:
SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, size_t nPos = NOTFOUND);
@@ -102,53 +102,53 @@ 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) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
- virtual void SAL_CALL release( ) throw() 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) override;
+ virtual void SAL_CALL acquire( ) throw() override;
+ virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- 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;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XCell
- 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 OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual double SAL_CALL getValue( ) const throw(::com::sun::star::uno::RuntimeException, std::exception)
{ return const_cast<SwXCell*>(this)->getValue(); };
- 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 void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) const throw(::com::sun::star::uno::RuntimeException, std::exception)
{ return const_cast<SwXCell*>(this)->getType(); };
- virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) override;
+ virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XPropertySet
- 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;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XEnumerationAccess - was: XParagraphEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
//XElementAccess
- 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;
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
SwTableBox* GetTableBox() const { return pBox; }
static SwXCell* CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = nullptr );
@@ -173,8 +173,8 @@ class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
protected:
virtual ~SwXTextTableRow();
//SwClient
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
- virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
+ virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
public:
SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLine);
@@ -182,24 +182,24 @@ public:
TYPEINFO_OVERRIDE();
//XPropertySet
- 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 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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;
+ std::exception) 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) 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) 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) 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) 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) override;
//XServiceInfo
- 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;
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
const SwTableLine* GetTableRow() const {return pLine;}
static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
@@ -225,53 +225,53 @@ public:
//XTextTableCursor
virtual OUString SAL_CALL getRangeName()
throw (::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ std::exception) override;
+ virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL mergeRange()
throw (::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ std::exception) override;
virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal )
throw (::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ std::exception) override;
//XPropertySet
- 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 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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;
+ std::exception) 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