diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/SidebarWin.hxx | 8 | ||||
-rw-r--r-- | sw/inc/SwNumberTree.hxx | 4 | ||||
-rw-r--r-- | sw/inc/dcontact.hxx | 2 | ||||
-rw-r--r-- | sw/inc/dlelstnr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 26 | ||||
-rw-r--r-- | sw/inc/docsh.hxx | 4 | ||||
-rw-r--r-- | sw/inc/expfld.hxx | 8 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fldbas.hxx | 2 | ||||
-rw-r--r-- | sw/inc/format.hxx | 2 | ||||
-rw-r--r-- | sw/inc/numrule.hxx | 2 | ||||
-rw-r--r-- | sw/inc/redline.hxx | 2 | ||||
-rw-r--r-- | sw/inc/shellio.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swcrsr.hxx | 4 | ||||
-rw-r--r-- | sw/inc/swserv.hxx | 4 | ||||
-rw-r--r-- | sw/inc/txatbase.hxx | 2 | ||||
-rw-r--r-- | sw/inc/undobj.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viscrs.hxx | 2 |
18 files changed, 40 insertions, 40 deletions
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 290f8bbc42f9..0ac7a5107cc6 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -76,7 +76,7 @@ class SwSidebarWin : public vcl::Window const long PageBorder); void SetPosAndSize(); void TranslateTopPosition(const long aAmount); - virtual void CheckMetaText(); + void CheckMetaText(); inline Point GetAnchorPos() { return mAnchorRect.Pos(); } SwEditWin* EditWin(); @@ -92,7 +92,7 @@ class SwSidebarWin : public vcl::Window long GetPostItTextHeight(); void SwitchToPostIt(sal_uInt16 aDirection); - virtual void SwitchToFieldPos(); + void SwitchToFieldPos(); virtual sal_uInt32 MoveCaret() = 0; @@ -155,8 +155,8 @@ class SwSidebarWin : public vcl::Window void ToggleInsMode(); - virtual void ActivatePostIt(); - virtual void DeactivatePostIt(); + void ActivatePostIt(); + void DeactivatePostIt(); void SetChangeTracking( const SwPostItHelper::SwLayoutStatus aStatus, const Color& aColor); diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index f9fe9b57c299..cbfa62829a4b 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -207,7 +207,7 @@ public: @retval true pNode is first child of this node @retval false else */ - virtual bool IsFirst(const SwNumberTreeNode * pNode) const; + bool IsFirst(const SwNumberTreeNode * pNode) const; /** Return if this node if the first non-phantom node in the tree. @@ -215,7 +215,7 @@ public: @retval true this node is the first non-phantom node in the tree @retval false else */ - virtual bool IsFirst() const; + bool IsFirst() const; /** Return if this node is a phantom. diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index fedf84454b19..e2230dc10c60 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -277,7 +277,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; - virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; + SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE; diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index 19c6f7aeb89e..167a61d44c76 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -69,7 +69,7 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XDictionaryListEventListener - virtual void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent) throw( ::com::sun::star::uno::RuntimeException ); /// XLinguServiceEventListener virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index f2fe7abbf447..46eb057f6e9e 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -492,10 +492,10 @@ public: IDocumentSettingAccess & getIDocumentSettingAccess(); ::sw::DocumentSettingManager & GetDocumentSettingManager(); //The implementation of the interface with some additional methods ::sw::DocumentSettingManager const& GetDocumentSettingManager() const; - virtual sal_uInt32 getRsid() const; - virtual void setRsid( sal_uInt32 nVal ); - virtual sal_uInt32 getRsidRoot() const; - virtual void setRsidRoot( sal_uInt32 nVal ); + sal_uInt32 getRsid() const; + void setRsid( sal_uInt32 nVal ); + sal_uInt32 getRsidRoot() const; + void setRsidRoot( sal_uInt32 nVal ); // IDocumentDeviceAccess IDocumentDeviceAccess const & getIDocumentDeviceAccess() const; @@ -535,17 +535,17 @@ public: ::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const; ::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager(); - virtual void SetModified(SwPaM &rPaM); - virtual bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); - virtual bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen ); + void SetModified(SwPaM &rPaM); + bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); + bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen ); // IDocumentStylePoolAccess IDocumentStylePoolAccess const & getIDocumentStylePoolAccess() const; IDocumentStylePoolAccess & getIDocumentStylePoolAccess(); // SwLineNumberInfo - virtual const SwLineNumberInfo& GetLineNumberInfo() const; - virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo); + const SwLineNumberInfo& GetLineNumberInfo() const; + void SetLineNumberInfo(const SwLineNumberInfo& rInfo); // IDocumentStatistics IDocumentStatistics const & getIDocumentStatistics() const; @@ -600,10 +600,10 @@ public: //End of Interfaces - virtual void setDocReadOnly( bool b) { mbReadOnly = b; } - virtual bool getDocReadOnly() const { return mbReadOnly; } - virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } - virtual const OUString getDocAccTitle() const { return msDocAccTitle; } + void setDocReadOnly( bool b) { mbReadOnly = b; } + bool getDocReadOnly() const { return mbReadOnly; } + void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } + const OUString getDocAccTitle() const { return msDocAccTitle; } // INextInterface here DECL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem *); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 3b3e0bec921a..913a8c5378ea 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -293,8 +293,8 @@ public: read by the binary filter: */ virtual void UpdateLinks() SAL_OVERRIDE; - virtual void setDocAccTitle( const OUString& rTitle ); - virtual const OUString getDocAccTitle() const; + void setDocAccTitle( const OUString& rTitle ); + const OUString getDocAccTitle() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > GetController(); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 5a3222313d16..93525810ca4f 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -341,11 +341,11 @@ public: virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - virtual OUString GetHelp() const; - virtual void SetHelp(const OUString & rStr); + OUString GetHelp() const; + void SetHelp(const OUString & rStr); - virtual OUString GetToolTip() const; - virtual void SetToolTip(const OUString & rStr); + OUString GetToolTip() const; + void SetToolTip(const OUString & rStr); virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 70bbe3f0e3bc..821323a9dd47 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -770,7 +770,7 @@ public: bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, const Point& _rDocPos ) const; - virtual void ToggleHeaderFooterEdit( ); + void ToggleHeaderFooterEdit( ); }; void ClearFEShellTabCols(); diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 57780e9671e4..993abd1fca10 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -350,7 +350,7 @@ public: virtual OUString GetFormula() const; - virtual void ChangeFormat(sal_uInt32 n); + void ChangeFormat(sal_uInt32 n); virtual void SetPar1(const OUString& rStr); virtual void SetPar2(const OUString& rStr); diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 6fe3f0a76c11..c54fb05f8c13 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -330,7 +330,7 @@ public: @return false, default implementation */ - virtual bool IsShadowTransparent() const; + bool IsShadowTransparent() const; //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const; diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 771b727f5534..20422e6feb27 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -76,7 +76,7 @@ public: SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); } void SetCharFmt( SwCharFmt* ); - virtual void SetCharFmtName(const OUString& rSet); + void SetCharFmtName(const OUString& rSet); virtual OUString GetCharFmtName()const SAL_OVERRIDE; //For i120928,access the cp info of graphic within bullet diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 0767fb096265..2c7e45ae1052 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -45,7 +45,7 @@ public: virtual ~SwRedlineExtraData(); virtual SwRedlineExtraData* CreateNew() const = 0; - virtual void Accept( SwPaM& rPam ) const; + void Accept( SwPaM& rPam ) const; virtual void Reject( SwPaM& rPam ) const; virtual bool operator == ( const SwRedlineExtraData& ) const; }; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index b7b33e258f11..d992909534b0 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -420,7 +420,7 @@ public: virtual void SetupFilterOptions(SfxMedium& rMedium); - virtual void SetVersion( const OUString&, long ); + void SetVersion( const OUString&, long ); virtual bool IsStgWriter() const; void SetShowProgress( bool bFlag = false ) { bShowProgress = bFlag; } diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index c39e67242c74..839face2af66 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -70,7 +70,7 @@ class SW_DLLPUBLIC SwCursor : public SwPaM using SwPaM::Find; protected: - virtual _SwCursor_SavePos* CreateNewSavePos() const; + _SwCursor_SavePos* CreateNewSavePos() const; void SaveState(); void RestoreState(); @@ -189,7 +189,7 @@ public: ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); - virtual bool IsInProtectTable( bool bMove = false, + bool IsInProtectTable( bool bMove = false, bool bChgCrsr = true ); bool IsNoCntnt() const; diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index f483342ade5d..9cc34ad1038c 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -67,8 +67,8 @@ public: bool SetData( const OUString & rMimeType, const ::com::sun::star::uno::Any& rData ); - virtual void SendDataChanged( const SwPosition& rPos ); - virtual void SendDataChanged( const SwPaM& rRange ); + void SendDataChanged( const SwPosition& rPos ); + void SendDataChanged( const SwPaM& rRange ); bool IsLinkInServer( const SwBaseLink* ) const; diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 8ac157297abc..f62ab1e9fa51 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -106,7 +106,7 @@ public: inline SfxPoolItem& GetAttr(); inline sal_uInt16 Which() const { return GetAttr().Which(); } - virtual bool operator==( const SwTxtAttr& ) const; + bool operator==( const SwTxtAttr& ) const; inline const SwFmtCharFmt &GetCharFmt() const; inline const SwFmtAutoFmt &GetAutoFmt() const; diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index f2685ff35f0d..a27ce713d389 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -77,7 +77,7 @@ protected: // the 4 methods that derived classes have to override // base implementation does nothing virtual void RepeatImpl( ::sw::RepeatContext & ); - virtual bool CanRepeatImpl( ::sw::RepeatContext & ) const; + bool CanRepeatImpl( ::sw::RepeatContext & ) const; public: // should not be public, but ran into trouble in untbl.cxx virtual void UndoImpl( ::sw::UndoRedoContext & ) = 0; virtual void RedoImpl( ::sw::UndoRedoContext & ) = 0; diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 0d9565c249ae..d4183af7c1a6 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -71,7 +71,7 @@ class SwSelPaintRects : public SwRects const SwCrsrShell* pCShell; - virtual void Paint( const Rectangle& rRect ); + void Paint( const Rectangle& rRect ); #if HAVE_FEATURE_DESKTOP sdr::overlay::OverlayObject* mpCursorOverlay; |