don't see why this has to be global

2 files changed, 100 insertions, 106 deletions

diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx
index 7a7407e91f49..2424224b5a16 100644
--- a/svx/inc/svx/SvxShapeTypes.hxx
+++ b/svx/inc/svx/SvxShapeTypes.hxx
@@ -77,11 +77,6 @@ enum SvxShapeTypes
     DRAWING_END = DRAWING_MEDIA
 };
 
-/** List of shape type descriptors corresponding to the
-    <type>SvxShapeTypes</type> enum.
-*/
-extern ShapeTypeDescriptor aSvxShapeTypeList[];
-
 } // end of namespace accessibility
 
 #endif
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx
index 6f172966a4a5..6ff5e1a6eba3 100644
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.cxx
@@ -95,113 +95,112 @@ AccessibleShape* CreateSvxAccessibleShape (
     }
 }
 
-
-
-ShapeTypeDescriptor aSvxShapeTypeList[] = {
-    ShapeTypeDescriptor (DRAWING_TEXT,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TextShape")),
-        CreateSvxAccessibleShape),
-    ShapeTypeDescriptor (DRAWING_RECTANGLE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape")),
-        CreateSvxAccessibleShape),
-    ShapeTypeDescriptor (   DRAWING_ELLIPSE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.EllipseShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_CONTROL,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_CONNECTOR,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_MEASURE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MeasureShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_LINE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_POLY_POLYGON,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_POLY_LINE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_OPEN_BEZIER,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenBezierShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_CLOSED_BEZIER,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedBezierShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_OPEN_FREEHAND,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenFreeHandShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_CLOSED_FREEHAND,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedFreeHandShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_POLY_POLYGON_PATH,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonPathShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_POLY_LINE_PATH,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLinePathShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_GRAPHIC_OBJECT,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_GROUP,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_OLE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_PAGE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PageShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_CAPTION,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_FRAME,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FrameShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_PLUGIN,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PluginShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_APPLET,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.AppletShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_3D_SCENE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSceneObject")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_3D_CUBE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DCubeObject")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_3D_SPHERE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSphereObject")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_3D_LATHE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DLatheObject")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_3D_EXTRUDE,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_CUSTOM,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_TABLE,
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ),
-        CreateSvxAccessibleShape ),
-    ShapeTypeDescriptor (   DRAWING_MEDIA,
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MediaShape" ) ),
-        CreateSvxAccessibleShape ),
-
-};
-
-
 void RegisterDrawShapeTypes (void)
 {
+    /** List of shape type descriptors corresponding to the
+        <type>SvxShapeTypes</type> enum.
+    */
+    ShapeTypeDescriptor aSvxShapeTypeList[] = {
+        ShapeTypeDescriptor (DRAWING_TEXT,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TextShape")),
+            CreateSvxAccessibleShape),
+        ShapeTypeDescriptor (DRAWING_RECTANGLE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape")),
+            CreateSvxAccessibleShape),
+        ShapeTypeDescriptor (   DRAWING_ELLIPSE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.EllipseShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_CONTROL,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_CONNECTOR,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_MEASURE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MeasureShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_LINE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_POLY_POLYGON,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_POLY_LINE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_OPEN_BEZIER,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenBezierShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_CLOSED_BEZIER,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedBezierShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_OPEN_FREEHAND,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenFreeHandShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_CLOSED_FREEHAND,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedFreeHandShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_POLY_POLYGON_PATH,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonPathShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_POLY_LINE_PATH,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLinePathShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_GRAPHIC_OBJECT,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_GROUP,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_OLE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_PAGE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PageShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_CAPTION,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_FRAME,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FrameShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_PLUGIN,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PluginShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_APPLET,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.AppletShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_3D_SCENE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSceneObject")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_3D_CUBE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DCubeObject")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_3D_SPHERE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSphereObject")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_3D_LATHE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DLatheObject")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_3D_EXTRUDE,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_CUSTOM,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_TABLE,
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ),
+            CreateSvxAccessibleShape ),
+        ShapeTypeDescriptor (   DRAWING_MEDIA,
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MediaShape" ) ),
+            CreateSvxAccessibleShape ),
+
+    };
+
     // Crash while inserting callout with activated accesibility (#i37790#)
     ShapeTypeHandler::Instance().AddShapeTypeList ( DRAWING_END, aSvxShapeTypeList);
 }
 
-
 } // end of namespace accessibility
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */