summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-09-01 18:46:31 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-09-01 20:11:53 +0200
commitac5b519c0b572975955afab3237c19f6a214bc5b (patch)
treebba6e1eec8a3dadd0cb7be1baa578ee5ca6cd9a0
parent9c4ae2ac2b13f9c0f034f64fb7ad0b4dcae3bb96 (diff)
loplugin:unnecessaryvirtual
Change-Id: I53194699cf82a1b8d69680da092a44c73a690e96 Reviewed-on: https://gerrit.libreoffice.org/78371 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--include/svx/AccessibleGraphicShape.hxx3
-rw-r--r--include/svx/svdmodel.hxx2
-rw-r--r--svx/source/accessibility/AccessibleGraphicShape.cxx9
3 files changed, 1 insertions, 13 deletions
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index 1028e19efcfc..fcffbdd39df3 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -86,8 +86,7 @@ public:
virtual css::uno::Sequence< css::uno::Type> SAL_CALL
getTypes() override;
-/// Return this object's role.
- virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+
protected:
/// Create a name string that contains the accessible name.
virtual OUString
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index f5a16bd7ec2f..27cf5571e2b1 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -587,8 +587,6 @@ public:
static const css::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId();
- virtual ImageMap* GetImageMapForObject(SdrObject*){return nullptr;};
-
/** enables (true) or disables (false) recording of undo actions
If undo actions are added while undo is disabled, they are deleted.
Disabling undo does not clear the current undo buffer! */
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 04a7a9644ee1..d44c8583fe79 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -150,13 +150,4 @@ OUString
return sName;
}
-// Return this object's role.
-sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole()
-{
- if( m_pShape->getSdrModelFromSdrObject().GetImageMapForObject(m_pShape) != nullptr )
- return AccessibleRole::IMAGE_MAP;
- else
- return AccessibleShape::getAccessibleRole();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */