diff options
Diffstat (limited to 'sw/source/core/uibase')
154 files changed, 844 insertions, 844 deletions
diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx index 713d12eab1fb..21eb9e2c1e69 100644 --- a/sw/source/core/uibase/dbui/dbmgr.cxx +++ b/sw/source/core/uibase/dbui/dbmgr.cxx @@ -208,7 +208,7 @@ class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1 { SwNewDBMgr& rDBMgr; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; public: SwConnectionDisposedListener_Impl(SwNewDBMgr& rMgr); ~SwConnectionDisposedListener_Impl(); diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx index 9f240d9aa40a..9ba3200c760c 100644 --- a/sw/source/core/uibase/dbui/dbtree.cxx +++ b/sw/source/core/uibase/dbui/dbtree.cxx @@ -81,10 +81,10 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener > pWrtSh(pShell) {} ~SwDBTreeList_Impl(); - virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool HasContext(); SwWrtShell* GetWrtShell() { return pWrtSh;} diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx index 67966f12abf5..bf16a14e828a 100644 --- a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx +++ b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx @@ -164,13 +164,13 @@ public: SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg); ~SwMailDispatcherListener_Impl(); - virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher); - virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher); - virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher); + virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; + virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; + virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference< mail::XMailMessage> xMailMessage); + uno::Reference< mail::XMailMessage> xMailMessage) SAL_OVERRIDE; virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage); + uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) SAL_OVERRIDE; static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage ); }; diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx index 324b8b6d0ce9..6143905efc5a 100644 --- a/sw/source/core/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx @@ -155,8 +155,8 @@ public: SwMailMergeConfigItem_Impl(); ~SwMailMergeConfigItem_Impl(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; const Sequence< OUString> GetAddressBlocks(sal_Bool bConvertToConfig = sal_False) const; void SetAddressBlocks( diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx index 9e148f46e5f8..4e53bfacc219 100644 --- a/sw/source/core/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx @@ -163,8 +163,8 @@ public: SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ); virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); - virtual void Closed(); + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + virtual void Closed() SAL_OVERRIDE; sal_Bool WriteData( SvStream& rStrm ); diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx index 5ea13c2cfe93..d3f1ee04bcf8 100644 --- a/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx @@ -53,7 +53,7 @@ private: protected: virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( - const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: AnchorPrimitive( const basegfx::B2DPolygon& rTriangle, @@ -85,7 +85,7 @@ public: bool getShadow() const { return mbShadow; } bool getLineSolid() const { return mbLineSolid; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx index 7c86e1abe013..c53ef7a04c9b 100644 --- a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx @@ -100,7 +100,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition void implResetGeometry(); // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; private: // object's geometry diff --git a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx index c1334e8e077b..a5b38790ffbd 100644 --- a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx @@ -35,12 +35,12 @@ class AnnotationMenuButton : public MenuButton ~AnnotationMenuButton(); // overloaded <MenuButton> methods - virtual void Select(); + virtual void Select() SAL_OVERRIDE; // overloaded <Window> methods - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; private: sw::sidebarwindows::SwSidebarWin& mrSidebarWin; diff --git a/sw/source/core/uibase/docvw/OverlayRanges.hxx b/sw/source/core/uibase/docvw/OverlayRanges.hxx index ccbe668211aa..8fd7cf46edb9 100755..100644 --- a/sw/source/core/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/core/uibase/docvw/OverlayRanges.hxx @@ -40,7 +40,7 @@ namespace sw bool mbShowSolidBorder; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: static OverlayRanges* CreateOverlayRange( diff --git a/sw/source/core/uibase/docvw/PageBreakWin.cxx b/sw/source/core/uibase/docvw/PageBreakWin.cxx index 1380fdfcc469..b6a6c5ce2419 100644 --- a/sw/source/core/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/core/uibase/docvw/PageBreakWin.cxx @@ -61,7 +61,7 @@ namespace SwDashedLine( pParent, pColorFn ), m_pWin( pWin ) {}; - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; }; void SwBreakDashedLine::MouseMove( const MouseEvent& rMEvt ) diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx index efb1a5d68e27..2b9b4d2fa7f8 100644 --- a/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx +++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx @@ -45,7 +45,7 @@ private: protected: virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( - const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: ShadowPrimitive( @@ -63,7 +63,7 @@ public: const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } ShadowState getShadowState() const { return maShadowState; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx index d692ec86a75b..d0e57d043584 100644 --- a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx @@ -37,7 +37,7 @@ class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition { protected: // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; private: basegfx::B2DPoint maSecondPosition; diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx index 37829b290a5a..f6f9fafc54ce 100644 --- a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx @@ -39,16 +39,16 @@ class SidebarTxtControl : public Control SwPostItMgr& mrPostItMgr; protected: - virtual void Paint( const Rectangle& rRect); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void LoseFocus(); - virtual void RequestHelp(const HelpEvent &rEvt); - virtual OUString GetSurroundingText() const; - virtual Selection GetSurroundingTextSelection() const; + virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void RequestHelp(const HelpEvent &rEvt) SAL_OVERRIDE; + virtual OUString GetSurroundingText() const SAL_OVERRIDE; + virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; DECL_LINK( Select, Menu* ); @@ -59,13 +59,13 @@ class SidebarTxtControl : public Control SwPostItMgr& rPostItMgr ); ~SidebarTxtControl(); - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; OutlinerView* GetTextView() const; DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; } } // end of namespace sw::sidebarwindows diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx index 0ab0c43a33ae..5bbd2e8eef2e 100644 --- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx @@ -43,15 +43,15 @@ class SidebarTextEditSource : public SvxEditSource, SidebarTextEditSource( SidebarTxtControl& rSidebarTxtControl ); virtual ~SidebarTextEditSource(); - virtual SvxEditSource* Clone() const; + virtual SvxEditSource* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; - virtual void UpdateData(); + virtual void UpdateData() SAL_OVERRIDE; - virtual SfxBroadcaster& GetBroadcaster() const; + virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; DECL_LINK( NotifyHdl, EENotify* ); private: @@ -134,24 +134,24 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; private: SidebarTxtControl& mrSidebarTxtControl; diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx index 051c5ecd7758..b8078c7e1c84 100644 --- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx +++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx @@ -33,7 +33,7 @@ class SidebarTxtControlAccessible : public VCLXWindow virtual ~SidebarTxtControlAccessible(); virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; private: SidebarTxtControl& mrSidebarTxtControl; diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx index 99ba832a60db..c9201556017b 100644 --- a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx +++ b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx @@ -54,7 +54,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent } virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw (css::uno::RuntimeException, std::exception) + getAccessibleParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { osl::MutexGuard aGuard(maMutex); @@ -69,7 +69,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent return xAccParent; } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx index c86516d5ce99..739865e609db 100644 --- a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx +++ b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx @@ -39,7 +39,7 @@ class SidebarWinAccessible : public VCLXWindow virtual ~SidebarWinAccessible(); virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; void ChangeSidebarItem( const SwSidebarItem& rSidebarItem ); diff --git a/sw/source/core/uibase/docvw/srcedtw.cxx b/sw/source/core/uibase/docvw/srcedtw.cxx index 65c6f25c02c5..968f3986b3cf 100644 --- a/sw/source/core/uibase/docvw/srcedtw.cxx +++ b/sw/source/core/uibase/docvw/srcedtw.cxx @@ -215,7 +215,7 @@ private: virtual ~ChangesListener() {} virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { osl::MutexGuard g(editor_.mutex_); editor_.notifier_.clear(); @@ -223,7 +223,7 @@ private: virtual void SAL_CALL propertiesChange( css::uno::Sequence< css::beans::PropertyChangeEvent > const &) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { SolarMutexGuard g; editor_.SetFont(); diff --git a/sw/source/core/uibase/inc/DashedLine.hxx b/sw/source/core/uibase/inc/DashedLine.hxx index 14ea2ef2507d..0944767a21e4 100644 --- a/sw/source/core/uibase/inc/DashedLine.hxx +++ b/sw/source/core/uibase/inc/DashedLine.hxx @@ -22,7 +22,7 @@ public: SwDashedLine( Window* pParent, Color& ( *pColorFn )() ); ~SwDashedLine( ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx index 48ee686e8fe6..ad8a48b8109d 100644 --- a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx @@ -46,7 +46,7 @@ class DropDownFieldDialog : public SvxStandardDialog SwDropDownField* pDropField; DECL_LINK(ButtonHdl, PushButton*); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: DropDownFieldDialog( Window *pParent, SwWrtShell &rSh, SwField* pField, sal_Bool bNextButton = sal_False ); diff --git a/sw/source/core/uibase/inc/HeaderFooterWin.hxx b/sw/source/core/uibase/inc/HeaderFooterWin.hxx index 945d02de07e6..bf2a52c0bcf4 100644 --- a/sw/source/core/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/core/uibase/inc/HeaderFooterWin.hxx @@ -34,12 +34,12 @@ public: void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Select( ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Select( ) SAL_OVERRIDE; - virtual void ShowAll( bool bShow ); - virtual bool Contains( const Point &rDocPt ) const; + virtual void ShowAll( bool bShow ) SAL_OVERRIDE; + virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; bool IsHeader() { return m_bIsHeader; }; bool IsEmptyHeaderFooter( ); @@ -47,7 +47,7 @@ public: void ExecuteCommand(sal_uInt16 nSlot); - void SetReadonly( bool bReadonly ); + void SetReadonly( bool bReadonly ) SAL_OVERRIDE; private: DECL_LINK( FadeHandler, void * ); diff --git a/sw/source/core/uibase/inc/PageBreakWin.hxx b/sw/source/core/uibase/inc/PageBreakWin.hxx index 9e9ed283b182..c0eb854a1b7e 100644 --- a/sw/source/core/uibase/inc/PageBreakWin.hxx +++ b/sw/source/core/uibase/inc/PageBreakWin.hxx @@ -36,19 +36,19 @@ public: SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm ); ~SwPageBreakWin( ); - virtual void Paint( const Rectangle& rRect ); - virtual void Select( ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Activate( ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Select( ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Activate( ) SAL_OVERRIDE; void UpdatePosition( const Point* pEvtPt = NULL ); - virtual void ShowAll( bool bShow ); - virtual bool Contains( const Point &rDocPt ) const; + virtual void ShowAll( bool bShow ) SAL_OVERRIDE; + virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; const SwPageFrm* GetPageFrame( ); - void SetReadonly( bool bReadonly ); + void SetReadonly( bool bReadonly ) SAL_OVERRIDE; void Fade( bool bFadeIn ); diff --git a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx index 922841304721..7bc8dcfea56c 100644 --- a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx @@ -38,15 +38,15 @@ class SwSpellDialogChildWindow void LockFocusNotification(bool bLock); protected: - virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck); - virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck); - virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage); - virtual bool HasAutoCorrection(); - virtual bool HasGrammarChecking(); - virtual bool IsGrammarChecking(); - virtual void SetGrammarChecking(bool bOn); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) SAL_OVERRIDE; + virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; + virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) SAL_OVERRIDE; + virtual bool HasAutoCorrection() SAL_OVERRIDE; + virtual bool HasGrammarChecking() SAL_OVERRIDE; + virtual bool IsGrammarChecking() SAL_OVERRIDE; + virtual void SetGrammarChecking(bool bOn) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; public: SwSpellDialogChildWindow ( diff --git a/sw/source/core/uibase/inc/SwXFilterOptions.hxx b/sw/source/core/uibase/inc/SwXFilterOptions.hxx index 8e39c494f529..6a117372c5f1 100644 --- a/sw/source/core/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/core/uibase/inc/SwXFilterOptions.hxx @@ -55,39 +55,39 @@ public: // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception); + SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/uibase/inc/actctrl.hxx b/sw/source/core/uibase/inc/actctrl.hxx index 0111eb1de37d..d51ac3dec526 100644 --- a/sw/source/core/uibase/inc/actctrl.hxx +++ b/sw/source/core/uibase/inc/actctrl.hxx @@ -31,7 +31,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField protected: virtual void Action(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: NumEditAction( Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} @@ -47,8 +47,8 @@ class SW_DLLPUBLIC NoSpaceEdit : public Edit { OUString sForbiddenChars; protected: - virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; public: NoSpaceEdit( Window* pParent ); @@ -81,7 +81,7 @@ public: ReturnActionEdit(Window* pParent, WinBits nStyle) : Edit(pParent, nStyle){} ~ReturnActionEdit(); - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; void SetReturnActionLink(const Link& rLink) { aReturnActionLink = rLink;} diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx index 314188cc8c2f..02fe9f399ed4 100644 --- a/sw/source/core/uibase/inc/annotsh.hxx +++ b/sw/source/core/uibase/inc/annotsh.hxx @@ -66,7 +66,7 @@ public: void StateSearch(SfxItemSet &); virtual ::svl::IUndoManager* - GetUndoManager(); + GetUndoManager() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/autoedit.hxx b/sw/source/core/uibase/inc/autoedit.hxx index 94d81b771527..606489f3a2af 100644 --- a/sw/source/core/uibase/inc/autoedit.hxx +++ b/sw/source/core/uibase/inc/autoedit.hxx @@ -27,7 +27,7 @@ public: AutoEdit( Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} protected: - virtual void KeyInput( const KeyEvent& rEvent ); + virtual void KeyInput( const KeyEvent& rEvent ) SAL_OVERRIDE; }; // Implementation in autocorr.cxx diff --git a/sw/source/core/uibase/inc/barcfg.hxx b/sw/source/core/uibase/inc/barcfg.hxx index f0e05c11dde9..117fa3cff00a 100644 --- a/sw/source/core/uibase/inc/barcfg.hxx +++ b/sw/source/core/uibase/inc/barcfg.hxx @@ -30,8 +30,8 @@ public: SwToolbarConfigItem( bool bWeb ); ~SwToolbarConfigItem(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ); }; diff --git a/sw/source/core/uibase/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx index dcf59bb97efb..63c4082599e3 100644 --- a/sw/source/core/uibase/inc/bmpwin.hxx +++ b/sw/source/core/uibase/inc/bmpwin.hxx @@ -38,9 +38,9 @@ private: sal_Bool bGraphic : 1; bool bLeftAlign : 1; - virtual void Paint(const Rectangle& rRect); + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; public: BmpWindow(Window* pPar, WinBits nStyle); diff --git a/sw/source/core/uibase/inc/bookctrl.hxx b/sw/source/core/uibase/inc/bookctrl.hxx index a8ce181fd7fc..7771fb326556 100644 --- a/sw/source/core/uibase/inc/bookctrl.hxx +++ b/sw/source/core/uibase/inc/bookctrl.hxx @@ -26,12 +26,12 @@ class SwBookmarkControl : public SfxStatusBarControl { - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/core/uibase/inc/bookmark.hxx b/sw/source/core/uibase/inc/bookmark.hxx index 2c896c17d3eb..ff1179c2d9bc 100644 --- a/sw/source/core/uibase/inc/bookmark.hxx +++ b/sw/source/core/uibase/inc/bookmark.hxx @@ -35,7 +35,7 @@ class BookmarkCombo : public SwComboBox sal_Int32 GetNextSelEntryPos(sal_Int32 nPos) const; sal_Int32 GetSelEntryPos(sal_Int32 nPos) const; - virtual bool PreNotify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; public: BookmarkCombo(Window* pWin, WinBits nStyle); @@ -58,7 +58,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog DECL_LINK(ModifyHdl, BookmarkCombo *); DECL_LINK(DeleteHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwInsertBookmarkDlg(Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); diff --git a/sw/source/core/uibase/inc/break.hxx b/sw/source/core/uibase/inc/break.hxx index 00933a759b4f..6dd6356e7343 100644 --- a/sw/source/core/uibase/inc/break.hxx +++ b/sw/source/core/uibase/inc/break.hxx @@ -59,7 +59,7 @@ class SwBreakDlg: public SvxStandardDialog void CheckEnable(); protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwBreakDlg( Window *pParent, SwWrtShell &rSh ); diff --git a/sw/source/core/uibase/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx index bcd36c4594e8..871252854288 100644 --- a/sw/source/core/uibase/inc/cfgitems.hxx +++ b/sw/source/core/uibase/inc/cfgitems.hxx @@ -68,8 +68,8 @@ public: SwDocDisplayItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void operator=( const SwDocDisplayItem& ); void FillViewOptions( SwViewOption& rVOpt) const; }; @@ -104,8 +104,8 @@ public: SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void operator=( const SwElemItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -127,9 +127,9 @@ public: SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData ); SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; const OUString &GetFax() const { return sFaxName; } void SetFax( const OUString& rFax) { sFaxName = rFax; } @@ -171,8 +171,8 @@ public: SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void operator=( const SwShadowCursorItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -210,8 +210,8 @@ public: SfxPoolItem(_nWhich){}; SwTestItem( const SwTestItem& pTestItem); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/changedb.hxx b/sw/source/core/uibase/inc/changedb.hxx index 4e8e31acce58..a5d048821d66 100644 --- a/sw/source/core/uibase/inc/changedb.hxx +++ b/sw/source/core/uibase/inc/changedb.hxx @@ -52,7 +52,7 @@ class SwChangeDBDlg: public SvxStandardDialog DECL_LINK(ButtonHdl, void *); DECL_LINK(AddDBHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void UpdateFlds(); void FillDBPopup(); SvTreeListEntry* Insert(const OUString& rDBName); diff --git a/sw/source/core/uibase/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx index d233b37a9143..5b7a077e4d66 100644 --- a/sw/source/core/uibase/inc/chrdlg.hxx +++ b/sw/source/core/uibase/inc/chrdlg.hxx @@ -54,7 +54,7 @@ public: ~SwCharDlg(); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; }; class SwCharURLPage : public SfxTabPage @@ -85,8 +85,8 @@ 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; }; #endif diff --git a/sw/source/core/uibase/inc/colex.hxx b/sw/source/core/uibase/inc/colex.hxx index dc7d25b1ba73..4cb67723b036 100644 --- a/sw/source/core/uibase/inc/colex.hxx +++ b/sw/source/core/uibase/inc/colex.hxx @@ -49,7 +49,7 @@ class SW_DLLPUBLIC SwPageGridExample : public SwPageExample protected: virtual void DrawPage( const Point& rPoint, const bool bSecond, - const bool bEnabled ); + const bool bEnabled ) SAL_OVERRIDE; public: SwPageGridExample(Window* pPar) : SwPageExample(pPar), @@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwColExample : public SwPageExample protected: virtual void DrawPage( const Point& rPoint, const bool bSecond, - const bool bEnabled ); + const bool bEnabled ) SAL_OVERRIDE; public: SwColExample(Window* pPar) @@ -94,14 +94,14 @@ private: SwFmtCol m_aCols; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: SwColumnOnlyExample(Window*); void SetColumns(const SwFmtCol& rCol); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_INC_COLEX_HXX diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx index ca7c55c2e692..9102eb102152 100644 --- a/sw/source/core/uibase/inc/column.hxx +++ b/sw/source/core/uibase/inc/column.hxx @@ -81,8 +81,8 @@ public: : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { } - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -162,8 +162,8 @@ class SwColumnPage : public SfxTabPage using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; SwColumnPage(Window *pParent, const SfxItemSet &rSet); @@ -177,8 +177,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - 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; void SetFrmMode(sal_Bool bMod); void SetPageWidth(long nPageWidth); diff --git a/sw/source/core/uibase/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx index 354a625468f2..62ec96a421ea 100644 --- a/sw/source/core/uibase/inc/conarc.hxx +++ b/sw/source/core/uibase/inc/conarc.hxx @@ -36,11 +36,11 @@ public: ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function - virtual void Deactivate(); + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Deactivate() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX diff --git a/sw/source/core/uibase/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx index 96d6707b9a90..8e38ff85caa3 100644 --- a/sw/source/core/uibase/inc/concustomshape.hxx +++ b/sw/source/core/uibase/inc/concustomshape.hxx @@ -44,18 +44,18 @@ class ConstCustomShape : public SwDrawBase ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function OUString GetShapeType() const; static OUString GetShapeTypeFromRequest( SfxRequest& rReq ); - virtual void CreateDefaultObject(); + virtual void CreateDefaultObject() SAL_OVERRIDE; // #i33136# - virtual bool doConstructOrthogonal() const; + virtual bool doConstructOrthogonal() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX diff --git a/sw/source/core/uibase/inc/condedit.hxx b/sw/source/core/uibase/inc/condedit.hxx index 514a23e58c55..0a9d386c104f 100644 --- a/sw/source/core/uibase/inc/condedit.hxx +++ b/sw/source/core/uibase/inc/condedit.hxx @@ -27,8 +27,8 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { bool bBrackets, bEnableDrop; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: ConditionEdit(Window* pParent, WinBits nStyle); diff --git a/sw/source/core/uibase/inc/conform.hxx b/sw/source/core/uibase/inc/conform.hxx index a1226a21f25e..5fb041d0fa94 100644 --- a/sw/source/core/uibase/inc/conform.hxx +++ b/sw/source/core/uibase/inc/conform.hxx @@ -27,10 +27,10 @@ public: ConstFormControl(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function - virtual void CreateDefaultObject(); + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void CreateDefaultObject() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx index d91c38e0dd6b..2df2d7eaeba0 100644 --- a/sw/source/core/uibase/inc/conpoly.hxx +++ b/sw/source/core/uibase/inc/conpoly.hxx @@ -35,11 +35,11 @@ public: ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX diff --git a/sw/source/core/uibase/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx index 4791935d37ce..3539a63099e3 100644 --- a/sw/source/core/uibase/inc/conrect.hxx +++ b/sw/source/core/uibase/inc/conrect.hxx @@ -40,10 +40,10 @@ class ConstRectangle : public SwDrawBase ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX diff --git a/sw/source/core/uibase/inc/content.hxx b/sw/source/core/uibase/inc/content.hxx index 2700bd261e83..b4a6c92f6988 100644 --- a/sw/source/core/uibase/inc/content.hxx +++ b/sw/source/core/uibase/inc/content.hxx @@ -36,7 +36,7 @@ class SwRangeRedline; class SwPopup : public PopupMenu { sal_uInt16 nCurId; - virtual void Select(){nCurId = GetCurItemId();} + virtual void Select() SAL_OVERRIDE {nCurId = GetCurItemId();} public: SwPopup() : @@ -96,7 +96,7 @@ public: : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} - virtual sal_Bool IsProtect() const; + virtual sal_Bool IsProtect() const SAL_OVERRIDE; const OUString& GetURL() { return sURL; } const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; @@ -128,7 +128,7 @@ public: const SwFmtFld* GetPostIt() { return pFld; } SwRangeRedline* GetRedline() { return pRedline; } - virtual sal_Bool IsProtect() const; + virtual sal_Bool IsProtect() const SAL_OVERRIDE; bool IsPostIt() {return mbPostIt; } }; diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx index 11d39b9db697..ff808365a589 100644 --- a/sw/source/core/uibase/inc/conttree.hxx +++ b/sw/source/core/uibase/inc/conttree.hxx @@ -97,52 +97,52 @@ class SwContentTree : public SvTreeListBox using SvTreeListBox::EditEntry; protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; SwNavigationPI* GetParentWindow(){return (SwNavigationPI*)Window::GetParent();} - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; bool FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ); bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ); - virtual bool NotifyAcceptDrop( SvTreeListEntry* ); + SvTreeListEntry* ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void EditEntry( SvTreeListEntry* pEntry, sal_uInt8 nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(bool bSet) {bIsInDrag = bSet;} - virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); + virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: SwContentTree(Window* pParent, const ResId& rResId); ~SwContentTree(); - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const; + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt); bool ToggleToRoot(); @@ -189,12 +189,12 @@ public: DECL_LINK( ContentDoubleClickHdl, void * ); DECL_LINK( TimerUpdate, void * ); - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ); - virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual void GetFocus(); - virtual void KeyInput(const KeyEvent& rKEvt); + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; + virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE; virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; }; @@ -211,7 +211,7 @@ public: virtual void Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, - const SvTreeListEntry* pEntry); + const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; namespace sfx2 { class DocumentInserter; } @@ -251,38 +251,38 @@ private: protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ); - virtual bool NotifyAcceptDrop( SvTreeListEntry* ); + SvTreeListEntry* ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void SelectHdl(); - virtual void DeselectHdl(); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void SelectHdl() SAL_OVERRIDE; + virtual void DeselectHdl() SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; void Clear(); @@ -302,8 +302,8 @@ protected: static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*); - virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); + virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: SwGlobalTree(Window* pParent, const ResId& rResId); diff --git a/sw/source/core/uibase/inc/cption.hxx b/sw/source/core/uibase/inc/cption.hxx index 578efcdb8e1c..7eb9837e2dfd 100644 --- a/sw/source/core/uibase/inc/cption.hxx +++ b/sw/source/core/uibase/inc/cption.hxx @@ -55,7 +55,7 @@ public: : ComboBox( pParent, nStyle ) {} - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; class SwCaptionDialog : public SvxStandardDialog @@ -96,7 +96,7 @@ class SwCaptionDialog : public SvxStandardDialog DECL_LINK(OptionHdl, Button *); DECL_LINK(CaptionHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void DrawSample(); void CheckButtonWidth(); diff --git a/sw/source/core/uibase/inc/dbconfig.hxx b/sw/source/core/uibase/inc/dbconfig.hxx index 042a719b7338..d569b26d1d20 100644 --- a/sw/source/core/uibase/inc/dbconfig.hxx +++ b/sw/source/core/uibase/inc/dbconfig.hxx @@ -38,8 +38,8 @@ public: void Load(); const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx index 4d271dd41e2a..60ad6d86186c 100644 --- a/sw/source/core/uibase/inc/dbinsdlg.hxx +++ b/sw/source/core/uibase/inc/dbinsdlg.hxx @@ -144,8 +144,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, sal_Bool bInsField ); using SfxModalDialog::Notify; - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); // set the tables - properties diff --git a/sw/source/core/uibase/inc/dbtree.hxx b/sw/source/core/uibase/inc/dbtree.hxx index 7120cbf25e17..e94b1d22512c 100644 --- a/sw/source/core/uibase/inc/dbtree.hxx +++ b/sw/source/core/uibase/inc/dbtree.hxx @@ -44,17 +44,17 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox SAL_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* ); SAL_DLLPRIVATE void InitTreeList(); - SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ); + SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; using SvTreeListBox::Select; public: SwDBTreeList(Window* pParent, WinBits nStyle); virtual ~SwDBTreeList(); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0); diff --git a/sw/source/core/uibase/inc/docfnote.hxx b/sw/source/core/uibase/inc/docfnote.hxx index c5289213d2b2..b9d2dac9318b 100644 --- a/sw/source/core/uibase/inc/docfnote.hxx +++ b/sw/source/core/uibase/inc/docfnote.hxx @@ -31,7 +31,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog sal_uInt16 m_nFootNoteId; sal_uInt16 m_nEndNoteId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; DECL_LINK( OkHdl, Button * ); diff --git a/sw/source/core/uibase/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx index a7c427550942..98f4ab192c30 100644 --- a/sw/source/core/uibase/inc/docstdlg.hxx +++ b/sw/source/core/uibase/inc/docstdlg.hxx @@ -38,8 +38,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); protected: - 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; DECL_LINK(UpdateHdl, void *); diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx index 27714918c05e..3ddf9f5e2544 100644 --- a/sw/source/core/uibase/inc/drpcps.hxx +++ b/sw/source/core/uibase/inc/drpcps.hxx @@ -73,7 +73,7 @@ friend class SwDropCapsPict; SwDropCapsPage(Window *pParent, const SfxItemSet &rSet); ~SwDropCapsPage(); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; void FillSet( SfxItemSet &rSet ); DECL_LINK(ClickHdl, void *); @@ -89,8 +89,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - 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; void SetFormat(sal_Bool bSet){bFormat = bSet;} protected: diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx index cd7b4befef17..1da91e4766fc 100644 --- a/sw/source/core/uibase/inc/drwtxtsh.hxx +++ b/sw/source/core/uibase/inc/drwtxtsh.hxx @@ -48,7 +48,7 @@ public: virtual ~SwDrawTextShell(); virtual ::svl::IUndoManager* - GetUndoManager(); + GetUndoManager() SAL_OVERRIDE; void StateDisableItems(SfxItemSet &); diff --git a/sw/source/core/uibase/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx index d3905bc27e57..c087fa072bf8 100644 --- a/sw/source/core/uibase/inc/dselect.hxx +++ b/sw/source/core/uibase/inc/dselect.hxx @@ -33,9 +33,9 @@ class DrawSelection : public SwDrawBase DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // mouse- & key events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function }; #endif // INCLUDED_SW_SOURCE_UI_INC_DSELECT_HXX diff --git a/sw/source/core/uibase/inc/edtwin.hxx b/sw/source/core/uibase/inc/edtwin.hxx index 7b6c807a6223..152f4278e744 100644 --- a/sw/source/core/uibase/inc/edtwin.hxx +++ b/sw/source/core/uibase/inc/edtwin.hxx @@ -185,28 +185,28 @@ friend void PageNumNotify( SwViewShell* pVwSh, protected: - virtual void DataChanged( const DataChangedEvent& ); - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput(const KeyEvent &rKEvt); + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void PrePaint() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void RequestHelp(const HelpEvent& rEvt); + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; // Drag & Drop Interface - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual OUString GetSurroundingText() const; - virtual Selection GetSurroundingTextSelection() const; + virtual OUString GetSurroundingText() const SAL_OVERRIDE; + virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; void ShowAutoTextCorrectQuickHelp( const OUString& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr, bool bFromIME = false ); @@ -269,7 +269,7 @@ public: const SwView &GetView() const { return m_rView; } SwView &GetView() { return m_rView; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; static inline long GetDDStartPosX() { return m_nDDStartPosX; } static inline long GetDDStartPosY() { return m_nDDStartPosY; } diff --git a/sw/source/core/uibase/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx index fa3a0e393e79..054d602e1dce 100644 --- a/sw/source/core/uibase/inc/envimg.hxx +++ b/sw/source/core/uibase/inc/envimg.hxx @@ -63,11 +63,11 @@ public: SwEnvItem& operator =(const SwEnvItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const; + virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; // class SwEnvCfgItem ------------------------------------------------------- @@ -82,8 +82,8 @@ public: SwEnvItem& GetItem() {return aEnvItem;} - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx index 69ca85d65349..c1557ccd87a9 100644 --- a/sw/source/core/uibase/inc/envlop.hxx +++ b/sw/source/core/uibase/inc/envlop.hxx @@ -43,15 +43,15 @@ class Printer; // class SwEnvPreview --------------------------------------------------------- class SwEnvPreview : public Window { - void Paint(const Rectangle&); + void Paint(const Rectangle&) SAL_OVERRIDE; public: SwEnvPreview(Window * pParent, WinBits nStyle); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual Size GetOptimalSize() const; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; // class SwEnvDlg ----------------------------------------------------------- @@ -69,8 +69,8 @@ friend class SwEnvPreview; SfxItemSet *pSenderSet; sal_uInt16 m_nEnvPrintId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; public: SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert); @@ -110,11 +110,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/core/uibase/inc/fldedt.hxx b/sw/source/core/uibase/inc/fldedt.hxx index 89312e6421ee..17733c5446d1 100644 --- a/sw/source/core/uibase/inc/fldedt.hxx +++ b/sw/source/core/uibase/inc/fldedt.hxx @@ -44,7 +44,7 @@ public: DECL_LINK(OKHdl, void *); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void EnableInsert(sal_Bool bEnable); void InsertHdl(); diff --git a/sw/source/core/uibase/inc/fldtdlg.hxx b/sw/source/core/uibase/inc/fldtdlg.hxx index 4835a4afb054..1dabf5c2e83c 100644 --- a/sw/source/core/uibase/inc/fldtdlg.hxx +++ b/sw/source/core/uibase/inc/fldtdlg.hxx @@ -38,10 +38,10 @@ class SwFldDlg: public SfxTabDialog sal_uInt16 m_nFuncId; sal_uInt16 m_nDbId; - virtual bool Close(); - virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); - virtual void Activate(); - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual bool Close() SAL_OVERRIDE; + virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void Activate() SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; void ReInitTabPage( sal_uInt16 nPageId, sal_Bool bOnlyActivate = sal_False ); diff --git a/sw/source/core/uibase/inc/fldwrap.hxx b/sw/source/core/uibase/inc/fldwrap.hxx index 4a92fcf9c66d..6c43c326e21c 100644 --- a/sw/source/core/uibase/inc/fldwrap.hxx +++ b/sw/source/core/uibase/inc/fldwrap.hxx @@ -31,7 +31,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper); - virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; void ShowReferencePage(); }; @@ -48,7 +48,7 @@ public: SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); - virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/fontcfg.hxx b/sw/source/core/uibase/inc/fontcfg.hxx index 49f536e8f48e..52da0a04af05 100644 --- a/sw/source/core/uibase/inc/fontcfg.hxx +++ b/sw/source/core/uibase/inc/fontcfg.hxx @@ -75,8 +75,8 @@ public: SwStdFontConfig(); ~SwStdFontConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} const OUString& GetFontOutline(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];} diff --git a/sw/source/core/uibase/inc/formedt.hxx b/sw/source/core/uibase/inc/formedt.hxx index eb0cdb05f323..ac3962abec5c 100644 --- a/sw/source/core/uibase/inc/formedt.hxx +++ b/sw/source/core/uibase/inc/formedt.hxx @@ -50,7 +50,7 @@ class SwIdxFormDlg : public SvxStandardDialog DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( AssignHdl, Button * ); void UpdatePattern(); - void Apply(); + void Apply() SAL_OVERRIDE; ListBox aEntryLB; OKButton aOKBtn; diff --git a/sw/source/core/uibase/inc/frmdlg.hxx b/sw/source/core/uibase/inc/frmdlg.hxx index 09ae2b06eef5..7b0959e7727d 100644 --- a/sw/source/core/uibase/inc/frmdlg.hxx +++ b/sw/source/core/uibase/inc/frmdlg.hxx @@ -47,7 +47,7 @@ class SwFrmDlg : public SfxTabDialog sal_uInt16 m_nMacroId; sal_uInt16 m_nBorderId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx index 204d6bbb48e5..1b1b1e160a81 100644 --- a/sw/source/core/uibase/inc/frmpage.hxx +++ b/sw/source/core/uibase/inc/frmpage.hxx @@ -130,8 +130,8 @@ class SwFrmPage: public SfxTabPage bool m_bIsMathOLE; bool m_bIsMathBaselineAlignment; - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK(RangeModifyHdl, void *); DECL_LINK(AnchorTypeHdl, void *); @@ -190,8 +190,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - 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; void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } void SetFormatUsed(sal_Bool bFmt); @@ -225,7 +225,7 @@ class SwGrfExtPage: public SfxTabPage DECL_LINK(MirrorHdl, void *); DECL_LINK(BrowseHdl, void *); - virtual void ActivatePage(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; SwGrfExtPage(Window *pParent, const SfxItemSet &rSet); ~SwGrfExtPage(); @@ -236,9 +236,9 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; }; class SwFrmURLPage : public SfxTabPage @@ -265,8 +265,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - 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; }; class SwFrmAddPage : public SfxTabPage @@ -313,8 +313,8 @@ public: static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - 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; void SetFormatUsed(sal_Bool bFmt); void SetFrmType(const OString &rType) { sDlgType = rType; } diff --git a/sw/source/core/uibase/inc/glosbib.hxx b/sw/source/core/uibase/inc/glosbib.hxx index 7620f419784a..d16b026ae307 100644 --- a/sw/source/core/uibase/inc/glosbib.hxx +++ b/sw/source/core/uibase/inc/glosbib.hxx @@ -47,7 +47,7 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; }; struct GlosBibUserData @@ -70,7 +70,7 @@ public: { } - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; class SwGlossaryGroupDlg : public SvxStandardDialog @@ -95,7 +95,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog sal_Bool IsDeleteAllowed(const OUString &rGroup); protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; DECL_LINK( SelectHdl, SvTabListBox* ); DECL_LINK(NewHdl, void *); DECL_LINK( DeleteHdl, Button* ); diff --git a/sw/source/core/uibase/inc/gloslst.hxx b/sw/source/core/uibase/inc/gloslst.hxx index fb47656da3f2..9c45736a6c51 100644 --- a/sw/source/core/uibase/inc/gloslst.hxx +++ b/sw/source/core/uibase/inc/gloslst.hxx @@ -72,7 +72,7 @@ public: void Update(); - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; void ClearGroups(); }; diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx index 2e343a329bab..177c70576138 100644 --- a/sw/source/core/uibase/inc/glossary.hxx +++ b/sw/source/core/uibase/inc/glossary.hxx @@ -58,18 +58,18 @@ class SwGlTreeListBox : public SvTreeListBox SvTreeListEntry* pDragEntry; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, - SvTreeListEntry* ); - virtual bool NotifyAcceptDrop( SvTreeListEntry* ); + SvTreeListEntry* ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, - sal_uLong& rNewChildPos); + sal_uLong& rNewChildPos) SAL_OVERRIDE; sal_Bool NotifyCopyingOrMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, @@ -77,8 +77,8 @@ class SwGlTreeListBox : public SvTreeListBox public: SwGlTreeListBox(Window* pParent, WinBits nBits); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual Size GetOptimalSize() const; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void Clear(); }; @@ -135,7 +135,7 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( PreviewLoadedHdl, void * ); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void Init(); SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); void ShowAutoText(const OUString& rGroup, const OUString& rShortName); diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx index a23e80096d47..eac10f079af9 100644 --- a/sw/source/core/uibase/inc/glshell.hxx +++ b/sw/source/core/uibase/inc/glshell.hxx @@ -29,7 +29,7 @@ class SwGlosDocShell : public SwDocShell using SotObject::GetInterface; protected: - virtual bool Save(); + virtual bool Save() SAL_OVERRIDE; public: @@ -59,7 +59,7 @@ class SwWebGlosDocShell : public SwWebDocShell using SotObject::GetInterface; protected: - virtual bool Save(); + virtual bool Save() SAL_OVERRIDE; public: diff --git a/sw/source/core/uibase/inc/hyp.hxx b/sw/source/core/uibase/inc/hyp.hxx index 02edf350fe63..b642f62910a5 100644 --- a/sw/source/core/uibase/inc/hyp.hxx +++ b/sw/source/core/uibase/inc/hyp.hxx @@ -39,11 +39,11 @@ private: sal_Bool bInfoBox : 1; // display info-box when ending protected: - virtual void SpellStart( SvxSpellArea eSpell ); - virtual bool SpellContinue(); - virtual void SpellEnd( ); - virtual bool SpellMore(); - virtual void InsertHyphen( const sal_uInt16 nPos ); // insert hyphen + virtual void SpellStart( SvxSpellArea eSpell ) SAL_OVERRIDE; + virtual bool SpellContinue() SAL_OVERRIDE; + virtual void SpellEnd( ) SAL_OVERRIDE; + virtual bool SpellMore() SAL_OVERRIDE; + virtual void InsertHyphen( const sal_uInt16 nPos ) SAL_OVERRIDE; // insert hyphen public: SwHyphWrapper( SwView* pVw, diff --git a/sw/source/core/uibase/inc/inpdlg.hxx b/sw/source/core/uibase/inc/inpdlg.hxx index d96c59f484ad..0b7458fbff03 100644 --- a/sw/source/core/uibase/inc/inpdlg.hxx +++ b/sw/source/core/uibase/inc/inpdlg.hxx @@ -37,8 +37,8 @@ class SwWrtShell; class SwFldInputDlg: public SvxStandardDialog { - virtual void Apply(); - virtual void StateChanged( StateChangedType ); + virtual void Apply() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType ) SAL_OVERRIDE; SwWrtShell& rSh; SwInputField* pInpFld; diff --git a/sw/source/core/uibase/inc/inputwin.hxx b/sw/source/core/uibase/inc/inputwin.hxx index 2278f51c23d4..f419c6741318 100644 --- a/sw/source/core/uibase/inc/inputwin.hxx +++ b/sw/source/core/uibase/inc/inputwin.hxx @@ -40,7 +40,7 @@ public: const OUString& aTblName ); protected: - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; }; class SwInputWindow : public ToolBox @@ -72,8 +72,8 @@ friend class InputEdit; using Window::IsActive; protected: - virtual void Resize(); - virtual void Click(); + virtual void Resize() SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; DECL_LINK( MenuHdl, Menu * ); DECL_LINK( DropdownClickHdl, void* ); void ApplyFormula(); @@ -83,7 +83,7 @@ public: SwInputWindow( Window* pParent, SfxBindings* pBindings ); virtual ~SwInputWindow(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SelectHdl( ToolBox*); diff --git a/sw/source/core/uibase/inc/insfnote.hxx b/sw/source/core/uibase/inc/insfnote.hxx index 0c903a9a8341..ad93ef9cad83 100644 --- a/sw/source/core/uibase/inc/insfnote.hxx +++ b/sw/source/core/uibase/inc/insfnote.hxx @@ -60,7 +60,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog DECL_LINK(NumberExtCharHdl, void *); DECL_LINK(NextPrevHdl, Button *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void Init(); diff --git a/sw/source/core/uibase/inc/javaedit.hxx b/sw/source/core/uibase/inc/javaedit.hxx index 209c39a931fc..8b79071f0689 100644 --- a/sw/source/core/uibase/inc/javaedit.hxx +++ b/sw/source/core/uibase/inc/javaedit.hxx @@ -65,7 +65,7 @@ private: DECL_LINK(InsertFileHdl, PushButton *); DECL_LINK(DlgClosedHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void CheckTravel(); void SetFld(); diff --git a/sw/source/core/uibase/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx index 43eb936734e5..95e32f866656 100644 --- a/sw/source/core/uibase/inc/label.hxx +++ b/sw/source/core/uibase/inc/label.hxx @@ -52,7 +52,7 @@ class SwLabDlg : public SfxTabDialog sal_uInt16 m_nPrivateId; void _ReplaceGroup( const OUString &rMake ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SwLabDlg( Window* pParent, const SfxItemSet& rSet, diff --git a/sw/source/core/uibase/inc/labelcfg.hxx b/sw/source/core/uibase/inc/labelcfg.hxx index a70260010d58..2188db5c636e 100644 --- a/sw/source/core/uibase/inc/labelcfg.hxx +++ b/sw/source/core/uibase/inc/labelcfg.hxx @@ -43,8 +43,8 @@ public: SwLabelConfig(); virtual ~SwLabelConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr); const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;} diff --git a/sw/source/core/uibase/inc/labimg.hxx b/sw/source/core/uibase/inc/labimg.hxx index d668383efb68..69fe4a3db911 100644 --- a/sw/source/core/uibase/inc/labimg.hxx +++ b/sw/source/core/uibase/inc/labimg.hxx @@ -37,9 +37,9 @@ public: SwLabItem& operator =(const SwLabItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const; + virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; OUString aLstMake; // remember last selection OUString aLstType; @@ -116,8 +116,8 @@ public: SwLabItem& GetItem() {return aItem;} - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/mailconfigpage.hxx b/sw/source/core/uibase/inc/mailconfigpage.hxx index bf16067b5646..4d5d3aa36399 100644 --- a/sw/source/core/uibase/inc/mailconfigpage.hxx +++ b/sw/source/core/uibase/inc/mailconfigpage.hxx @@ -61,8 +61,8 @@ 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; }; diff --git a/sw/source/core/uibase/inc/maildispatcher.hxx b/sw/source/core/uibase/inc/maildispatcher.hxx index 512d6fde5b56..76bf4640587b 100644 --- a/sw/source/core/uibase/inc/maildispatcher.hxx +++ b/sw/source/core/uibase/inc/maildispatcher.hxx @@ -128,8 +128,8 @@ public: void addListener(::rtl::Reference<IMailDispatcherListener> listener); protected: - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; private: std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener(); diff --git a/sw/source/core/uibase/inc/mailmergechildwindow.hxx b/sw/source/core/uibase/inc/mailmergechildwindow.hxx index f1ecd5a87c2c..f139fb206840 100644 --- a/sw/source/core/uibase/inc/mailmergechildwindow.hxx +++ b/sw/source/core/uibase/inc/mailmergechildwindow.hxx @@ -33,7 +33,7 @@ public: SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, Window *pParent); ~SwMailMergeChildWin(); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; }; class SwMailMergeChildWindow : public SfxChildWindow diff --git a/sw/source/core/uibase/inc/mailmergehelper.hxx b/sw/source/core/uibase/inc/mailmergehelper.hxx index fc87a3ec9949..8621ce08fcd5 100644 --- a/sw/source/core/uibase/inc/mailmergehelper.hxx +++ b/sw/source/core/uibase/inc/mailmergehelper.hxx @@ -74,11 +74,11 @@ class SW_DLLPUBLIC SwAddressPreview : public Window void DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); - virtual void Paint(const Rectangle&); - virtual void Resize(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void UpdateScrollBar(); DECL_LINK(ScrollHdl, void*); @@ -163,8 +163,8 @@ public: {} ~SwAuthenticator(); - virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -180,7 +180,7 @@ public: ~SwConnectionContext(); virtual ::com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwMutexBase @@ -202,13 +202,13 @@ public: ~SwConnectionListener(); virtual void SAL_CALL connected(const ::com::sun::star::lang::EventObject& aEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disconnected(const ::com::sun::star::lang::EventObject& aEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& aEvent) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwMailTransferable : @@ -231,22 +231,22 @@ class SwMailTransferable : ~SwMailTransferable(); virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -272,33 +272,33 @@ public: ~SwMailMessage(); // attributes - virtual OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSubject( const OUString& _subject ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSubject( const OUString& _subject ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getBody() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setBody( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _body ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // methods - virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getCcRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getCcRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getBccRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getBccRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addAttachment( const ::com::sun::star::mail::MailAttachment& aMailAttachment ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachment > SAL_CALL - getAttachments( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAttachments( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SetSenderName(const OUString& rSenderName) {m_sSenderName = rSenderName;} void SetSenderAddress(const OUString& rSenderAddress) diff --git a/sw/source/core/uibase/inc/mailmergewizard.hxx b/sw/source/core/uibase/inc/mailmergewizard.hxx index f7a3b2ce944f..cabd7846b401 100644 --- a/sw/source/core/uibase/inc/mailmergewizard.hxx +++ b/sw/source/core/uibase/inc/mailmergewizard.hxx @@ -58,12 +58,12 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard using svt::OWizardMachine::skipUntil; protected: - virtual svt::OWizardPage* createPage(WizardState _nState); - virtual void enterState( WizardState _nState ); + virtual svt::OWizardPage* createPage(WizardState _nState) SAL_OVERRIDE; + virtual void enterState( WizardState _nState ) SAL_OVERRIDE; // roadmap feature ?? // virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); - virtual OUString getStateDisplayName( WizardState _nState ) const; + virtual OUString getStateDisplayName( WizardState _nState ) const SAL_OVERRIDE; public: SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); @@ -89,8 +89,8 @@ public: void updateRoadmapItemLabel( WizardState _nState ); - virtual short Execute(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual short Execute() SAL_OVERRIDE; + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/mailmrge.hxx b/sw/source/core/uibase/inc/mailmrge.hxx index 8eb176ed751d..e93b16cb4850 100644 --- a/sw/source/core/uibase/inc/mailmrge.hxx +++ b/sw/source/core/uibase/inc/mailmrge.hxx @@ -122,8 +122,8 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK(ModifyHdl, void *); DECL_LINK( SaveTypeHdl, RadioButton* pBtn ); - virtual void Apply(); - virtual void Resize(); + virtual void Apply() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; bool ExecQryShell(); public: diff --git a/sw/source/core/uibase/inc/mergetbl.hxx b/sw/source/core/uibase/inc/mergetbl.hxx index 3926c21b7376..ffb8568e3450 100644 --- a/sw/source/core/uibase/inc/mergetbl.hxx +++ b/sw/source/core/uibase/inc/mergetbl.hxx @@ -30,7 +30,7 @@ class SwMergeTblDlg : public SvxStandardDialog sal_Bool& m_rMergePrev; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwMergeTblDlg( Window *pParent, sal_Bool& rWithPrev ); diff --git a/sw/source/core/uibase/inc/multmrk.hxx b/sw/source/core/uibase/inc/multmrk.hxx index b98192765931..fe40ee33653e 100644 --- a/sw/source/core/uibase/inc/multmrk.hxx +++ b/sw/source/core/uibase/inc/multmrk.hxx @@ -42,7 +42,7 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog SwTOXMgr& rMgr; sal_uInt16 nPos; - void Apply(); + void Apply() SAL_OVERRIDE; public: SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr &rTOXMgr ); ~SwMultiTOXMarkDlg(); diff --git a/sw/source/core/uibase/inc/navicfg.hxx b/sw/source/core/uibase/inc/navicfg.hxx index 77a14d667166..8368c86eaeac 100644 --- a/sw/source/core/uibase/inc/navicfg.hxx +++ b/sw/source/core/uibase/inc/navicfg.hxx @@ -37,8 +37,8 @@ public: SwNavigationConfig(); ~SwNavigationConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; sal_Int32 GetRootType()const {return nRootType;} void SetRootType(sal_Int32 nSet){ diff --git a/sw/source/core/uibase/inc/navipi.hxx b/sw/source/core/uibase/inc/navipi.hxx index 04a6c269c706..cb082903ab6a 100644 --- a/sw/source/core/uibase/inc/navipi.hxx +++ b/sw/source/core/uibase/inc/navipi.hxx @@ -43,8 +43,8 @@ class SwNavigationPI; class SwNavHelpToolBox : public SwHelpToolBox { - virtual void MouseButtonDown(const MouseEvent &rEvt); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; @@ -130,11 +130,11 @@ class SwNavigationPI : public Window, protected: virtual sal_Bool Close(); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // release ObjectShellLock early enough for app end - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; NumEditAction& GetPageEdit(); sal_Bool ToggleTree(); @@ -152,7 +152,7 @@ public: void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; static OUString CreateDropFileName( TransferableDataHelper& rData ); static OUString CleanEntry(const OUString& rEntry); diff --git a/sw/source/core/uibase/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx index 7a59e849f7e4..6b27d3301d78 100644 --- a/sw/source/core/uibase/inc/num.hxx +++ b/sw/source/core/uibase/inc/num.hxx @@ -119,10 +119,10 @@ public: const SfxItemSet& rSet); ~SwNumPositionTabPage(); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -152,8 +152,8 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog sal_uInt16 m_nPositionPageId; protected: - virtual short Ok(); - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage); + virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; DECL_LINK(RemoveNumberingHdl, void *); public: SwSvxNumBulletTabDialog(Window* pParent, diff --git a/sw/source/core/uibase/inc/numberingtypelistbox.hxx b/sw/source/core/uibase/inc/numberingtypelistbox.hxx index 661252fb8e84..f2aa7c9dd7b5 100644 --- a/sw/source/core/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/core/uibase/inc/numberingtypelistbox.hxx @@ -38,7 +38,7 @@ public: SwNumberingTypeListBox( Window* pWin, WinBits nStyle = WB_BORDER ); ~SwNumberingTypeListBox(); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void Reload(sal_uInt16 nTypeFlags); diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx index 67aba90cb323..fbab11a0fc6f 100644 --- a/sw/source/core/uibase/inc/numpara.hxx +++ b/sw/source/core/uibase/inc/numpara.hxx @@ -71,8 +71,8 @@ public: const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - 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; void EnableNewStart(); void DisableOutline(); diff --git a/sw/source/core/uibase/inc/numprevw.hxx b/sw/source/core/uibase/inc/numprevw.hxx index 71374d899261..827109135a2e 100644 --- a/sw/source/core/uibase/inc/numprevw.hxx +++ b/sw/source/core/uibase/inc/numprevw.hxx @@ -35,7 +35,7 @@ class NumberingPreview : public Window sal_uInt16 nActLevel; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: NumberingPreview(Window* pParent, const ResId& rResId) diff --git a/sw/source/core/uibase/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx index e0a1da8ea987..528e625b3ae2 100644 --- a/sw/source/core/uibase/inc/optcomp.hxx +++ b/sw/source/core/uibase/inc/optcomp.hxx @@ -66,8 +66,8 @@ 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; }; #endif diff --git a/sw/source/core/uibase/inc/optload.hxx b/sw/source/core/uibase/inc/optload.hxx index 7aaf68fb3819..e52d4f203fea 100644 --- a/sw/source/core/uibase/inc/optload.hxx +++ b/sw/source/core/uibase/inc/optload.hxx @@ -65,8 +65,8 @@ 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; }; class SwCaptionOptDlg : public SfxSingleTabDialog @@ -78,7 +78,7 @@ public: class CaptionComboBox : public SwComboBox { protected: - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; public: CaptionComboBox(Window* pParent, WinBits nStyle) @@ -95,8 +95,8 @@ public: SwCaptionPreview( Window* pParent, WinBits nStyle ); void Init(); void SetPreviewText( const OUString& rText ); - virtual void Paint( const Rectangle& rRect ); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class SwCaptionOptPage : public SfxTabPage @@ -166,8 +166,8 @@ 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; }; #endif diff --git a/sw/source/core/uibase/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx index c8d81879aa37..a33c494a8ca6 100644 --- a/sw/source/core/uibase/inc/optpage.hxx +++ b/sw/source/core/uibase/inc/optpage.hxx @@ -76,8 +76,8 @@ 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; }; @@ -125,12 +125,12 @@ 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; void SetFax( const std::vector<OUString>& ); void SelectFax( const OUString& ); void SetPreview(sal_Bool bPrev); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; @@ -197,11 +197,11 @@ 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; void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; class SwTableOptionsTabPage : public SfxTabPage @@ -239,11 +239,11 @@ 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; void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; @@ -285,11 +285,11 @@ 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; void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } - virtual void PageCreated( SfxAllItemSet aSet ); + virtual void PageCreated( SfxAllItemSet aSet ) SAL_OVERRIDE; }; /*----------------------------------------------------------------------- @@ -316,12 +316,12 @@ class SwMarkPreview : public Window using OutputDevice::DrawRect; void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); - void Paint(const Rectangle&); + void Paint(const Rectangle&) SAL_OVERRIDE; void PaintPage(const Rectangle &rRect); void InitColors( void ); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SwMarkPreview(Window* pParent, WinBits nWinBits); @@ -329,7 +329,7 @@ public: inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; /*----------------------------------------------------------------------- @@ -369,8 +369,8 @@ 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; }; /*------------------------------------------------------- @@ -388,8 +388,8 @@ 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; private: CheckBox* m_pTest1CBox; @@ -431,8 +431,8 @@ 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; }; #endif diff --git a/sw/source/core/uibase/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx index 6903d74d60bf..50496d5cfe2b 100644 --- a/sw/source/core/uibase/inc/outline.hxx +++ b/sw/source/core/uibase/inc/outline.hxx @@ -63,8 +63,8 @@ class SwOutlineTabDialog : public SfxTabDialog DECL_LINK( FormHdl, Button * ); DECL_LINK( MenuSelectHdl, Menu * ); - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage); - virtual short Ok(); + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; public: SwOutlineTabDialog(Window* pParent, @@ -124,11 +124,11 @@ public: void SetWrtShell(SwWrtShell* pShell); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - 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; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; diff --git a/sw/source/core/uibase/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx index 270656b7095b..38717ef02d61 100644 --- a/sw/source/core/uibase/inc/pgfnote.hxx +++ b/sw/source/core/uibase/inc/pgfnote.hxx @@ -37,8 +37,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - 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; private: SwFootNotePage(Window *pParent, const SfxItemSet &rSet); @@ -67,8 +67,8 @@ private: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - 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; }; diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx index 8afce35e8fa6..bd770e59114e 100644 --- a/sw/source/core/uibase/inc/pggrid.hxx +++ b/sw/source/core/uibase/inc/pggrid.hxx @@ -89,11 +89,11 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - 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 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; }; #endif diff --git a/sw/source/core/uibase/inc/popbox.hxx b/sw/source/core/uibase/inc/popbox.hxx index e085886eaa81..7bba9a53ffc0 100644 --- a/sw/source/core/uibase/inc/popbox.hxx +++ b/sw/source/core/uibase/inc/popbox.hxx @@ -32,10 +32,10 @@ class SwHelpToolBox: public ToolBox, public DropTargetHelper using ToolBox::DoubleClick; protected: - virtual void MouseButtonDown(const MouseEvent &rEvt); + virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; virtual long DoubleClick(ToolBox *); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: SwHelpToolBox(SwNavigationPI* pParent, const ResId &); diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx index ac70a08e7aed..e1b82d79da30 100644 --- a/sw/source/core/uibase/inc/pview.hxx +++ b/sw/source/core/uibase/inc/pview.hxx @@ -63,11 +63,11 @@ public: ~SwPagePreviewWin(); // calls SwViewShell::Paint - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput( const KeyEvent & ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent & ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; void SetViewShell( SwViewShell* pShell ); @@ -126,7 +126,7 @@ public: return maPaintedPreviewDocRect; } - void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0); + void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0) SAL_OVERRIDE; /** Method to enable/disable book preview @param _bBookPreview @@ -139,7 +139,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible(); + CreateAccessible() SAL_OVERRIDE; virtual void SwitchView(); }; @@ -189,11 +189,11 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SAL_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ); - SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); - SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, - const SfxItemSet &rOptions ); + const SfxItemSet &rOptions ) SAL_OVERRIDE; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner ); @@ -210,8 +210,8 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SfxRequest* _pReq = 0 ); protected: - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; void SetZoom(SvxZoomType eSet, sal_uInt16 nFactor); diff --git a/sw/source/core/uibase/inc/redlndlg.hxx b/sw/source/core/uibase/inc/redlndlg.hxx index 2ee42bdef5c6..206511feb7da 100644 --- a/sw/source/core/uibase/inc/redlndlg.hxx +++ b/sw/source/core/uibase/inc/redlndlg.hxx @@ -139,8 +139,8 @@ public: SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, Window *pParent); ~SwModelessRedlineAcceptDlg(); - virtual void Activate(); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void Activate() SAL_OVERRIDE; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; void Initialize (SfxChildWinInfo* pInfo); }; @@ -154,7 +154,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID( SwRedlineAcceptChild ); - virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx index 185f60246bcc..1101bfb8fe15 100644 --- a/sw/source/core/uibase/inc/regionsw.hxx +++ b/sw/source/core/uibase/inc/regionsw.hxx @@ -191,8 +191,8 @@ public: void SetWrtShell(SwWrtShell& rSh); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -233,8 +233,8 @@ public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -251,8 +251,8 @@ public: SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -272,8 +272,8 @@ class SwInsertSectionTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; public: SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); @@ -292,7 +292,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); diff --git a/sw/source/core/uibase/inc/rowht.hxx b/sw/source/core/uibase/inc/rowht.hxx index 022c1d2940f2..aaaeeb3a9e56 100644 --- a/sw/source/core/uibase/inc/rowht.hxx +++ b/sw/source/core/uibase/inc/rowht.hxx @@ -33,7 +33,7 @@ class SwTableHeightDlg : public SvxStandardDialog SwWrtShell &rSh; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwTableHeightDlg( Window *pParent, SwWrtShell &rS ); diff --git a/sw/source/core/uibase/inc/scroll.hxx b/sw/source/core/uibase/inc/scroll.hxx index ba0f66b33398..0d2743525d7d 100644 --- a/sw/source/core/uibase/inc/scroll.hxx +++ b/sw/source/core/uibase/inc/scroll.hxx @@ -37,7 +37,7 @@ public: void ExtendedShow( sal_Bool bVisible = sal_True ); void Hide() { Show( false ); } - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; sal_Bool IsVisible(sal_Bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } // changing of document size diff --git a/sw/source/core/uibase/inc/splittbl.hxx b/sw/source/core/uibase/inc/splittbl.hxx index 522f1d65cab4..013878e3108e 100644 --- a/sw/source/core/uibase/inc/splittbl.hxx +++ b/sw/source/core/uibase/inc/splittbl.hxx @@ -36,7 +36,7 @@ class SwSplitTblDlg : public SvxStandardDialog sal_uInt16 m_nSplit; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ); diff --git a/sw/source/core/uibase/inc/srcedtw.hxx b/sw/source/core/uibase/inc/srcedtw.hxx index c490dc4d6193..4560a86c68aa 100644 --- a/sw/source/core/uibase/inc/srcedtw.hxx +++ b/sw/source/core/uibase/inc/srcedtw.hxx @@ -42,13 +42,13 @@ class TextViewOutWin : public Window ExtTextView* pTextView; protected: - virtual void Paint( const Rectangle& ); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; public: TextViewOutWin(Window* pParent, WinBits nBits) : @@ -102,15 +102,15 @@ private: protected: - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& ); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; // virtual void LoseFocus(); void CreateTextEngine(); void DoSyntaxHighlight( sal_uInt16 nPara ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; DECL_LINK(ScrollHdl, ScrollBar*); @@ -131,7 +131,7 @@ public: TextViewOutWin* GetOutWin() {return pOutWin;} - virtual void Invalidate( sal_uInt16 nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; void ClearModifyFlag() { pTextEngine->SetModified(false); } @@ -146,7 +146,7 @@ public: void SetStartLine(sal_uInt16 nLine){nStartLine = nLine;} - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; void HandleWheelCommand( const CommandEvent& rCEvt ); void SetTextEncoding(rtl_TextEncoding eEncoding); diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx index 3a6d054e91ca..4513a116943e 100644 --- a/sw/source/core/uibase/inc/srcview.hxx +++ b/sw/source/core/uibase/inc/srcview.hxx @@ -41,7 +41,7 @@ class SwSrcView: public SfxViewShell void Init(); // for read-only switching - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; protected: sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, @@ -74,8 +74,8 @@ public: void Load(SwDocShell* pDocShell); - virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual SfxPrinter* GetPrinter( bool bCreate = false ); + virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; + virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); diff --git a/sw/source/core/uibase/inc/srtdlg.hxx b/sw/source/core/uibase/inc/srtdlg.hxx index 90fc60ab165a..e655b6eb88e2 100644 --- a/sw/source/core/uibase/inc/srtdlg.hxx +++ b/sw/source/core/uibase/inc/srtdlg.hxx @@ -74,7 +74,7 @@ class SwSortDlg : public SvxStandardDialog sal_uInt16 nX; sal_uInt16 nY; - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; sal_Unicode GetDelimChar() const; DECL_LINK( CheckHdl, CheckBox * ); diff --git a/sw/source/core/uibase/inc/swdtflvr.hxx b/sw/source/core/uibase/inc/swdtflvr.hxx index 0cef72140788..9a501a0641ca 100644 --- a/sw/source/core/uibase/inc/swdtflvr.hxx +++ b/sw/source/core/uibase/inc/swdtflvr.hxx @@ -136,14 +136,14 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper SwTransferable& operator=( const SwTransferable& ); protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, - const css::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); - virtual void ObjectReleased(); + const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; using TransferableHelper::StartDrag; @@ -205,7 +205,7 @@ public: void Invalidate() {pWrtShell = 0;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx index 8c38330b83d8..d63683bb03da 100644 --- a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx @@ -32,7 +32,7 @@ public: ~SwModalRedlineAcceptDlg(); void AcceptAll( sal_Bool bAccept ); - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/swruler.hxx b/sw/source/core/uibase/inc/swruler.hxx index aebf0b97396d..589f714d77c4 100644 --- a/sw/source/core/uibase/inc/swruler.hxx +++ b/sw/source/core/uibase/inc/swruler.hxx @@ -39,7 +39,7 @@ public: * Paint the ruler. * \param rRect ignored */ - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility @@ -54,26 +54,26 @@ protected: * * When on comment control, it toggles the comment panel visibility. */ - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; /** * Callback function to handle a mouse move event. * * When on comment control, it let the control responsive by highlighting. */ - virtual void MouseMove(const MouseEvent& rMEvt); + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; /** * Callback function to handle a context menu call (mouse right button click). * * When on comment control, it does not do anything. */ - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; /** * Update the view. * * Update the ruler appearance according to the document view and * current cursor position. */ - virtual void Update(); + virtual void Update() SAL_OVERRIDE; /** * Get the rectangle area that should be used to draw the comment control. diff --git a/sw/source/core/uibase/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx index 53e2fabaabd1..9e6f49588b30 100644 --- a/sw/source/core/uibase/inc/swuiccoll.hxx +++ b/sw/source/core/uibase/inc/swuiccoll.hxx @@ -50,7 +50,7 @@ class SwCondCollPage : public SfxTabPage SwCondCollPage(Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK( OnOffHdl, CheckBox* ); DECL_LINK( AssignRemoveHdl, PushButton*); @@ -64,8 +64,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - 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; void SetCollection( SwFmt* pFormat, sal_Bool bNew ); }; diff --git a/sw/source/core/uibase/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx index 27385112a311..c267afeb7bbd 100644 --- a/sw/source/core/uibase/inc/swuicnttab.hxx +++ b/sw/source/core/uibase/inc/swuicnttab.hxx @@ -90,7 +90,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog sal_Bool bExampleCreated; sal_Bool bGlobalFlag; - virtual short Ok(); + virtual short Ok() SAL_OVERRIDE; SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK(CreateExample_Hdl, void*); @@ -103,7 +103,7 @@ public: sal_Bool bGlobal = sal_False); ~SwMultiTOXTabDialog(); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; SwForm* GetForm(CurTOXType eType); @@ -222,11 +222,11 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXSelectTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -314,8 +314,8 @@ public: sal_Bool CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& ); - virtual void GetFocus(); - virtual void setAllocation(const Size &rAllocation); + virtual void GetFocus() SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; void SetFocus2theAllBtn(); private: sal_uInt32 GetControlIndex(FormTokenType eType) const; @@ -327,7 +327,7 @@ class SwIdxTreeListBox : public SvTreeListBox { SwTOXEntryTabPage* pParent; - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwIdxTreeListBox(Window* pPar, WinBits nStyle); void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; } @@ -435,10 +435,10 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXEntryTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -448,7 +448,7 @@ public: void PreTokenButtonRemoved(const SwFormToken& rToken); void SetFocus2theAllBtn(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; class SwTOXStylesTabPage : public SfxTabPage @@ -481,11 +481,11 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXStylesTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/sw/source/core/uibase/inc/swuiidxmrk.hxx b/sw/source/core/uibase/inc/swuiidxmrk.hxx index e552586e353b..7f2a53977543 100644 --- a/sw/source/core/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/core/uibase/inc/swuiidxmrk.hxx @@ -152,7 +152,7 @@ public: class SwIndexMarkFloatDlg : public SfxModelessDialog { SwIndexMarkPane m_aContent; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; public: SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -168,7 +168,7 @@ class SwIndexMarkModalDlg : public SvxStandardDialog public: SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); }; @@ -228,7 +228,7 @@ public: class SwAuthMarkFloatDlg : public SfxModelessDialog { SwAuthorMarkPane m_aContent; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; public: SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -244,7 +244,7 @@ class SwAuthMarkModalDlg : public SvxStandardDialog public: SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); }; diff --git a/sw/source/core/uibase/inc/swuipardlg.hxx b/sw/source/core/uibase/inc/swuipardlg.hxx index 7552b53a1a59..3c6f3cc951f3 100644 --- a/sw/source/core/uibase/inc/swuipardlg.hxx +++ b/sw/source/core/uibase/inc/swuipardlg.hxx @@ -35,7 +35,7 @@ class SwParaDlg: public SfxTabDialog sal_uInt16 m_nParaBckGrnd; sal_uInt16 m_nParaBorder; - void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: SwParaDlg( Window *pParent, diff --git a/sw/source/core/uibase/inc/swvset.hxx b/sw/source/core/uibase/inc/swvset.hxx index 10b71577f1d2..c229998213e6 100644 --- a/sw/source/core/uibase/inc/swvset.hxx +++ b/sw/source/core/uibase/inc/swvset.hxx @@ -25,7 +25,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet public: SwRulerValueSet(Window* pParent, WinBits nWinStyle); ~SwRulerValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/swwrtshitem.hxx b/sw/source/core/uibase/inc/swwrtshitem.hxx index 36c3b52e8c95..8e3974a4be05 100644 --- a/sw/source/core/uibase/inc/swwrtshitem.hxx +++ b/sw/source/core/uibase/inc/swwrtshitem.hxx @@ -33,8 +33,8 @@ public: SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SwWrtShell* GetValue() const { return pWrtSh; } diff --git a/sw/source/core/uibase/inc/tabledlg.hxx b/sw/source/core/uibase/inc/tabledlg.hxx index d18be07670dc..8349b4c7859c 100644 --- a/sw/source/core/uibase/inc/tabledlg.hxx +++ b/sw/source/core/uibase/inc/tabledlg.hxx @@ -38,7 +38,7 @@ class SwTableTabDlg : public SfxTabDialog sal_uInt16 m_nBackgroundId; sal_uInt16 m_nBorderId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: SwTableTabDlg( Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); diff --git a/sw/source/core/uibase/inc/tblctrl.hxx b/sw/source/core/uibase/inc/tblctrl.hxx index fbf66057e2ae..679227d12496 100644 --- a/sw/source/core/uibase/inc/tblctrl.hxx +++ b/sw/source/core/uibase/inc/tblctrl.hxx @@ -30,8 +30,8 @@ public: SwTableOptimizeCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTableOptimizeCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; diff --git a/sw/source/core/uibase/inc/tbxanchr.hxx b/sw/source/core/uibase/inc/tbxanchr.hxx index 96eed47f58d5..d9c6d70fb49a 100644 --- a/sw/source/core/uibase/inc/tbxanchr.hxx +++ b/sw/source/core/uibase/inc/tbxanchr.hxx @@ -27,9 +27,9 @@ class SwTbxAnchor : public SfxToolBoxControl public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Click(); - virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sw/source/core/uibase/inc/tmpdlg.hxx b/sw/source/core/uibase/inc/tmpdlg.hxx index 54c57484336a..7af4a1807069 100644 --- a/sw/source/core/uibase/inc/tmpdlg.hxx +++ b/sw/source/core/uibase/inc/tmpdlg.hxx @@ -78,10 +78,10 @@ public: SwWrtShell* pActShell = 0, bool bNew = false ); - const SfxItemSet* GetRefreshedSet(); + const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/tmplctrl.hxx b/sw/source/core/uibase/inc/tmplctrl.hxx index 9deea7c83496..7d243df6edbb 100644 --- a/sw/source/core/uibase/inc/tmplctrl.hxx +++ b/sw/source/core/uibase/inc/tmplctrl.hxx @@ -25,11 +25,11 @@ class SwTemplateControl : public SfxStatusBarControl { protected: - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/core/uibase/inc/uiitems.hxx b/sw/source/core/uibase/inc/uiitems.hxx index 033adf755882..d90b35eac6a9 100644 --- a/sw/source/core/uibase/inc/uiitems.hxx +++ b/sw/source/core/uibase/inc/uiitems.hxx @@ -41,16 +41,16 @@ public: SwPageFtnInfoItem(const SwPageFtnInfoItem& rItem ); ~SwPageFtnInfoItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } @@ -65,8 +65,8 @@ public: SwPtrItem( const sal_uInt16 nId = FN_PARAM_GRF_DIALOG, void* pPtr = 0); SwPtrItem( const SwPtrItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetValue(void * pPtr) { pMisc= pPtr; } void* GetValue() const { return pMisc; } @@ -81,11 +81,11 @@ public: SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const SwNumRule* GetNumRule() const { return pRule; } SwNumRule* GetNumRule() { return pRule; } @@ -96,7 +96,7 @@ class SwBackgroundDestinationItem : public SfxUInt16Item public: SwBackgroundDestinationItem(sal_uInt16 nWhich, sal_uInt16 nValue); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem @@ -107,8 +107,8 @@ public: SwPaMItem( const sal_uInt16 nId = FN_PARAM_PAM, SwPaM* pPaM = NULL); SwPaMItem( const SwPaMItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetValue(SwPaM * pPaM) { m_pPaM= pPaM; } SwPaM* GetValue() const { return m_pPaM; } diff --git a/sw/source/core/uibase/inc/uinums.hxx b/sw/source/core/uibase/inc/uinums.hxx index a474dbd88bd1..b28fd2a5222e 100644 --- a/sw/source/core/uibase/inc/uinums.hxx +++ b/sw/source/core/uibase/inc/uinums.hxx @@ -108,7 +108,7 @@ public: virtual ~SwChapterNumRules(); virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, - sal_uInt16 nIdx); + sal_uInt16 nIdx) SAL_OVERRIDE; }; // INLINE METHODE -------------------------------------------------------- diff --git a/sw/source/core/uibase/inc/uivwimp.hxx b/sw/source/core/uibase/inc/uivwimp.hxx index 075dbf626708..b0e94379bebe 100644 --- a/sw/source/core/uibase/inc/uivwimp.hxx +++ b/sw/source/core/uibase/inc/uivwimp.hxx @@ -55,7 +55,7 @@ public: // XEventListener virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void ViewDestroyed() { pView = 0; } }; @@ -68,12 +68,12 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) - throw ( com::sun::star::uno::RuntimeException, std::exception ); + throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XClipboardListener virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject ) throw (com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; public: SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {} diff --git a/sw/source/core/uibase/inc/unoatxt.hxx b/sw/source/core/uibase/inc/unoatxt.hxx index 3a27de5d55e7..90338fdb3973 100644 --- a/sw/source/core/uibase/inc/unoatxt.hxx +++ b/sw/source/core/uibase/inc/unoatxt.hxx @@ -66,26 +66,26 @@ public: SwXAutoTextContainer(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XAutoTextContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -113,44 +113,44 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XAutoTextGroup - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void Invalidate(); }; @@ -195,7 +195,7 @@ protected: void implFlushDocument( bool _bCloseDoc = false ); // SfxListener overridables - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; protected: virtual ~SwXAutoTextEntry(); // ref-counted objects are not to be deleted from outside -> protected dtor @@ -206,33 +206,33 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XAutoTextEntry - virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pGlossaries = 0;} const SwGlossaries* GetGlossaries() { return pGlossaries; } @@ -256,7 +256,7 @@ public: ~SwAutoTextEventDescriptor(); virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -267,7 +267,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void getByName( SvxMacro& rMacro, /// macro to be filled @@ -275,7 +275,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx index eced0ec34c8c..23a2a7ab21e7 100644 --- a/sw/source/core/uibase/inc/unodispatch.hxx +++ b/sw/source/core/uibase/inc/unodispatch.hxx @@ -68,21 +68,21 @@ public: ~SwXDispatchProviderInterceptor(); //XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // view destroyed void Invalidate(); @@ -110,15 +110,15 @@ public: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const sal_Char* GetDBChangeURL(); }; diff --git a/sw/source/core/uibase/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx index 211c2cbfe41b..a0780f46af52 100644 --- a/sw/source/core/uibase/inc/unomailmerge.hxx +++ b/sw/source/core/uibase/inc/unomailmerge.hxx @@ -153,33 +153,33 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XCancellable - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMailMergeBroadcaster - virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); diff --git a/sw/source/core/uibase/inc/unomod.hxx b/sw/source/core/uibase/inc/unomod.hxx index 1d1c8823eb7c..306045104621 100644 --- a/sw/source/core/uibase/inc/unomod.hxx +++ b/sw/source/core/uibase/inc/unomod.hxx @@ -55,19 +55,19 @@ public: //XViewSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPrintSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; enum SwXPrintSettingsType @@ -86,18 +86,18 @@ protected: SwDoc *mpDoc; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual ~SwXPrintSettings() throw(); @@ -106,11 +106,11 @@ public: //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXViewSettings : public comphelper::ChainableHelperNoState @@ -129,18 +129,18 @@ protected: sal_Bool mbApplyVRulerMetric; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual ~SwXViewSettings() throw(); @@ -148,9 +148,9 @@ public: SwXViewSettings(sal_Bool bWeb, SwView* pView); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool IsValid() const {return bObjectValid;} void Invalidate() {bObjectValid = sal_False;} diff --git a/sw/source/core/uibase/inc/unotools.hxx b/sw/source/core/uibase/inc/unotools.hxx index e821ec97dd97..480590135b64 100644 --- a/sw/source/core/uibase/inc/unotools.hxx +++ b/sw/source/core/uibase/inc/unotools.hxx @@ -41,9 +41,9 @@ class SwFrmCtrlWindow : public VclEventBox public: SwFrmCtrlWindow(Window* pParent, SwOneExampleFrame* pFrame); - virtual void Command( const CommandEvent& rCEvt ); - virtual Size GetOptimalSize() const; - virtual void Resize(); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; }; class MenuResource : public Resource diff --git a/sw/source/core/uibase/inc/unotxvw.hxx b/sw/source/core/uibase/inc/unotxvw.hxx index 76f370ca1eba..9346cab1cd9a 100644 --- a/sw/source/core/uibase/inc/unotxvw.hxx +++ b/sw/source/core/uibase/inc/unotxvw.hxx @@ -76,76 +76,76 @@ protected: public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSelectionSupplier virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTextViewCursorSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XViewSettings - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XRubySelection virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRubyList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTransferableSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void NotifySelChanged(); void NotifyDBChanged(); @@ -183,154 +183,154 @@ public: DECLARE_XINTERFACE() //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isVisible(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getPosition(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTextCursor - neu virtual void SAL_CALL collapseToStart() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL collapseToEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isCollapsed() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XPageCursor virtual sal_Bool SAL_CALL jumpToFirstPage() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL jumpToLastPage() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToNextPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToPreviousPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToEndOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToStartOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToNextPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToPreviousPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToEndOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToStartOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getPage() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& aString) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XScreenCursor virtual sal_Bool SAL_CALL screenDown() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL screenUp() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XViewCursor virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XLineCursor virtual sal_Bool SAL_CALL isAtStartOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAtEndOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void Invalidate(){m_pView = 0;} // ITextCursorHelper - virtual const SwPaM* GetPaM() const; - virtual SwPaM* GetPaM(); - virtual const SwDoc* GetDoc() const; - virtual SwDoc* GetDoc(); + virtual const SwPaM* GetPaM() const SAL_OVERRIDE; + virtual SwPaM* GetPaM() SAL_OVERRIDE; + virtual const SwDoc* GetDoc() const SAL_OVERRIDE; + virtual SwDoc* GetDoc() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/usrpref.hxx b/sw/source/core/uibase/inc/usrpref.hxx index 9169166c5a6b..8d04de4874f8 100644 --- a/sw/source/core/uibase/inc/usrpref.hxx +++ b/sw/source/core/uibase/inc/usrpref.hxx @@ -37,8 +37,8 @@ class SwContentViewConfig : public utl::ConfigItem ~SwContentViewConfig(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -54,8 +54,8 @@ class SwLayoutViewConfig : public utl::ConfigItem SwLayoutViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwLayoutViewConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -69,8 +69,8 @@ class SwGridConfig : public utl::ConfigItem SwGridConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwGridConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -84,8 +84,8 @@ class SwCursorConfig : public utl::ConfigItem SwCursorConfig(SwMasterUsrPref& rParent); ~SwCursorConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -99,8 +99,8 @@ class SwWebColorConfig : public utl::ConfigItem SwWebColorConfig(SwMasterUsrPref& rParent); ~SwWebColorConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx index b5ee5317b55b..14f56ef54a0b 100644 --- a/sw/source/core/uibase/inc/view.hxx +++ b/sw/source/core/uibase/inc/view.hxx @@ -336,12 +336,12 @@ class SW_DLLPUBLIC SwView: public SfxViewShell { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; } // methods for printing - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ); - SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent, - const SfxItemSet& rSet); + const SfxItemSet& rSet) SAL_OVERRIDE; // for readonly switching - SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; SAL_DLLPRIVATE void _CheckReadonlyState(); SAL_DLLPRIVATE void _CheckReadonlySelection(); @@ -356,7 +356,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void ShowAtResize(); - SAL_DLLPRIVATE virtual void Move(); + SAL_DLLPRIVATE virtual void Move() SAL_OVERRIDE; SAL_DLLPRIVATE void DocumentStatsChanged(); @@ -378,10 +378,10 @@ protected: virtual void SelectShell(); - virtual void Activate(bool); - virtual void Deactivate(bool); - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void Activate(bool) SAL_OVERRIDE; + virtual void Deactivate(bool) SAL_OVERRIDE; + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; void SetImageButtonColor(Color& rColor); @@ -402,23 +402,23 @@ public: SfxDispatcher &GetDispatcher(); void GotFocus() const; - virtual SdrView* GetDrawView() const; - virtual bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( bool bOn = true ); - virtual ErrCode DoVerb( long nVerb ); + virtual SdrView* GetDrawView() const SAL_OVERRIDE; + virtual bool HasUIFeature( sal_uInt32 nFeature ) SAL_OVERRIDE; + virtual void ShowCursor( bool bOn = true ) SAL_OVERRIDE; + virtual ErrCode DoVerb( long nVerb ) SAL_OVERRIDE; virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, - sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); + sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false) SAL_OVERRIDE; ShellModes GetShellMode(); com::sun::star::view::XSelectionSupplier* GetUNOObject(); OUString GetSelectionTextParam( bool bCompleteWords, bool bEraseTrail ); - virtual bool HasSelection( bool bText ) const; - virtual OUString GetSelectionText( bool bCompleteWords = false ); + virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; + virtual OUString GetSelectionText( bool bCompleteWords = false ) SAL_OVERRIDE; virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; - virtual void MarginChanged(); + virtual void MarginChanged() SAL_OVERRIDE; // replace word/selection with text from the thesaurus // (this code has special handling for "in word" character) @@ -493,7 +493,7 @@ public: void InsFrmMode(sal_uInt16 nCols); void SetZoom( SvxZoomType eZoomType, short nFactor = 100, sal_Bool bViewOnly = sal_False); - virtual void SetZoomFactor( const Fraction &rX, const Fraction & ); + virtual void SetZoomFactor( const Fraction &rX, const Fraction & ) SAL_OVERRIDE; void SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewOnly = sal_False ); @@ -595,10 +595,10 @@ public: // so that in the SubShells' DTors m_pShell can be reset if applicable void ResetSubShell() { m_pShell = 0; } - virtual void WriteUserData(OUString &, bool bBrowse = false); - virtual void ReadUserData(const OUString &, bool bBrowse = false); - virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ); - virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ); + virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) SAL_OVERRIDE; + virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) SAL_OVERRIDE; void SetCrsrAtTop( sal_Bool bFlag, sal_Bool bCenter = sal_False ) { m_bTopCrsr = bFlag, m_bCenterCrsr = bCenter; } diff --git a/sw/source/core/uibase/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx index 531dc57d4196..2ca684f5c947 100644 --- a/sw/source/core/uibase/inc/viewlayoutctrl.hxx +++ b/sw/source/core/uibase/inc/viewlayoutctrl.hxx @@ -36,9 +36,9 @@ public: SwViewLayoutControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SwViewLayoutControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); - virtual bool MouseButtonDown( const MouseEvent & ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/wordcountdialog.hxx b/sw/source/core/uibase/inc/wordcountdialog.hxx index 3bebd69f4967..85c3b036502d 100644 --- a/sw/source/core/uibase/inc/wordcountdialog.hxx +++ b/sw/source/core/uibase/inc/wordcountdialog.hxx @@ -28,7 +28,7 @@ struct SwDocStat; class SwWordCountFloatDlg : public SfxModelessDialog { - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc); void showCJK(bool bShowCJK); diff --git a/sw/source/core/uibase/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx index eef6332e01db..ef9000e30445 100644 --- a/sw/source/core/uibase/inc/workctrl.hxx +++ b/sw/source/core/uibase/inc/workctrl.hxx @@ -65,13 +65,13 @@ public: SwTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTbxInsertCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwTbxAutoTextCtrl : public SfxToolBoxControl @@ -86,11 +86,11 @@ public: SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxAutoTextCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK(PopupHdl, PopupMenu*); }; @@ -107,19 +107,19 @@ public: SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxFieldCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK(PopupHdl, PopupMenu*); }; class SwScrollNaviToolBox : public ToolBox { - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwScrollNaviToolBox(Window* pParent, WinBits nWinStyle ) : @@ -141,7 +141,7 @@ class SwScrollNaviPopup : public SfxPopupWindow protected: DECL_LINK(SelectHdl, ToolBox*); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window *pParent ); @@ -149,7 +149,7 @@ public: static OUString GetQuickHelpText(sal_Bool bNext); - virtual SfxPopupWindow* Clone() const; + virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; void GrabFocus(){aToolBox.GrabFocus();} }; @@ -162,7 +162,7 @@ class SwHlpImageButton : public ImageButton SwHlpImageButton(Window* pParent, const ResId& rResId, sal_Bool bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; @@ -176,9 +176,9 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx index 7a9aa1fd4bc1..3ded65121736 100644 --- a/sw/source/core/uibase/inc/wrap.hxx +++ b/sw/source/core/uibase/inc/wrap.hxx @@ -87,9 +87,9 @@ class SwWrapTabPage: public SfxTabPage void ApplyImageList(); void EnableModes(const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; DECL_LINK( RangeModifyHdl, MetricField * ); DECL_LINK( WrapTypeHdl, RadioButton * ); @@ -102,8 +102,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - 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; static sal_uInt16* GetRanges(); inline void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } diff --git a/sw/source/core/uibase/inc/wrtsh.hxx b/sw/source/core/uibase/inc/wrtsh.hxx index b0188f8d6403..352065bae666 100644 --- a/sw/source/core/uibase/inc/wrtsh.hxx +++ b/sw/source/core/uibase/inc/wrtsh.hxx @@ -328,13 +328,13 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); void LaunchOLEObj( long nVerb = 0 ); // start server - virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); + virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) SAL_OVERRIDE; virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, const SwRect *pFlyFrmRect = 0, - const bool bNoTxtFrmPrtAreaChanged = false ); + const bool bNoTxtFrmPrtAreaChanged = false ) SAL_OVERRIDE; virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, - const SwRect &rFrm ); + const SwRect &rFrm ) SAL_OVERRIDE; // styles and formats @@ -394,7 +394,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, OString* pWindowState = 0); //"Handler" for changes at DrawView - for controls. - virtual void DrawSelChanged( ); + virtual void DrawSelChanged( ) SAL_OVERRIDE; // jump to bookmark and set the "selctions-flags" correctly again sal_Bool GotoMark( const ::sw::mark::IMark* const pMark ); @@ -435,8 +435,8 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); - virtual void ApplyViewOptions( const SwViewOption &rOpt ); - virtual void SetReadonlyOption( sal_Bool bSet ); + virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE; + virtual void SetReadonlyOption( sal_Bool bSet ) SAL_OVERRIDE; // automatic update of styles void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet); @@ -471,7 +471,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False); void ChangeHeaderOrFooter(const OUString& rStyleName, sal_Bool bHeader, sal_Bool bOn, sal_Bool bShowWarning); - virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ); + virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) SAL_OVERRIDE; private: diff --git a/sw/source/core/uibase/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx index c6a4d09315cc..199437debe6c 100644 --- a/sw/source/core/uibase/inc/wview.hxx +++ b/sw/source/core/uibase/inc/wview.hxx @@ -25,7 +25,7 @@ class SW_DLLPUBLIC SwWebView: public SwView { protected: - virtual void SelectShell(); + virtual void SelectShell() SAL_OVERRIDE; public: SFX_DECL_VIEWFACTORY(SwWebView); diff --git a/sw/source/core/uibase/inc/zoomctrl.hxx b/sw/source/core/uibase/inc/zoomctrl.hxx index 89818fdf4f72..52193f05970f 100644 --- a/sw/source/core/uibase/inc/zoomctrl.hxx +++ b/sw/source/core/uibase/inc/zoomctrl.hxx @@ -26,10 +26,10 @@ class SwZoomControl : public SvxZoomStatusBarControl private: OUString sPreviewZoom; public: - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/core/uibase/lingu/sdrhhcwrap.hxx b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx index d6befe334b44..868727e4c189 100644 --- a/sw/source/core/uibase/lingu/sdrhhcwrap.hxx +++ b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx @@ -47,7 +47,7 @@ public: virtual ~SdrHHCWrapper(); - virtual bool ConvertNextDocument(); + virtual bool ConvertNextDocument() SAL_OVERRIDE; void StartTextConversion(); }; diff --git a/sw/source/core/uibase/ribbar/workctrl.cxx b/sw/source/core/uibase/ribbar/workctrl.cxx index e1d58875f9ba..20f03c20bed9 100644 --- a/sw/source/core/uibase/ribbar/workctrl.cxx +++ b/sw/source/core/uibase/ribbar/workctrl.cxx @@ -622,8 +622,8 @@ public: ~SwZoomBox_Impl(); protected: - virtual void Select(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Select() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void ReleaseFocus(); diff --git a/sw/source/core/uibase/shells/grfsh.cxx b/sw/source/core/uibase/shells/grfsh.cxx index b8c9b422396a..eb5c5ca877d4 100644 --- a/sw/source/core/uibase/shells/grfsh.cxx +++ b/sw/source/core/uibase/shells/grfsh.cxx @@ -88,7 +88,7 @@ namespace m_pShell (pShell) {} - virtual void Update( Graphic& aGraphic ) + virtual void Update( Graphic& aGraphic ) SAL_OVERRIDE { m_pShell->ReRead(OUString(), OUString(), (const Graphic*) &aGraphic); } diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx index d7b6e57153e0..fd534c8e37f1 100644 --- a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx @@ -66,7 +66,7 @@ namespace sw { namespace sidebar { const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled); + const bool bIsEnabled) SAL_OVERRIDE; SfxBindings* GetBindings() const { diff --git a/sw/source/core/uibase/sidebar/SwPanelFactory.cxx b/sw/source/core/uibase/sidebar/SwPanelFactory.cxx index 18220cdbdf80..94a6eba06d32 100644 --- a/sw/source/core/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/core/uibase/sidebar/SwPanelFactory.cxx @@ -60,7 +60,7 @@ public: throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception ); + cssu::RuntimeException, std::exception ) SAL_OVERRIDE; }; SwPanelFactory::SwPanelFactory (void) diff --git a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx index c5e524c25a0f..4a8a269bfacd 100644 --- a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx @@ -45,7 +45,7 @@ namespace sw { namespace sidebar { const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled); + const bool bIsEnabled) SAL_OVERRIDE; private: WrapPropertyPanel( diff --git a/sw/source/core/uibase/table/tablepg.hxx b/sw/source/core/uibase/table/tablepg.hxx index 87b4722b2b19..8b5f5a5ef498 100644 --- a/sw/source/core/uibase/table/tablepg.hxx +++ b/sw/source/core/uibase/table/tablepg.hxx @@ -83,10 +83,10 @@ public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; // TabPage Format/Table/Columns @@ -133,10 +133,10 @@ public: ~SwTableColumnPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; @@ -182,8 +182,8 @@ class SwTextFlowPage : public SfxTabPage 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; void SetShell(SwWrtShell* pSh); diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx index ce9382ec0b21..06147f5a9c0c 100644 --- a/sw/source/core/uibase/uiview/pview.cxx +++ b/sw/source/core/uibase/uiview/pview.cxx @@ -142,7 +142,7 @@ class SwPreviewZoomDlg : public SvxStandardDialog NumericField* m_pRowEdit; NumericField* m_pColEdit; - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwPreviewZoomDlg( SwPagePreviewWin& rParent ); diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx index 49edf23964a0..0a356247b0f9 100644 --- a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx @@ -50,18 +50,18 @@ protected: SfxPrinter* mpPrinter; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; protected: virtual ~SwXDocumentSettings() throw(); @@ -70,23 +70,23 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release( ) - throw (); + throw () SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx index e72c80a190d9..cc4923d2f8d9 100644 --- a/sw/source/core/uibase/uno/unomailmerge.cxx +++ b/sw/source/core/uibase/uno/unomailmerge.cxx @@ -201,11 +201,11 @@ namespace ~DelayedFileDeletion( ); // XCloseListener - virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception); - virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception); + virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: void implTakeOwnership( ); diff --git a/sw/source/core/uibase/uno/unomodule.hxx b/sw/source/core/uibase/uno/unomodule.hxx index a32e2c5dfc4b..3152caa77bad 100644 --- a/sw/source/core/uibase/uno/unomodule.hxx +++ b/sw/source/core/uibase/uno/unomodule.hxx @@ -58,22 +58,22 @@ public: {} // XNotifyingDispatch - virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatchProvider - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, - sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) ; + sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/utlui/bookctrl.cxx b/sw/source/core/uibase/utlui/bookctrl.cxx index 1e5770f62f1a..65d8d090bd8a 100644 --- a/sw/source/core/uibase/utlui/bookctrl.cxx +++ b/sw/source/core/uibase/utlui/bookctrl.cxx @@ -44,7 +44,7 @@ public: private: sal_uInt16 nCurId; - virtual void Select(); + virtual void Select() SAL_OVERRIDE; }; BookmarkPopup_Impl::BookmarkPopup_Impl() : diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx index 735ad8863416..969cf14d6d75 100644 --- a/sw/source/core/uibase/utlui/content.cxx +++ b/sw/source/core/uibase/utlui/content.cxx @@ -3434,7 +3434,7 @@ public: virtual void Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, - const SvTreeListEntry* pEntry); + const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; void SwContentTree::InitEntry(SvTreeListEntry* pEntry, diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx index 259eef188958..173824113f3e 100644 --- a/sw/source/core/uibase/utlui/glbltree.cxx +++ b/sw/source/core/uibase/utlui/glbltree.cxx @@ -131,7 +131,7 @@ public: StartListening(rFrame); } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; bool IsValid() const {return bValid;} }; diff --git a/sw/source/core/uibase/utlui/tmplctrl.cxx b/sw/source/core/uibase/utlui/tmplctrl.cxx index a4a59ffc5370..0f774e395fbc 100644 --- a/sw/source/core/uibase/utlui/tmplctrl.cxx +++ b/sw/source/core/uibase/utlui/tmplctrl.cxx @@ -42,7 +42,7 @@ public: private: sal_uInt16 nCurId; - virtual void Select(); + virtual void Select() SAL_OVERRIDE; }; SwTemplatePopup_Impl::SwTemplatePopup_Impl() : diff --git a/sw/source/core/uibase/wrtsh/wrtsh2.cxx b/sw/source/core/uibase/wrtsh/wrtsh2.cxx index 1634d1dae0b6..4149b48bf7d7 100644 --- a/sw/source/core/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/core/uibase/wrtsh/wrtsh2.cxx @@ -172,7 +172,7 @@ class FieldDeletionModify : public SwModify public: FieldDeletionModify(AbstractFldInputDlg* pInputFieldDlg) : mpInputFieldDlg(pInputFieldDlg) {} - void Modify( const SfxPoolItem* pOld, const SfxPoolItem *) + void Modify( const SfxPoolItem* pOld, const SfxPoolItem *) SAL_OVERRIDE { // Input fields have been deleted: better to close the dialog if (pOld->Which() == RES_FIELD_DELETED) |