diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sw/source/ui | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sw/source/ui')
115 files changed, 1098 insertions, 1098 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 085759dc0e71..1483feb98212 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -93,7 +93,7 @@ class SwDropCapsPict : public Control Size maTextSize; Reference< css::i18n::XBreakIterator > xBreak; - virtual void Paint(const Rectangle &rRect); + virtual void Paint(const Rectangle &rRect) SAL_OVERRIDE; void CheckScript( void ); Size CalcTextSize( void ); inline void InitPrinter( void ); @@ -122,10 +122,10 @@ public: void UpdatePaintSettings( void ); // also invalidates control! - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetText( const OUString& rT ); + void SetText( const OUString& rT ) SAL_OVERRIDE; void SetLines( sal_uInt8 nL ); void SetDistance( sal_uInt16 nD ); void SetValues( const OUString& rText, sal_uInt8 nLines, sal_uInt16 nDistance ); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index f7ca4aeac8db..88ad0cf243fa 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -147,7 +147,7 @@ public: : SvSimpleTable(rParent, nBits) { } - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void setColSizes(); }; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 1f4f99cd8c20..5b14c35e7413 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -65,8 +65,8 @@ class SwAddressControl_Impl : public Control void MakeVisible(const Rectangle& aRect); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; using Window::SetData; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 87e01e18fa25..2991cca7d793 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -819,8 +819,8 @@ class SwAssignFieldsControl : public Control DECL_LINK(MatchHdl_Impl, ListBox*); DECL_LINK(GotFocusHdl_Impl, ListBox*); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; void MakeVisible( sal_Int32 nIndex ); public: diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index c064fa29aaf9..1294ba0e7025 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -73,9 +73,9 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage void EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective); - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; public: SwMailMergeAddressBlockPage(SwMailMergeWizard* _pParent); @@ -125,7 +125,7 @@ public: void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; }; #define MOVE_ITEM_LEFT 1 @@ -143,20 +143,20 @@ class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener using VclMultiLineEdit::SetText; protected: - bool PreNotify( NotifyEvent& rNEvt ); + bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: AddressMultiLineEdit(Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); ~AddressMultiLineEdit(); void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;} - void SetText( const OUString& rStr ); + void SetText( const OUString& rStr ) SAL_OVERRIDE; OUString GetAddress(); void InsertNewEntry( const OUString& rStr ); @@ -176,8 +176,8 @@ class SwRestrictedComboBox : public ComboBox OUString sForbiddenChars; protected: - virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; public: SwRestrictedComboBox(Window* pParent, WinBits nStyle = 0) : ComboBox( pParent, nStyle ) diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index faacb4344956..2788b3e70a5e 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -47,7 +47,7 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage DECL_LINK(DocSelectHdl, RadioButton*); DECL_LINK(FileSelectHdl, PushButton*); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; public: SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 84d12f662e71..ebd1ddc5a62e 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -84,9 +84,9 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, DECL_LINK(GreetingSelectHdl_Impl, void *); DECL_LINK(AssignHdl_Impl, PushButton*); - virtual void UpdatePreview(); - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void UpdatePreview() SAL_OVERRIDE; + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; public: SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent); ~SwMailMergeGreetingsPage(); diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 7eefddbb6c06..4fbc7f590706 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -79,8 +79,8 @@ class SwMailMergeLayoutPage : public svt::OWizardPage bool bExample); static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample); - virtual void ActivatePage(); - virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason); + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason) SAL_OVERRIDE; public: SwMailMergeLayoutPage( SwMailMergeWizard* _pParent); ~SwMailMergeLayoutPage(); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 8a5c7756e035..9f7fc710c3d1 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -123,8 +123,8 @@ class SwMailMergeOutputPage : public svt::OWizardPage DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*); DECL_LINK(SaveCancelHdl_Impl, void *); protected: - virtual bool canAdvance() const; - virtual void ActivatePage(); + virtual bool canAdvance() const SAL_OVERRIDE; + virtual void ActivatePage() SAL_OVERRIDE; public: SwMailMergeOutputPage( SwMailMergeWizard* _pParent); ~SwMailMergeOutputPage(); @@ -200,7 +200,7 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog SAL_DLLPRIVATE void SendMails(); SAL_DLLPRIVATE void UpdateTransferStatus(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: SwSendMailDialog( Window* pParent, SwMailMergeConfigItem& ); diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 9893b0ac2ac5..bdaef54ae3ff 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -44,8 +44,8 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage DECL_LINK(ExcludeHdl_Impl, CheckBox*); DECL_LINK(MoveHdl_Impl, void*); - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; public: SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 55a3bdb60ff8..8654412509ac 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -54,7 +54,7 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual short Execute() ; + virtual short Execute() SAL_OVERRIDE ; #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -70,30 +70,30 @@ class SwWordCountFloatDlg; class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg { DECL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl,SwWordCountFloatDlg) - virtual void UpdateCounts(); - virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void UpdateCounts() SAL_OVERRIDE; + virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg { DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg) - virtual sal_uInt8 GetLevel() const ; - virtual sal_uInt8 GetPara() const ; + virtual sal_uInt8 GetLevel() const SAL_OVERRIDE ; + virtual sal_uInt8 GetPara() const SAL_OVERRIDE ; }; class SwAbstractSfxDialog_Impl :public SfxAbstractDialog { DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg { DECL_ABSTDLG_BASE( AbstractSwAsciiFilterDlg_Impl,SwAsciiFilterDlg ) - virtual void FillOptions( SwAsciiOptions& rOptions ); + virtual void FillOptions( SwAsciiOptions& rOptions ) SAL_OVERRIDE; }; @@ -105,28 +105,28 @@ class VclAbstractDialog_Impl : public VclAbstractDialog class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg { DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg) - virtual OUString GetTemplateName(); - virtual sal_uInt16 GetKind(); - virtual ::boost::optional<sal_uInt16> GetPageNumber(); + virtual OUString GetTemplateName() SAL_OVERRIDE; + virtual sal_uInt16 GetKind() SAL_OVERRIDE; + virtual ::boost::optional<sal_uInt16> GetPageNumber() SAL_OVERRIDE; }; class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for { DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg) - virtual sal_uInt16 GetSplitMode(); + virtual sal_uInt16 GetSplitMode() SAL_OVERRIDE; }; class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString &rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class AbstractApplyTabDialog_Impl : public AbstractTabDialog_Impl, virtual public SfxAbstractApplyTabDialog @@ -139,14 +139,14 @@ public: DECL_LINK(ApplyHdl, void*); private: Link m_aHandler; - virtual void SetApplyHdl( const Link& rLink ); + virtual void SetApplyHdl( const Link& rLink ) SAL_OVERRIDE; }; class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg { DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg) virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTblFlags, - SwTableAutoFmt const*& prTAFmt); + SwTableAutoFmt const*& prTAFmt) SAL_OVERRIDE; }; class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPilot @@ -155,85 +155,85 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) SAL_OVERRIDE; }; class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog { DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog) - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow - virtual void SetWindowState( const OString& rStr );//this method inherit from SystemWindow + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE; //this method inherit from SystemWindow + virtual void SetWindowState( const OString& rStr ) SAL_OVERRIDE;//this method inherit from SystemWindow }; class AbstractSwLabDlg_Impl : public AbstractSwLabDlg { DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString &rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; - virtual const OUString& GetBusinessCardStr() const; - virtual Printer *GetPrt(); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; + virtual const OUString& GetBusinessCardStr() const SAL_OVERRIDE; + virtual Printer *GetPrt() SAL_OVERRIDE; }; class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg { DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg) - virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName); // inline - virtual sal_uInt16 GetSelectedIdx() const; // inline - virtual void SelectEntryPos(sal_uInt16 nIdx); // inline + virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName) SAL_OVERRIDE; // inline + virtual sal_uInt16 GetSelectedIdx() const SAL_OVERRIDE; // inline + virtual void SelectEntryPos(sal_uInt16 nIdx) SAL_OVERRIDE; // inline }; class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg { DECL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl,SwAutoFormatDlg ) - virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const; + virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const SAL_OVERRIDE; }; class AbstractSwFldDlg_Impl : public AbstractSwFldDlg { DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString &rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; - virtual void Start( sal_Bool bShow = sal_True ); //this method from SfxTabDialog - virtual void ShowReferencePage(); - virtual void Initialize(SfxChildWinInfo *pInfo); - virtual void ReInitDlg(); - virtual void ActivateDatabasePage(); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; + virtual void Start( sal_Bool bShow = sal_True ) SAL_OVERRIDE; //this method from SfxTabDialog + virtual void ShowReferencePage() SAL_OVERRIDE; + virtual void Initialize(SfxChildWinInfo *pInfo) SAL_OVERRIDE; + virtual void ReInitDlg() SAL_OVERRIDE; + virtual void ActivateDatabasePage() SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg { DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg ) - virtual void SetForbiddenChars( const OUString& rSet ); + virtual void SetForbiddenChars( const OUString& rSet ) SAL_OVERRIDE; virtual void SetAlternativeAccess( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) SAL_OVERRIDE; }; class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg { DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg ) - virtual void AcceptAll( sal_Bool bAccept ); + virtual void AcceptAll( sal_Bool bAccept ) SAL_OVERRIDE; }; class SwGlossaryDlg; class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg { DECL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl,SwGlossaryDlg) - virtual OUString GetCurrGrpName() const; - virtual OUString GetCurrShortName() const; + virtual OUString GetCurrGrpName() const SAL_OVERRIDE; + virtual OUString GetCurrShortName() const SAL_OVERRIDE; }; class SwFldInputDlg; @@ -241,21 +241,21 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg { DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg) //from class SalFrame - virtual void SetWindowState( const OString & rStr ) ; - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ; - virtual void EndDialog(long); + virtual void SetWindowState( const OString & rStr ) SAL_OVERRIDE ; + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE ; + virtual void EndDialog(long) SAL_OVERRIDE; }; class SwInsFootNoteDlg; class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg { DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg) - virtual OUString GetFontName(); - virtual sal_Bool IsEndNote(); - virtual OUString GetStr(); + virtual OUString GetFontName() SAL_OVERRIDE; + virtual sal_Bool IsEndNote() SAL_OVERRIDE; + virtual OUString GetStr() SAL_OVERRIDE; //from class Window - virtual void SetHelpId( const OString& sHelpId ); - virtual void SetText( const OUString& rStr ); + virtual void SetHelpId( const OString& sHelpId ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; }; class SwInsTableDlg; @@ -264,87 +264,87 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg) virtual void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName, - SwTableAutoFmt *& prTAFmt ); + SwTableAutoFmt *& prTAFmt ) SAL_OVERRIDE; }; class SwJavaEditDialog; class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog { DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog) - virtual OUString GetScriptText() const; - virtual OUString GetScriptType() const; - virtual sal_Bool IsUrl() const; - virtual sal_Bool IsNew() const; - virtual bool IsUpdate() const; + virtual OUString GetScriptText() const SAL_OVERRIDE; + virtual OUString GetScriptType() const SAL_OVERRIDE; + virtual sal_Bool IsUrl() const SAL_OVERRIDE; + virtual sal_Bool IsNew() const SAL_OVERRIDE; + virtual bool IsUpdate() const SAL_OVERRIDE; }; class SwMailMergeDlg; class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg { DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg) - virtual sal_uInt16 GetMergeType() ; - virtual const OUString& GetSaveFilter() const; - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; - virtual bool IsSaveIndividualDocs() const; - virtual bool IsGenerateFromDataBase() const; - virtual OUString GetColumnName() const; - virtual OUString GetPath() const; + virtual sal_uInt16 GetMergeType() SAL_OVERRIDE ; + virtual const OUString& GetSaveFilter() const SAL_OVERRIDE; + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const SAL_OVERRIDE; + virtual bool IsSaveIndividualDocs() const SAL_OVERRIDE; + virtual bool IsGenerateFromDataBase() const SAL_OVERRIDE; + virtual OUString GetColumnName() const SAL_OVERRIDE; + virtual OUString GetPath() const SAL_OVERRIDE; }; class SwMailMergeCreateFromDlg; class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg { DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg) - virtual sal_Bool IsThisDocument() const ; + virtual sal_Bool IsThisDocument() const SAL_OVERRIDE ; }; class SwMailMergeFieldConnectionsDlg; class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg { DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg) - virtual sal_Bool IsUseExistingConnections() const ; + virtual sal_Bool IsUseExistingConnections() const SAL_OVERRIDE ; }; class SwMultiTOXTabDialog; class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog { DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog) - virtual SwForm* GetForm(CurTOXType eType); - virtual CurTOXType GetCurrentTOXType() const ; - virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); + virtual SwForm* GetForm(CurTOXType eType) SAL_OVERRIDE; + virtual CurTOXType GetCurrentTOXType() const SAL_OVERRIDE ; + virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) SAL_OVERRIDE; //from SfxTabDialog - virtual const SfxItemSet* GetOutputItemSet() const; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; }; class SwEditRegionDlg; class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg { DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg) - virtual void SelectSection(const OUString& rSectionName); + virtual void SelectSection(const OUString& rSectionName) SAL_OVERRIDE; }; class SwInsertSectionTabDialog; class AbstractInsertSectionTabDialog_Impl : public AbstractInsertSectionTabDialog { DECL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl,SwInsertSectionTabDialog) - virtual void SetSectionData(SwSectionData const& rSect); + virtual void SetSectionData(SwSectionData const& rSect) SAL_OVERRIDE; }; class SwIndexMarkFloatDlg; class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg) - virtual void ReInitDlg(SwWrtShell& rWrtShell); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwAuthMarkFloatDlg; class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg) - virtual void ReInitDlg(SwWrtShell& rWrtShell); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwMailMergeWizard; @@ -359,13 +359,13 @@ public: : pDlg(p) {} virtual ~AbstractMailMergeWizard_Impl(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); - virtual long GetResult(); + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; + virtual long GetResult() SAL_OVERRIDE; - virtual void SetReloadDocument(const OUString& rURL); - virtual OUString GetReloadDocument() const; - virtual sal_Bool ShowPage( sal_uInt16 nLevel ); - virtual sal_uInt16 GetRestartPage() const; + virtual void SetReloadDocument(const OUString& rURL) SAL_OVERRIDE; + virtual OUString GetReloadDocument() const SAL_OVERRIDE; + virtual sal_Bool ShowPage( sal_uInt16 nLevel ) SAL_OVERRIDE; + virtual sal_uInt16 GetRestartPage() const SAL_OVERRIDE; }; //AbstractDialogFactory_Impl implementations @@ -379,134 +379,134 @@ public: const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId - ); + ) SAL_OVERRIDE; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, - SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo); - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent); + SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE; + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) SAL_OVERRIDE; virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, - SvStream* pStream ); - virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ); - virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh); - virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw); + SvStream* pStream ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE; + virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString* pFmtStr = 0); - virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable); - virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId); + sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) SAL_OVERRIDE; + virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE; virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp, - const SwDBData& rData); - virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh); + const SwDBData& rData) SAL_OVERRIDE; + virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh, - SwField* pField, sal_Bool bNextButton = sal_False); - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ); + SwField* pField, sal_Bool bNextButton = sal_False) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) SAL_OVERRIDE; virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, - SwNewDBMgr* pNewDBMgr, bool bLabel); + SwNewDBMgr* pNewDBMgr, bool bLabel) SAL_OVERRIDE; - virtual SwLabDlgMethod GetSwLabDlgStaticMethod (); + virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString *pCollName = 0, sal_Bool bDraw = sal_False, - const OString& sDefPage = OString() ); + const OString& sDefPage = OString() ) SAL_OVERRIDE; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName); - virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); - virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ); + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE; + virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE; virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, sal_Bool bSetAutoFmt = sal_True, - const SwTableAutoFmt* pSelFmt = 0 ); - virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ); + const SwTableAutoFmt* pSelFmt = 0 ) SAL_OVERRIDE; + virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); - virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc); + virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, - const SfxItemSet* pItemSet, SwWrtShell* pSh); - virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); - virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); + const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE; + virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) SAL_OVERRIDE; + virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE; virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess); - virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE; + virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev); + virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OString &rDialogType, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, bool bFmt = false, const OString& sDefPage = OString(), - const OUString* pFmtStr = 0); + const OUString* pFmtStr = 0) SAL_OVERRIDE; virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), SwWrtShell* pActShell = 0, - bool bNew = false); + bool bNew = false) SAL_OVERRIDE; virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, - SwWrtShell *pWrtShell); + SwWrtShell *pWrtShell) SAL_OVERRIDE; virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent, - SwWrtShell &rSh, SwField* pField, bool bNextButton = false); + SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( - Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); - virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ); - virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView); - virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView); + Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) SAL_OVERRIDE; + virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) SAL_OVERRIDE; virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent, - SwWrtShell* pWrtSh); + SwWrtShell* pWrtSh) SAL_OVERRIDE; virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ); - virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent); - virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent); - virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) SAL_OVERRIDE; + virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, Window* pParent, const SfxItemSet* pSwItemSet, - SwWrtShell &); + SwWrtShell &) SAL_OVERRIDE; virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, - sal_Bool bGlobal = sal_False); - virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh); + sal_Bool bGlobal = sal_False) SAL_OVERRIDE; + virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); + Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, - sal_Bool bNew=sal_True); + sal_Bool bNew=sal_True) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, - sal_Bool bNew=sal_True); + sal_Bool bNew=sal_True) SAL_OVERRIDE; virtual VclAbstractDialog * CreateIndexMarkModalDlg( - Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ); + Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE; - virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); + virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) SAL_OVERRIDE; - virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc(); - virtual GlossarySetActGroup SetGlossaryActGroupFunc(); + virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc() SAL_OVERRIDE; + virtual GlossarySetActGroup SetGlossaryActGroupFunc() SAL_OVERRIDE; // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ); + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; - virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ); + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE; }; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 4f3a78af1feb..bacc89652263 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -64,11 +64,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 01d866b620cb..b1941e8608a6 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -63,11 +63,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } }; diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 59201444817f..aa8f6de4621d 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -55,9 +55,9 @@ class SwLabPreview : public Window SwLabItem aItem; - virtual void Paint(const Rectangle&); + virtual void Paint(const Rectangle&) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void DrawArrow(const Point& rP1, const Point& rP2, bool bArrow); @@ -109,11 +109,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();} }; diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index d07a309c1676..1b30708b33a1 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -60,11 +60,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; inline Printer* GetPrt() { return (pPrinter); } }; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 14c9c20c8845..1f89e60c768b 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -97,8 +97,8 @@ public: SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg); ~SwXSelChgLstnr_Impl(); - virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception); - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; }; SwXSelChgLstnr_Impl::SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg) : diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 57b5959e9af5..c4e7d794da6c 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -65,11 +65,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} @@ -117,10 +117,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; class SwPrivateDataPage : public SfxTabPage @@ -155,10 +155,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; class SwBusinessDataPage : public SfxTabPage @@ -191,10 +191,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index e26f5fd037ef..4d92ac11fa05 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -24,7 +24,7 @@ class SwFldRefTreeListBox : public SvTreeListBox { protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwFldRefTreeListBox(Window* pParent, WinBits nStyle); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index a446ae3a0bd1..916afe4afafa 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -65,7 +65,7 @@ class SwFldDBPage : public SwFldPage using SwFldPage::SetWrtShell; protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldDBPage(Window* pParent, const SfxItemSet& rSet); @@ -74,10 +74,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; void ActivateMailMergeAddress(); void SetWrtShell(SwWrtShell& rSh); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 464e1ecbf053..be263ebcd079 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -56,7 +56,7 @@ class SwFldDokInfPage : public SwFldPage sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet); @@ -65,10 +65,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index ec6ec8179dcd..c62820ef7a60 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -58,7 +58,7 @@ class SwFldDokPage : public SwFldPage sal_Int32 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldDokPage(Window* pWindow, const SfxItemSet& rSet); @@ -67,10 +67,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 032fb4c94710..4a4b2e2aa583 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -80,7 +80,7 @@ class SwFldFuncPage : public SwFldPage OUString TurnMacroString(const OUString &rMacro); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldFuncPage(Window* pParent, const SfxItemSet& rSet); @@ -89,10 +89,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 791d4e81e173..719e701cee09 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -82,7 +82,7 @@ public: virtual ~SwFldPage(); - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; inline SwFldMgr& GetFldMgr() { return m_aMgr; } void SetWrtShell( SwWrtShell* m_pWrtShell ); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 99414d70f9c9..7f7e8f90d46b 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -74,7 +74,7 @@ class SwFldRefPage : public SwFldPage sal_Int32 GetSavedSelectedPos() const; protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldRefPage(Window* pParent, const SfxItemSet& rSet); @@ -83,10 +83,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index ec335bae5106..fb4f0bec5f06 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -37,7 +37,7 @@ class SelectionListBox : public ListBox { bool bCallAddSelection; - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SelectionListBox(Window* pParent, WinBits nStyle); @@ -87,7 +87,7 @@ class SwFldVarPage : public SwFldPage sal_Int32 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldVarPage(Window* pParent, const SfxItemSet& rSet); @@ -96,10 +96,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index e6ef0660b442..6e4f8ecdcce1 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -67,7 +67,7 @@ public: SwSequenceOptionDialog( Window *pParent, SwView &rV, const OUString& rSeqFldType ); virtual ~SwSequenceOptionDialog(); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; bool IsApplyBorderAndShadow( void ) { return m_pApplyBorderAndShadowCB->IsChecked(); } void SetApplyBorderAndShadow( bool bSet ) { m_pApplyBorderAndShadowCB->Check(bSet); } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 00872409616f..8009c364671d 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -166,11 +166,11 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base void SetModified() {bModified = true;} protected: - virtual bool SeekRow( long nRow ); - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); - virtual bool SaveModified(); + virtual bool SeekRow( long nRow ) SAL_OVERRIDE; + virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const SAL_OVERRIDE; + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE; + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; + virtual bool SaveModified() SAL_OVERRIDE; std::vector<long> GetOptimalColWidths() const; @@ -179,11 +179,11 @@ public: void ReadEntries(SvStream& rInStr); void WriteEntries(SvStream& rOutStr); - bool IsModified()const; + bool IsModified()const SAL_OVERRIDE; - virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const; - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class SwAutoMarkDlg_Impl : public ModalDialog @@ -554,9 +554,9 @@ class SwIndexTreeLB : public SvSimpleTable { public: SwIndexTreeLB(SvSimpleTableContainer& rParent, WinBits nBits = 0); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Resize(); - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; void setColSizes(); }; @@ -1501,8 +1501,8 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; bool IsNextControl() const {return bNextControl;} void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;} @@ -1586,8 +1586,8 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; bool IsNextControl() const {return bNextControl;} void SetPrevNextLink(const Link& rLink) {aPrevNextControlLink = rLink;} diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 88dc169e13d0..3d53c07d55ba 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -72,8 +72,8 @@ public: ~SwEndNoteOptionPage(); static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void SetShell( SwWrtShell &rShell ); }; diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 63a453cb26bc..e3bac3f614a5 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -53,9 +53,9 @@ public: void DetectRTL(SwWrtShell* pWrtShell); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; private: SwTableAutoFmt aCurData; diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index ba58458f4292..f2249f21ff52 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -66,7 +66,7 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY // XExtendedFilterDetect - virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index c975bbcd7151..ec03ce593859 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -37,16 +37,16 @@ public: virtual ~SwVbaAddin(); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAADDIN_HXX diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index bb0006f5a7d2..0d6ecb20e414 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -32,13 +32,13 @@ public: virtual ~SwVbaAddins() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaAddins_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAADDINS_HXX diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 051e9b1dc9d1..6e0abdf74c22 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -42,27 +42,27 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XApplication - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; protected: - virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAPPLICATION_HXX diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 6d7975fa3932..6db5ee674e3f 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -39,11 +39,11 @@ public: virtual ~SwVbaAutoTextEntry(); // XAutoTextEntry - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; /* class SwVbaAutoTextEntries */ @@ -59,13 +59,13 @@ public: virtual ~SwVbaAutoTextEntries() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaAutoTextEntries_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAUTOTEXTENTRY_HXX diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index f764ef7303b2..38fa40c37d00 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -44,15 +44,15 @@ public: virtual ~SwVbaBookmark(); // Methods - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABOOKMARK_HXX diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index ee0b1bacee70..75484d9abc4b 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -36,7 +36,7 @@ class BookmarksEnumeration : public EnumerationHelperImpl public: BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); OUString aName = xNamed->getName(); @@ -59,20 +59,20 @@ public: mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return mxIndexAccess->getElementType(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return mxIndexAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->getElementType(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->hasElements(); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxNameAccess->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if( mxNameAccess->hasByName( aName ) ) { @@ -95,11 +95,11 @@ public: return sal_False; } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->getCount(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { return mxIndexAccess->getByIndex( Index ); } diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index 11a60f1fc273..3aad9114591d 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -46,22 +46,22 @@ public: static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaBookmarks_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // XBookmarks - virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABOOKMARKS_HXX diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 33ac997c4226..d12be6df7ffb 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -136,12 +136,12 @@ private: } SwVbaBorder(); // no impl protected: - virtual OUString getServiceImplName() + virtual OUString getServiceImplName() SAL_OVERRIDE { return OUString("SwVbaBorder"); } - virtual css::uno::Sequence<OUString> getServiceNames() + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE { static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) @@ -154,7 +154,7 @@ protected: public: SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nLineStyle = word::WdLineStyle::wdLineStyleNone; table::BorderLine aBorderLine; @@ -175,7 +175,7 @@ public: } return uno::makeAny( nLineStyle ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the word line styles @@ -255,11 +255,11 @@ public: { } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return SAL_N_ELEMENTS( supportedIndexTable ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nIndex = getTableIndex( Index ); @@ -270,11 +270,11 @@ public: } throw lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XBorder>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -292,12 +292,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index d08f486138ce..764b889274e4 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -31,24 +31,24 @@ class VbaPalette; class SwVbaBorders : public SwVbaBorders_BASE { // XEnumerationAccess - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette ); virtual ~SwVbaBorders() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABORDERS_HXX diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 8a31bfc5ad60..633d732a8e62 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -38,20 +38,20 @@ public: virtual ~SwVbaCell(); // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACELL_HXX diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 196a8a1b0273..7526814043dd 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -36,12 +36,12 @@ public: CellsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { @@ -68,11 +68,11 @@ public: } virtual ~CellCollectionHelper() {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mnRight - mnLeft + 1 ) * ( mnBottom - mnTop + 1 ); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -88,16 +88,16 @@ public: throw css::lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XCell>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new CellsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index 0b0d49cedba8..d1c5912f397a 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -38,25 +38,25 @@ public: virtual ~SwVbaCells() {} // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaCells_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACELLS_HXX diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 5f2070158d63..26aadabd9062 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -40,15 +40,15 @@ public: virtual ~SwVbaColumn(); // Methods - virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACOLUMN_HXX diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index 2cd51bc6dd11..596318db67fc 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -41,12 +41,12 @@ public: { mxIndexAccess.set( mxTextTable->getColumns(), uno::UNO_QUERY ); } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index d356b1bc2f71..74533ade2d97 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -44,21 +44,21 @@ public: SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw ( css::uno::RuntimeException ); virtual ~SwVbaColumns() {} - virtual sal_Int32 SAL_CALL getWidth( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getWidth( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaColumns_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACOLUMNS_HXX diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index f8737ed1e0e9..d07a0308c125 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~SwVbaDialog() {} // Methods - virtual OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADIALOG_HXX diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index 8dd4c75f3c99..486a547b769f 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -35,11 +35,11 @@ public: virtual ~SwVbaDialogs() {} // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADIALOGS_HXX diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index 6fc4eb9ffa23..c3e3f8cfa1c6 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -41,53 +41,53 @@ public: virtual ~SwVbaDocument(); // XDocument - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUpdateStylesOnOpen( ::sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoHyphenation( ::sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUpdateStylesOnOpen( ::sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoHyphenation( ::sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; using VbaDocumentBase::Protect; - virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintPreview( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClosePrintPreview( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintPreview( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClosePrintPreview( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENT_HXX diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 4963ba7578f1..07094554a95a 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -88,7 +88,7 @@ public: BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE { if ( rPropName == "EditingDuration" ) { @@ -149,7 +149,7 @@ public: return getUserDefinedProperties()->getPropertyValue(rPropName); } } - virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) SAL_OVERRIDE { if ("EditingDuration" == rPropName) { @@ -269,12 +269,12 @@ public: CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE { return getUserDefinedProperties()->getPropertyValue(rPropName); } virtual void setPropertyValue( - const OUString& rPropName, const uno::Any& rValue) + const OUString& rPropName, const uno::Any& rValue) SAL_OVERRIDE { return getUserDefinedProperties()->setPropertyValue(rPropName, rValue); } @@ -290,7 +290,7 @@ public: mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW ); mpDocShell = word::getDocShell( xModel ); } - virtual uno::Any getPropertyValue( const OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE { try { @@ -335,7 +335,7 @@ public: return aReturn; } - virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) SAL_OVERRIDE { uno::Sequence< beans::NamedValue > stats( m_xDocProps->getDocumentStatistics()); @@ -449,22 +449,22 @@ protected: public: SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); // XDocumentProperty - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) { return OUString("Value"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } // XHelperInterface - virtual OUString getServiceImplName(); - virtual uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty @@ -473,14 +473,14 @@ public: SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); - virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -647,11 +647,11 @@ class DocPropEnumeration : public DocPropEnumeration_BASE public: DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mIt != mDocProps.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -683,11 +683,11 @@ protected: } } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mDocProps.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) SAL_OVERRIDE { // correct the correct by the base class for 1 based indices DocProps::iterator it = mDocProps.find( ++Index ); @@ -695,7 +695,7 @@ protected: throw lang::IndexOutOfBoundsException(); return uno::makeAny( it->second ); } - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -703,7 +703,7 @@ protected: return uno::Any( it->second ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > aNames( getCount() ); OUString* pName = aNames.getArray(); @@ -713,7 +713,7 @@ protected: return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { DocPropsByName::iterator it = mNamedDocProps.find( aName ); if ( it == mNamedDocProps.end() ) @@ -721,15 +721,15 @@ protected: return sal_True; } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<XDocumentProperty>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mDocProps.size() > 0; } - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new DocPropEnumeration( mDocProps ); } @@ -803,12 +803,12 @@ public: uno::UNO_SET_THROW); }; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) SAL_OVERRIDE { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); if ( Index >= aProps.getLength() ) @@ -818,7 +818,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -827,7 +827,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); uno::Sequence< OUString > aNames( aProps.getLength() ); @@ -839,24 +839,24 @@ public: return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { OSL_TRACE("hasByName(%s) returns %d", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<XDocumentProperty>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0; } - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // create a map of properties ( the key doesn't matter ) OSL_TRACE("Creating an enumeration"); diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 57e43b44198e..21d254581c77 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -34,16 +34,16 @@ public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties @@ -51,9 +51,9 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties public: SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); + virtual OUString getServiceImplName() SAL_OVERRIDE; }; #endif /* SW_VBA_DOCUMENTPROPERTY_HXX */ diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index d3747e935fae..6b40b3de0427 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -70,7 +70,7 @@ class DocumentEnumImpl : public EnumerationHelperImpl public: DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getDocument( m_xContext, xDoc, m_aApplication ); diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 83eda1d9fec0..9025c1013448 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -34,18 +34,18 @@ public: virtual ~SwVbaDocuments() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaDocuments_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index 8927a978f121..dfe01124b875 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -31,10 +31,10 @@ public: virtual ~SwVbaEventsHelper(); protected: - virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); - virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 9a39d9c3586d..ee593bc077f4 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -241,11 +241,11 @@ public: FieldEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( xEnumeration ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -266,10 +266,10 @@ public: mxEnumerationAccess.set( xSupp->getTextFields(), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return mxEnumerationAccess->getElementType(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return mxEnumerationAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumerationAccess->getElementType(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumerationAccess->hasElements(); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); sal_Int32 nCount = 0; @@ -280,7 +280,7 @@ public: } return nCount; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -298,7 +298,7 @@ public: throw lang::IndexOutOfBoundsException(); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) ); diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 4bc82f8f4140..7a872d01bdb7 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -34,10 +34,10 @@ class SwVbaField : public SwVbaField_BASE public: SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); - virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; // *** SwVbaFields *********************************************** @@ -55,17 +55,17 @@ private: public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); // XFields - virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index a5d8902a4dab..e554d87da002 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -58,36 +58,36 @@ public: virtual ~SwVbaFind(); // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setForward( ::sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormat( ::sal_Bool _format ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchCase( ::sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchWildcards( ::sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setForward( ::sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormat( ::sal_Bool _format ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchCase( ::sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchWildcards( ::sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual ::sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAFIND_HXX diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 6fd0e34b847f..2021b7820a93 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -32,20 +32,20 @@ public: virtual ~SwVbaFont(){} // Attributes - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbaformfields.hxx b/sw/source/ui/vba/vbaformfields.hxx index e6990ff4935b..860069e44de2 100644 --- a/sw/source/ui/vba/vbaformfields.hxx +++ b/sw/source/ui/vba/vbaformfields.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaFormFields() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaFormFields_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAFORMFIELDS_HXX diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 8bb50f7ac2b4..6b4c125dc1e5 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -37,11 +37,11 @@ public: virtual ~SwVbaFrame(); // Methods - virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAFRAME_HXX diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index bfa1ca2856a9..dcd1b604d89d 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -39,12 +39,12 @@ public: FramesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : mxParent( xParent ), mxContext( xContext), mxIndexAccess( xIndexAccess ), mxModel( xModel ), nCurrentPos(0) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nCurrentPos < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx index 8810c9e6b2dd..fb3f3b06c78a 100644 --- a/sw/source/ui/vba/vbaframes.hxx +++ b/sw/source/ui/vba/vbaframes.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaFrames() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaFrames_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 92df9b43825c..d98d55c34e45 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -48,24 +48,24 @@ public: virtual ~SwVbaGlobals(); // XGlobals - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiServiceFactory - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAGLOBALS_HXX diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 489127c0ed44..fb28fb3caa49 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -39,15 +39,15 @@ public: virtual ~SwVbaHeaderFooter(){} // Attributes - virtual ::sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAHEADERFOOTER_HXX diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 57909c49e216..31cf0c6a0498 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -39,22 +39,22 @@ public: ~HeadersFootersIndexAccess(){} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // first page, evenpages and primary page return 3; } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( Index < 1 || Index > 3 ) throw container::NoSuchElementException(); return uno::makeAny( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( mxParent, mxContext, mxModel, mxPageStyleProps, mbHeader, Index ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XHeaderFooter>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -66,12 +66,12 @@ class HeadersFootersEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters ) : pHeadersFooters( _pHeadersFooters ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < pHeadersFooters->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < pHeadersFooters->getCount() ) return pHeadersFooters->Item( uno::makeAny( ++nIndex ), uno::Any() ); diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index b89fd03ee6c6..8d8253dfa2b2 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -36,16 +36,16 @@ public: SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader ); virtual ~SwVbaHeadersFooters() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& )throw (css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& )throw (css::uno::RuntimeException) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaHeadersFooters_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAHEADERSFOOTERS_HXX diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index 12762c77b9b7..cb021f1774a4 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -38,12 +38,12 @@ public: virtual ~SwVbaListFormat(); // Methods - virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTFORMAT_HXX diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index e582e6cba074..1d5104256849 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -29,12 +29,12 @@ class ListGalleriesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) : pListGalleries( pGalleries ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListGalleries->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pListGalleries->getCount() ) return pListGalleries->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx index 6853c5546cb6..175176336217 100644 --- a/sw/source/ui/vba/vbalistgalleries.hxx +++ b/sw/source/ui/vba/vbalistgalleries.hxx @@ -35,16 +35,16 @@ public: SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc ) throw (css::uno::RuntimeException); virtual ~SwVbaListGalleries() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaListGalleries_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTGALLERIES_HXX diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 720c4691ceeb..9b821fce4d21 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -37,11 +37,11 @@ public: virtual ~SwVbaListGallery(); // Methods - virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTGALLERY_HXX diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index 9f850fe9030a..eabe9b743f95 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -38,33 +38,33 @@ public: virtual ~SwVbaListLevel(); // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTLEVEL_HXX diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index b081cd02ce9c..5b374e235141 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -29,12 +29,12 @@ class ListLevelsEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels( pLevels ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListLevels->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pListLevels->getCount() ) return pListLevels->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index f4285eda59af..7b50c2a61298 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -35,16 +35,16 @@ public: SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef pHelper ) throw ( css::uno::RuntimeException ); virtual ~SwVbaListLevels() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaListLevels_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTLEVELS_HXX diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index a9b831e6adf9..dc37c68bf84b 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -39,11 +39,11 @@ public: void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException ); // Methods - virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTTEMPLATE_HXX diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index ef84d8e690c7..d7c1b37869a2 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -28,12 +28,12 @@ class ListTemplatesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) : pListTemplates( pTemplates ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListTemplates->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pListTemplates->getCount() ) return pListTemplates->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index 64c56491bbc7..f2a4e78d1b6f 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -36,16 +36,16 @@ public: SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (css::uno::RuntimeException); virtual ~SwVbaListTemplates() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaListTemplates_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTTEMPLATES_HXX diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index b0d9b9e0c308..b1feafe551ab 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -37,43 +37,43 @@ public: virtual ~SwVbaOptions(); // Attributes - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplaceSelection( ::sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMapPaperSize( ::sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplaceSelection( ::sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMapPaperSize( ::sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //PropListener - virtual void setValueEvent( const css::uno::Any& value ); - virtual css::uno::Any getValueEvent(); + virtual void setValueEvent( const css::uno::Any& value ) SAL_OVERRIDE; + virtual css::uno::Any getValueEvent() SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAOPTIONS_HXX diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index fdc6dd20a3a5..abac682b4321 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -41,20 +41,20 @@ public: virtual ~SwVbaPageSetup(){} // Attributes - virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 896bc3cc404f..55c31da23a3b 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -57,12 +57,12 @@ public: DefaultPalette(){} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return SAL_N_ELEMENTS(ColorTable); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -70,11 +70,11 @@ public: } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::getCppuType( (sal_Int32*)0 ); } - virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index 06784dac79d0..6c248a7b0989 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -36,12 +36,12 @@ public: virtual ~SwVbaPane(); // Methods - virtual css::uno::Any SAL_CALL View( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL View( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPANE_HXX diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index c38fb7d6be4e..b0bd993c63bc 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -36,21 +36,21 @@ public: ~PanesIndexAccess(){} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return 1; } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( Index != 1 ) throw container::NoSuchElementException(); return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XPane>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -62,12 +62,12 @@ class PanesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 16925ec36283..00030ac9decc 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaPanes() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaPanes_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPANES_HXX diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 7dba6ba1fa9d..1a6c0915f905 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -90,10 +90,10 @@ public: { } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return sal_True; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<text::XTextRange>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nCount = 0; uno::Reference< container::XEnumeration > xParEnum = getEnumeration(); @@ -107,7 +107,7 @@ public: } return nCount; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if( Index < getCount() ) { @@ -127,7 +127,7 @@ public: throw lang::IndexOutOfBoundsException(); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getEnumeration(); } diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 7ae4a74de57f..b03491059f1c 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -40,13 +40,13 @@ public: virtual ~SwVbaParagraph(); // XParagraph - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getStyle() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; /* class SwVbaParagraphs */ @@ -61,13 +61,13 @@ public: virtual ~SwVbaParagraphs() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaParagraphs_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPARAGRAPH_HXX diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index f99bf8431e66..e4f4071fc30c 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -47,42 +47,42 @@ public: virtual ~SwVbaParagraphFormat(); // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPARAGRAPHFORMAT_HXX diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index 3783bc1462d9..af3d90ea5350 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -50,42 +50,42 @@ public: virtual ~SwVbaRange(); css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; } - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::text::XText > getXText() const { return mxText; } void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; } void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException); // Attribute - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBARANGE_HXX diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index 68a24def79e7..804733859b11 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -36,15 +36,15 @@ public: virtual ~SwVbaReplacement(); // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //Methods - virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREPLACEMENT_HXX diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index cb8e59ac03ac..249f4eb6037e 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -39,12 +39,12 @@ public: virtual ~SwVbaRevision(); // Methods - virtual void SAL_CALL Accept( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Accept( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISION_HXX diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 632292c43458..8a07e0df500a 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -35,11 +35,11 @@ class RedlinesEnumeration : public RevisionEnumeration_BASE RevisionMap::iterator mIt; public: RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap( sMap ), mIt( mRevisionMap.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mRevisionMap.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -55,11 +55,11 @@ public: RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException); // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return ( !mRevisionMap.empty() ); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<beans::XPropertySet>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !mRevisionMap.empty() ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) { return mRevisionMap.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mRevisionMap.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -68,7 +68,7 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const u } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new RedlinesEnumeration( mRevisionMap ); } @@ -96,7 +96,7 @@ class RevisionsEnumeration : public EnumerationHelperImpl public: RevisionsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< beans::XPropertySet > xRevision( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( m_xParent, m_xContext, m_xModel, xRevision ) ) ); diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index 78e9b3003b20..78bf3c8bbd0e 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -38,17 +38,17 @@ public: virtual ~SwVbaRevisions() {} // Methods - virtual void SAL_CALL AcceptAll( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL RejectAll( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL AcceptAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL RejectAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaRevisions_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index 9e1566683ca4..1a54abc46038 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -40,20 +40,20 @@ public: virtual ~SwVbaRow(); // Attributes - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAROW_HXX diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index ea16a3076038..e916e7db536c 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -43,12 +43,12 @@ public: { mxIndexAccess.set( mxTextTable->getRows(), uno::UNO_QUERY ); } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx index c4d33108e5e0..6a14a89c1542 100644 --- a/sw/source/ui/vba/vbarows.hxx +++ b/sw/source/ui/vba/vbarows.hxx @@ -48,29 +48,29 @@ public: virtual ~SwVbaRows() {} // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaRows_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAROWS_HXX diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index 2bde8049bb22..36ee9ee7ba89 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -36,17 +36,17 @@ public: virtual ~SwVbaSection(); // Attributes - virtual ::sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setProtectedForForms( ::sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setProtectedForForms( ::sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASECTION_HXX diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 4b949de0700c..709844bf048a 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -38,12 +38,12 @@ class SectionEnumeration : public SectionEnumeration_BASE public: SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mxSections.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( hasMoreElements() ) return uno::makeAny( *mIt++ ); @@ -91,11 +91,11 @@ public: ~SectionCollectionHelper(){} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxSections.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -103,16 +103,16 @@ public: uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XSection>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new SectionEnumeration( mxSections ); } @@ -124,7 +124,7 @@ class SectionsEnumWrapper : public EnumerationHelperImpl public: SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) ); diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index 461212c7696a..5864933d498e 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -39,15 +39,15 @@ public: virtual ~SwVbaSections() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // SwVbaSections_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASECTIONS_HXX diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index 29b170ac5b83..6703a98b83d9 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -54,60 +54,60 @@ public: virtual ~SwVbaSelection(); // Attribute - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Copy( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL CopyAsPicture( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Paste( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Copy( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL CopyAsPicture( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Paste( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL SplitTable() throw (css::uno::RuntimeException, - std::exception); - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASELECTION_HXX diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index 3a9c87e57d4c..54e1983c4a4c 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -44,29 +44,29 @@ public: static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Name"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Name"); } // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SW_VBA_AXIS_HXX diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 6b0222c4bd7f..c721ac96ed7d 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -174,20 +174,20 @@ public: mxParaStyles.set( xStyleFamilies->getByName("ParagraphStyles"), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<style::XStyle>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return getCount() > 0; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<style::XStyle>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxParaStyles->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // search in the MSOStyleName table first for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != NULL; pTable++ ) @@ -227,12 +227,12 @@ public: } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XIndexAccess > xIndexAccess( mxParaStyles, uno::UNO_QUERY_THROW ); return xIndexAccess->getCount(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -241,7 +241,7 @@ public: return xIndexAccess->getByIndex( Index ); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { throw uno::RuntimeException("Not implemented", uno::Reference< uno::XInterface >() ); } @@ -253,12 +253,12 @@ class StylesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pStyles->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pStyles->getCount() ) return pStyles->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 69680a57657b..0a36c0b1f92c 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -30,14 +30,14 @@ class SwVbaStyles: public SwVbaStyles_BASE public: SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException ); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject(const css::uno::Any&); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index 2d1289b1428d..f43de3410de7 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -38,8 +38,8 @@ public: void Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey ); //PropListener - virtual void setValueEvent( const css::uno::Any& value ); - virtual css::uno::Any getValueEvent(); + virtual void setValueEvent( const css::uno::Any& value ) SAL_OVERRIDE; + virtual css::uno::Any getValueEvent() SAL_OVERRIDE; }; class SwVbaSystem : public SwVbaSystem_BASE @@ -52,13 +52,13 @@ public: virtual ~SwVbaSystem(); // XSystem - virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASYSTEM_HXX diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 496102dc728e..58714a38b53b 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -34,18 +34,18 @@ class SwVbaTable : public SwVbaTable_BASE public: SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException); css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; }; - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index 8949fb875c0c..0e48ffd6972a 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -39,22 +39,22 @@ public: virtual ~SwVbaTableOfContents(); // Attributes - virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABLEOFCONTENTS_HXX diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index ae94ba1194be..01b05f219d34 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -82,11 +82,11 @@ public: cachePos = mxTables.begin(); } // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxTables.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -94,17 +94,17 @@ public: return uno::makeAny( xTable ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextTable>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return getCount() > 0 ; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<text::XTextTable>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0 ; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( xTable ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > sNames( mxTables.size() ); OUString* pString = sNames.getArray(); @@ -117,7 +117,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { cachePos = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); @@ -142,11 +142,11 @@ public: TableEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(0) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mnCurIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index 4d78a5dc514c..6c78571ebe70 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -31,16 +31,16 @@ class SwVbaTables : public SwVbaTables_BASE public: SwVbaTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XTables - virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 37788ca4a271..1d2f09d3685f 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -36,12 +36,12 @@ public: TablesOfContentsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { @@ -77,11 +77,11 @@ public: virtual ~TableOfContentsCollectionHelper() {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maToc.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -89,16 +89,16 @@ public: uno::Reference< text::XDocumentIndex > xToc( maToc[Index], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XTableOfContents >( new SwVbaTableOfContents( mxParent, mxContext, mxTextDocument, xToc ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XTableOfContents>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new TablesOfContentsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx index b9ba4a1baae7..94eba25a16fb 100644 --- a/sw/source/ui/vba/vbatablesofcontents.hxx +++ b/sw/source/ui/vba/vbatablesofcontents.hxx @@ -38,16 +38,16 @@ public: virtual ~SwVbaTablesOfContents() {} // Methods - virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaTablesOfContents_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABLESOFCONTENTS_HXX diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index 9c646517e060..ea722af2d16e 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -37,8 +37,8 @@ public: virtual ~SwVbaTabStop(); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABSTOP_HXX diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index f81675c220f4..eeb835a68e5f 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -48,12 +48,12 @@ public: TabStopsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { @@ -79,11 +79,11 @@ public: virtual ~TabStopCollectionHelper() {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maTabStops.getLength(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -91,16 +91,16 @@ public: const style::TabStop* pTabs = maTabStops.getConstArray(); return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext, mxParaProps, pTabs[ Index ] ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XTabStop>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new TabStopsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx index 2b6bb59d5782..f8bd0dd65e89 100644 --- a/sw/source/ui/vba/vbatabstops.hxx +++ b/sw/source/ui/vba/vbatabstops.hxx @@ -38,17 +38,17 @@ public: virtual ~SwVbaTabStops() {} // Methods - virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearAll( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaTabStops_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABSTOPS_HXX diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 1937428826d3..8678f44a1a4d 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -35,12 +35,12 @@ public: virtual ~SwVbaTemplate(); // XTemplate - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATEMPLATE_HXX diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index b773cfb7df3a..fa7469010634 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -38,15 +38,15 @@ public: virtual ~SwVbaVariable(); // XVariable - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVARIABLE_HXX diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index dd77e1b71ad7..443bbad436c4 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -38,16 +38,16 @@ public: virtual ~SwVbaVariables() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaVariables_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // XVariables - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVARIABLES_HXX diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index d8eac8164cca..3cbeefac2eaa 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -44,18 +44,18 @@ public: virtual ~SwVbaView(); // XView - virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVIEW_HXX diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 03c3ad45018a..7ac5908aff3d 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -38,18 +38,18 @@ public: throw (css::uno::RuntimeException); // Attributes - virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAWINDOW_HXX diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index de17ef6948ee..14a701d3f21d 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -41,21 +41,21 @@ private: public: SwVbaWrapFormat( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception); - - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAWRAPFORMAT_HXX |