summaryrefslogtreecommitdiff
path: root/include/sfx2/sidebar
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /include/sfx2/sidebar
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'include/sfx2/sidebar')
-rw-r--r--include/sfx2/sidebar/ControllerItem.hxx2
-rw-r--r--include/sfx2/sidebar/SidebarPanelBase.hxx22
-rw-r--r--include/sfx2/sidebar/SidebarToolBox.hxx6
-rw-r--r--include/sfx2/sidebar/Theme.hxx22
4 files changed, 26 insertions, 26 deletions
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 8a5fa68409bb..40ea6da108b2 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -125,7 +125,7 @@ public:
protected:
- virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState);
+ virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE;
private:
ItemUpdateReceiverInterface& mrItemUpdateReceiver;
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 54fd0537e0cb..eded1b333079 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -69,35 +69,35 @@ public:
// XContextChangeEventListener
virtual void SAL_CALL notifyContextChangeEvent (
const css::ui::ContextChangeEventObject& rEvent)
- throw (cssu::RuntimeException, std::exception);
+ throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing (
const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception);
+ throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
// XUIElement
virtual cssu::Reference<css::frame::XFrame> SAL_CALL getFrame (void)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::rtl::OUString SAL_CALL getResourceURL (void)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL getType (void)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual cssu::Reference<cssu::XInterface> SAL_CALL getRealInterface (void)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
// XToolPanel
virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible (
const cssu::Reference<css::accessibility::XAccessible>& rxParentAccessible)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
// XSidebarPanel
virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMinimalWidth ()
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
cssu::Reference<css::frame::XFrame> mxFrame;
@@ -110,7 +110,7 @@ protected:
virtual ~SidebarPanelBase (void);
virtual void SAL_CALL disposing (void)
- throw (cssu::RuntimeException);
+ throw (cssu::RuntimeException) SAL_OVERRIDE;
private:
Window* mpControl;
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index c0e86e07733f..aa712c6b4a01 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -48,11 +48,11 @@ public:
const com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rFrame,
ToolBoxItemBits nBits = 0,
const Size& rRequestedSize = Size(),
- sal_uInt16 nPos = TOOLBOX_APPEND);
+ sal_uInt16 nPos = TOOLBOX_APPEND) SAL_OVERRIDE;
- virtual void Paint (const Rectangle& rRect);
+ virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE;
- virtual bool Notify (NotifyEvent& rEvent);
+ virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
cssu::Reference<css::frame::XToolbarController> GetControllerForItemId (
const sal_uInt16 nItemId) const;
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 466e20da0d56..b0dc72d03554 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -157,55 +157,55 @@ public:
Theme (void);
virtual ~Theme (void);
- virtual void SAL_CALL disposing (void);
+ virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
static cssu::Reference<css::beans::XPropertySet> GetPropertySet (void);
// beans::XPropertySet
virtual cssu::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue (
const ::rtl::OUString& rsPropertyName,
const cssu::Any& rValue)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual cssu::Any SAL_CALL getPropertyValue (
const ::rtl::OUString& rsPropertyName)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception);
+ cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception);
+ cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception);
+ cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const ::rtl::OUString& rsPropertyName,
const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception);
+ cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const ::rtl::OUString& rsPropertyName,
const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- cssu::RuntimeException, std::exception);
+ cssu::RuntimeException, std::exception) SAL_OVERRIDE;
// beans::XPropertySetInfo
virtual cssu::Sequence<css::beans::Property> SAL_CALL getProperties (void)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName)
throw(css::beans::UnknownPropertyException,
- cssu::RuntimeException, std::exception);
+ cssu::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName)
- throw(cssu::RuntimeException, std::exception);
+ throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
private:
static Theme& GetCurrentTheme();