diff options
Diffstat (limited to 'svx/source/accessibility/SvxShapeTypes.cxx')
| -rw-r--r-- | svx/source/accessibility/SvxShapeTypes.cxx | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index 18e080c242..cacfde900b 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,14 +67,12 @@ AccessibleShape* CreateSvxAccessibleShape ( case DRAWING_POLY_LINE_PATH: case DRAWING_RECTANGLE: case DRAWING_TEXT: - // --> OD 2004-11-29 #i37790# - default accessiblility shape for - // com::sun::star::drawing::CustomShape + // Default accessiblility shape for + // com::sun::star::drawing::CustomShape (#i37790#) case DRAWING_CUSTOM: - // <-- - // --> OD 2008-05-19 #i85429# - default accessiblility shape for - // com::sun::star::drawing::MediaShape + // Default accessiblility shape for + // com::sun::star::drawing::MediaShape (#i85429#) case DRAWING_MEDIA: - // <-- return new AccessibleShape (rShapeInfo, rShapeTreeInfo); case DRAWING_CONTROL: @@ -100,91 +99,91 @@ AccessibleShape* CreateSvxAccessibleShape ( ShapeTypeDescriptor aSvxShapeTypeList[] = { ShapeTypeDescriptor (DRAWING_TEXT, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.TextShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TextShape")), CreateSvxAccessibleShape), ShapeTypeDescriptor (DRAWING_RECTANGLE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.RectangleShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape")), CreateSvxAccessibleShape), ShapeTypeDescriptor ( DRAWING_ELLIPSE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.EllipseShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.EllipseShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_CONTROL, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ControlShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_CONNECTOR, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ConnectorShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_MEASURE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.MeasureShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MeasureShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_LINE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.LineShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_POLY_POLYGON, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyPolygonShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_POLY_LINE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyLineShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_OPEN_BEZIER, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.OpenBezierShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenBezierShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_CLOSED_BEZIER, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ClosedBezierShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedBezierShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_OPEN_FREEHAND, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.OpenFreeHandShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenFreeHandShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_CLOSED_FREEHAND, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ClosedFreeHandShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedFreeHandShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_POLY_POLYGON_PATH, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyPolygonPathShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonPathShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_POLY_LINE_PATH, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyLinePathShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLinePathShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_GRAPHIC_OBJECT, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.GraphicObjectShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_GROUP, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.GroupShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_OLE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.OLE2Shape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_PAGE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PageShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PageShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_CAPTION, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.CaptionShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_FRAME, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.FrameShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FrameShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_PLUGIN, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PluginShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PluginShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_APPLET, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.AppletShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.AppletShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_3D_SCENE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DSceneObject"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSceneObject")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_3D_CUBE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DCubeObject"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DCubeObject")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_3D_SPHERE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DSphereObject"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSphereObject")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_3D_LATHE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DLatheObject"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DLatheObject")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_3D_EXTRUDE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DExtrudeObject"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_CUSTOM, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.CustomShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")), CreateSvxAccessibleShape ), ShapeTypeDescriptor ( DRAWING_TABLE, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ), @@ -198,10 +197,11 @@ ShapeTypeDescriptor aSvxShapeTypeList[] = { void RegisterDrawShapeTypes (void) { - // --> OD 2004-11-26 #i37790# + // 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: */ |