loplugin:virtualdown in AccessibleShape

Change-Id: I35c8c4b2c561f3ce4fdc3d94cc74463abbc087f4
Reviewed-on: https://gerrit.libreoffice.org/73769
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 7 insertions, 81 deletions

diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 8c8115d9d748..2ea2f73dd6d7 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -138,8 +138,7 @@ private:
         CreateAccessibleName( ) override;
 
     /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription( ) override;
+    OUString CreateAccessibleDescription();
 
 #ifdef DBG_UTIL
     /// Set the specified state
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index 7be88770c30c..8b613ea7e0e4 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -94,8 +94,7 @@ protected:
         CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription () override;
+    OUString CreateAccessibleDescription();
 
 private:
     AccessibleGraphicShape (const AccessibleGraphicShape&) = delete;
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index c25eb75fae54..3c4f71651582 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -100,8 +100,7 @@ protected:
         CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription () override;
+    OUString CreateAccessibleDescription();
 
 private:
     AccessibleOLEShape (const AccessibleOLEShape&) = delete;
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 79f44f439c45..9a2f206dfb8a 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -411,9 +411,6 @@ protected:
     virtual OUString
         CreateAccessibleName() override;
 
-    /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription();
     /// @throws css::uno::RuntimeException
     OUString
        GetFullAccessibleName(AccessibleShape *shape);
diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx
index f076bb4affd2..1c9bda097225 100644
--- a/sd/source/ui/inc/AccessiblePageShape.hxx
+++ b/sd/source/ui/inc/AccessiblePageShape.hxx
@@ -112,8 +112,7 @@ protected:
         CreateAccessibleName() override;
 
     /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription() override;
+    static OUString CreateAccessibleDescription();
 
 private:
     css::uno::Reference<css::drawing::XDrawPage> mxPage;
diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
index 288cda8a169b..07fabcd6e409 100644
--- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
@@ -53,8 +53,7 @@ public:
         CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription () override;
+    OUString CreateAccessibleDescription();
     /// Return this object's role.
     virtual sal_Int16 SAL_CALL getAccessibleRole () override;
 };
diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
index 9ae951438168..46e69d16845c 100644
--- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
@@ -50,8 +50,7 @@ public:
         CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription () override;
+    OUString CreateAccessibleDescription();
     /// Return this object's role.
     virtual sal_Int16 SAL_CALL getAccessibleRole () override;
 };
diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx
index ae918ebcb1f8..96ce2f06fdfd 100644
--- a/sd/source/ui/inc/AccessiblePresentationShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx
@@ -50,8 +50,7 @@ public:
         CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
-    virtual OUString
-        CreateAccessibleDescription () override;
+    OUString CreateAccessibleDescription();
     OUString GetStyle() override;
 
 private:
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 832852576472..5eb3bbfd5698 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1069,70 +1069,6 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape)
     return sName;
 }
 
-OUString
-    AccessibleShape::CreateAccessibleDescription()
-{
-    DescriptionGenerator aDG (mxShape);
-    aDG.Initialize (CreateAccessibleBaseName());
-    switch (ShapeTypeHandler::Instance().GetTypeId (mxShape))
-    {
-        case DRAWING_3D_CUBE:
-        case DRAWING_3D_EXTRUDE:
-        case DRAWING_3D_LATHE:
-        case DRAWING_3D_SPHERE:
-            aDG.Add3DProperties ();
-            break;
-
-        case DRAWING_3D_SCENE:
-        case DRAWING_GROUP:
-        case DRAWING_PAGE:
-            // No further information is appended.
-            break;
-
-        case DRAWING_CAPTION:
-        case DRAWING_CLOSED_BEZIER:
-        case DRAWING_CLOSED_FREEHAND:
-        case DRAWING_ELLIPSE:
-        case DRAWING_POLY_POLYGON:
-        case DRAWING_POLY_POLYGON_PATH:
-        case DRAWING_RECTANGLE:
-            aDG.AddLineProperties ();
-            aDG.AddFillProperties ();
-            break;
-
-        case DRAWING_CONNECTOR:
-        case DRAWING_LINE:
-        case DRAWING_MEASURE:
-        case DRAWING_OPEN_BEZIER:
-        case DRAWING_OPEN_FREEHAND:
-        case DRAWING_POLY_LINE:
-        case DRAWING_POLY_LINE_PATH:
-            aDG.AddLineProperties ();
-            break;
-
-        case DRAWING_CONTROL:
-            aDG.AddProperty ("ControlBackground", DescriptionGenerator::PropertyType::Color, "");
-            aDG.AddProperty ("ControlBorder", DescriptionGenerator::PropertyType::Integer, "");
-            break;
-
-        case DRAWING_TEXT:
-            aDG.AddTextProperties ();
-            break;
-
-        default:
-            aDG.Initialize ("Unknown accessible shape");
-            uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
-            if (xDescriptor.is())
-            {
-                aDG.AppendString ("service name=");
-                aDG.AppendString (xDescriptor->getShapeType());
-            }
-    }
-
-    return aDG();
-}
-
-
 // protected
 void AccessibleShape::disposing()
 {