diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /sc/source/ui | |
parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (diff) |
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.
In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.
Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'sc/source/ui')
41 files changed, 74 insertions, 74 deletions
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 09781152d7c2..779d166525d2 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -137,14 +137,14 @@ private: const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); protected: - virtual OUString SAL_CALL GetNote(void) + OUString SAL_CALL GetNote(void) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL GetAllDisplayNote(void) + OUString SAL_CALL GetAllDisplayNote(void) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getShadowAttrs(void) + OUString SAL_CALL getShadowAttrs(void) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getBorderAttrs(void) + OUString SAL_CALL getBorderAttrs(void) throw (::com::sun::star::uno::RuntimeException); public: const ScAddress& GetCellAddress() const { return maCellAddress; } diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 7cad584e7a09..0eecb33385b7 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -79,7 +79,7 @@ protected: virtual ~ScAccessibleContextBase(void); public: - virtual bool SAL_CALL isShowing( ) + bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException); virtual bool SAL_CALL isVisible() @@ -292,7 +292,7 @@ protected: bool IsDefunc() const { return rBHelper.bDisposed; } - virtual void IsObjectValid() const + void IsObjectValid() const throw (::com::sun::star::lang::DisposedException); /// Use this method to set initial Name without notification diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index a26a8739d7be..74753391a62c 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -81,9 +81,9 @@ public: /** Sends a caret changed event to all listeners. */ virtual void SendCaretEvent(); /** Sends a visible area changed event to all listeners. */ - virtual void SendVisibleEvent(); + void SendVisibleEvent(); /** Sends a selection changed event to all listeners. */ - virtual void SendSelectionEvent(); + void SendSelectionEvent(); /** Sends a table model changed event for changed cell contents to all listeners. */ virtual void SendTableUpdateEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn, bool bAllRows ); /** Sends a table model changed event for an inserted column to all listeners. */ diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 3d470a2fc4c6..b9c2fdf85a4d 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -64,9 +64,9 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; - virtual void LostFocus(); + void LostFocus(); - virtual void GotFocus(); + void GotFocus(); ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 55983fcf0be8..9ec6ecb60195 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -89,8 +89,8 @@ public: void CompleteSelectionChanged(bool bNewState); - virtual void LostFocus(); - virtual void GotFocus(); + void LostFocus(); + void GotFocus(); void BoundingBoxChanged(); void VisAreaChanged(); diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 541450ac06bc..e6d65f7654ea 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -51,7 +51,7 @@ public: virtual SvxTextForwarder* GetTextForwarder() = 0; virtual SvxViewForwarder* GetViewForwarder() = 0; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) = 0; - virtual SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } + SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } virtual void UpdateData() = 0; virtual void SetDoUpdate(bool bValue) = 0; diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index eaa1d9cb84c9..7812674a351c 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -60,7 +60,7 @@ public: void RemoveEntryForItem(ScItemValue* pItemValue); - virtual bool HasEntry(SvTreeListEntry* pEntry); + bool HasEntry(SvTreeListEntry* pEntry); protected: virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget); diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index ce60a44db005..520ec223a784 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -38,7 +38,7 @@ public: virtual void SetActive() SAL_OVERRIDE; protected: - virtual void CalculateInputAndWriteToOutput(); + void CalculateInputAndWriteToOutput(); virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0; virtual sal_Int16 GetUndoNameId() = 0; diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 682197c01e02..db4514ab49f9 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -38,7 +38,7 @@ public: virtual void SetActive() SAL_OVERRIDE; protected: - virtual void CalculateInputAndWriteToOutput(); + void CalculateInputAndWriteToOutput(); virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0; virtual sal_Int16 GetUndoNameId() = 0; diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 8a80bb201bee..6aceb0b8d8c5 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -103,10 +103,10 @@ public: DataCellIterator(ScRange aInputRange, bool aByColumn); virtual ~DataCellIterator(); - virtual bool hasNext(); - virtual ScAddress get(); - virtual void next(); - virtual ScAddress getRelative(int aDelta); + bool hasNext(); + ScAddress get(); + void next(); + ScAddress getRelative(int aDelta); }; class DataRangeIterator @@ -123,7 +123,7 @@ public: virtual ScRange get() = 0; virtual void next() = 0; virtual void reset() = 0; - virtual sal_Int32 index(); + sal_Int32 index(); virtual DataCellIterator iterateCells() = 0; }; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 945e36e0a3ac..8f476190b6b5 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -127,7 +127,7 @@ private: DECL_LINK( UpdateFocusHdl, void* ); protected: - virtual bool DoClose( sal_uInt16 nId ); + bool DoClose( sal_uInt16 nId ); void SetDispatcherLock( bool bLock ); diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 7de20d939880..4900d78309a0 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.hxx @@ -45,7 +45,7 @@ public: void ExecuteExportAsGraphic(SfxRequest& rReq); void GetExportAsGraphicState(SfxItemSet &rSet); - virtual void HandleSelectionChange(void); + void HandleSelectionChange(void); }; #endif diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index ee25532926b3..886528614b21 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -55,7 +55,7 @@ public: bool CondFormatsChanged() { return mbModified;} - virtual bool IsInRefMode() const; + bool IsInRefMode() const; private: PushButton *m_pBtnAdd; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 1f4793daff18..5e7dd488662d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -183,8 +183,8 @@ public: #if ENABLE_TELEPATHY SAL_DLLPRIVATE ScCollaboration* GetCollaboration(); #endif - virtual void Activate(); - virtual void Deactivate(); + void Activate(); + void Deactivate(); virtual ::svl::IUndoManager* GetUndoManager() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index d19cb263a746..e948e2d8e67d 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -161,7 +161,7 @@ public: const OUString& rFilter); static void CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle ); - virtual void SyncForGrid( SdrObject* pObj ); + void SyncForGrid( SdrObject* pObj ); }; #endif diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 7ac4181191dc..3798998b9d1c 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -91,7 +91,7 @@ protected: virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Resizing( Size& rSize ) SAL_OVERRIDE; - virtual void SetSize(); + void SetSize(); virtual void ToggleFloatingMode() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index bd86eff3efe8..692090ed6aab 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -73,11 +73,11 @@ public: void SetMouseButtonCode(sal_uInt16 nNew) { if(nNew != mnCode) mnCode = nNew; } sal_uInt16 GetMouseButtonCode() const { return mnCode; } - virtual void Paint(const Rectangle&, vcl::Window*) {} + void Paint(const Rectangle&, vcl::Window*) {} - virtual void DoCut(); - virtual void DoCopy(); - virtual void DoPaste(); + void DoCut(); + void DoCopy(); + void DoPaste(); // Mouse- & Key-Events; return value=TRUE: Event was processed virtual bool KeyInput(const KeyEvent& rKEvt); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index fe43cf2d0385..1e61b9591a2c 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -287,7 +287,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou protected: using Window::Resize; - virtual void Resize( const Size& rSize ); + void Resize( const Size& rSize ); virtual void PrePaint() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; @@ -383,7 +383,7 @@ public: void DoInvertRect( const Rectangle& rPixel ); void CheckNeedsRepaint(); - virtual void SwitchView(); + void SwitchView(); void UpdateDPFromFieldPopupMenu(); bool UpdateVisibleRange(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 0c04545e1478..a1c9478ff104 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -253,7 +253,7 @@ public: void SetFormulaMode( bool bSet ); - virtual bool IsInputActive(); + bool IsInputActive(); EditView* GetEditView(); void TextGrabFocus(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 29da9a69c1ed..6a976e9b7409 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -302,7 +302,7 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resizing( Size& rSize ); + void Resizing( Size& rSize ); public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, @@ -314,7 +314,7 @@ public: void CursorPosChanged(); - virtual SfxChildAlignment + SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index aff49e1f3f6c..b451e730f3cf 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.hxx @@ -43,7 +43,7 @@ public: ScOleObjectShell(ScViewData* pData); virtual ~ScOleObjectShell(); - virtual void HandleSelectionChange(); + void HandleSelectionChange(); }; #endif diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 2d0f7ea502e6..ca46dcad358a 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -158,7 +158,7 @@ public: FmFormView* GetDrawView() { return pDrawView; } - virtual void SwitchView(); + void SwitchView(); SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark); const ScMarkData::MarkedTabsType& GetSelectedTabs() const { return maSelectedTabs; } diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 660812fea376..38572d28d0f3 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -68,7 +68,7 @@ protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; - virtual OUString GetDescription() const; + OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index b1451d5ff54d..fdb8697e41b3 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -54,10 +54,10 @@ class ScPrivatSplit : public Control ScPrivatSplit( vcl::Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); - virtual short GetDeltaX(); - virtual short GetDeltaY(); + short GetDeltaX(); + short GetDeltaY(); - virtual void CtrModified(); + void CtrModified(); void SetYRange(Range cRgeY); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 1187db297a40..1388bde13b5b 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -145,7 +145,7 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(Class); - virtual void ReInitDlg(); + void ReInitDlg(); }; class ScSimpleRefDlgWrapper: public SfxChildWindow diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 4c537106d36f..4e26f31c0165 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -49,7 +49,7 @@ public: /** This method makes the one from the base class public so that it can be called from the view shell when one is created. */ - virtual void InvalidateSpellDialog(); + void InvalidateSpellDialog(); protected: /** Iterate over the sentences in all text shapes and stop at the diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 9020c2184c84..6ef999235f23 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -214,7 +214,7 @@ protected: virtual OUString GetSelectionText( bool bWholeWord ) SAL_OVERRIDE; virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; - virtual OUString GetDescription() const; + OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx index 01b1d4605d30..d8880ad4716f 100644 --- a/sc/source/ui/inc/tbinsert.hxx +++ b/sc/source/ui/inc/tbinsert.hxx @@ -27,7 +27,7 @@ class ScTbxInsertCtrl : public SfxToolBoxControl sal_uInt16 nLastSlotId; using SfxToolBoxControl::Select; - virtual void Select( bool bMod1 = false ); + void Select( bool bMod1 = false ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 500e62d68c73..81947fabeda4 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -114,7 +114,7 @@ protected: virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; - virtual void StartPopup(); + void StartPopup(); public: diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index ae988e6dd84e..baecc2659d29 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -63,7 +63,7 @@ public: ScInputStatusItem( const ScInputStatusItem& rItem ); virtual ~ScInputStatusItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -154,7 +154,7 @@ public: ScSortItem( const ScSortItem& rItem ); virtual ~ScSortItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -179,7 +179,7 @@ public: ScQueryItem( const ScQueryItem& rItem ); virtual ~ScQueryItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -208,7 +208,7 @@ public: ScSubTotalItem( const ScSubTotalItem& rItem ); virtual ~ScSubTotalItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -229,7 +229,7 @@ public: ScUserListItem( const ScUserListItem& rItem ); virtual ~ScUserListItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -249,7 +249,7 @@ public: ScConsolidateItem( const ScConsolidateItem& rItem ); virtual ~ScConsolidateItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -268,7 +268,7 @@ public: ScPivotItem( const ScPivotItem& rItem ); virtual ~ScPivotItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -291,7 +291,7 @@ public: ScSolveItem( const ScSolveItem& rItem ); virtual ~ScSolveItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -310,7 +310,7 @@ public: ScTabOpItem( const ScTabOpItem& rItem ); virtual ~ScTabOpItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9fb3b77a6119..ea1d9361714f 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -201,7 +201,7 @@ public: bool SetupRefDlg(); bool RemoveRefDlg( bool bRestoreModal = true ); - virtual void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } + void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index a9ea9dce95ea..7910209bf709 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -49,7 +49,7 @@ public: /** Returns true, if VBA document events are enabled. */ static bool getDocumentEventsEnabled(); - virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XExactName virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -130,8 +130,8 @@ public: virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); + css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); + css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index ae202e42e221..01dd37728d67 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -53,7 +53,7 @@ public: virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void Activate() throw ( css::script::BasicErrorException ); + void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 91c300e069c1..79fd5e001f62 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -38,7 +38,7 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDialogs - virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); + void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 4e0c433b8469..446453d18a40 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -51,7 +51,7 @@ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet; public: void notifyRange() throw ( css::script::BasicErrorException ); - virtual css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); OUString getStyleName(); void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 3510b90c729c..12b552a8519e 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -37,7 +37,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc class ScVbaGlobals : public ScVbaGlobals_BASE { css::uno::Reference< ov::excel::XApplication > mxApplication; - virtual css::uno::Reference< + css::uno::Reference< ov::excel::XApplication > SAL_CALL getApplication() throw (css::uno::RuntimeException); public: diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index af7b8cc04c6f..11189a26a96d 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -37,8 +37,8 @@ class ScVbaName : public NameImpl_BASE OUString getContent( const formula::FormulaGrammar::Grammar eGrammar, bool prependEquals = true ); void setContent( const OUString& sContent, const formula::FormulaGrammar::Grammar eGrammar, bool removeEquals = true ); protected: - virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - virtual css::uno::Reference< ov::excel::XWorksheet > getWorkSheet() throw (css::uno::RuntimeException); + css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } + css::uno::Reference< ov::excel::XWorksheet > getWorkSheet() throw (css::uno::RuntimeException); public: ScVbaName( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRange >& xName , const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel ); @@ -62,7 +62,7 @@ public: virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); + void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index 5bba9a8d0536..96d9180be56e 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -36,7 +36,7 @@ class ScVbaNames : public ScVbaNames_BASE css::uno::Reference< css::sheet::XNamedRanges > mxNames; protected: - virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } + css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } public: ScVbaNames( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 610222625aab..64897586a5e2 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -955,7 +955,7 @@ class Dim2ArrayValueGetter : public ArrayVisitor protected: uno::Any maValue; ValueGetter& mValueGetter; - virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) + void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) { uno::Sequence< uno::Sequence< uno::Any > >& aMatrix = *( uno::Sequence< uno::Sequence< uno::Any > >* )( maValue.getValue() ); aMatrix[x][y] = aValue; diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 98c9b015c497..254a5bc831ef 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -116,7 +116,7 @@ class ScVbaRange : public ScVbaRange_BASE protected: virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) SAL_OVERRIDE; - virtual SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); + SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); public: ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException ); ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); @@ -228,7 +228,7 @@ public: virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE ; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index a250cdecdd58..30164e1013e2 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -72,9 +72,9 @@ public: virtual ~ScVbaWorksheet(); - virtual css::uno::Reference< css::frame::XModel > getModel() + css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - virtual css::uno::Reference< css::sheet::XSpreadsheet > getSheet() + css::uno::Reference< css::sheet::XSpreadsheet > getSheet() { return mxSheet; } static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( const OUString& ); |