#95585# Using new AccessibleShapeInfo class in constructor.

5 files changed, 30 insertions, 40 deletions

diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 2a065ffd5f9c..3ac4b89ec037 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePageShape.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: af $ $Date: 2002-04-18 17:02:20 $
+ *  last change: $Author: af $ $Date: 2002-05-06 09:44:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,10 @@
 #include "AccessiblePageShape.hxx"
 #endif
 
+#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_INFO_HXX
+#include <svx/AccessibleShapeInfo.hxx>
+#endif
+
 #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_
 #include <drafts/com/sun/star/accessibility/AccessibleRole.hpp>
 #endif
@@ -102,7 +106,7 @@ AccessiblePageShape::AccessiblePageShape (
     const uno::Reference<XAccessible>& rxParent,
     const AccessibleShapeTreeInfo& rShapeTreeInfo,
     long nIndex)
-    : AccessibleShape (NULL, rxParent, rShapeTreeInfo, nIndex),
+    : AccessibleShape (AccessibleShapeInfo (NULL, rxParent, nIndex), rShapeTreeInfo),
       mxPage (rxPage)
 {
     // The main part of the initialization is done in the init method which
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 548657344cef..98e58f5facfc 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePresentationGraphicShape.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: af $ $Date: 2002-04-18 17:02:20 $
+ *  last change: $Author: af $ $Date: 2002-05-06 09:44:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,13 +79,9 @@ namespace accessibility {
 //=====  internal  ============================================================
 
 AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape (
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape>& rxShape,
-        const ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::accessibility::XAccessible>& rxParent,
-    const AccessibleShapeTreeInfo& rShapeTreeInfo,
-    long nIndex)
-    :   AccessibleGraphicShape (rxShape, rxParent, rShapeTreeInfo, nIndex)
+    const AccessibleShapeInfo& rShapeInfo,
+    const AccessibleShapeTreeInfo& rShapeTreeInfo)
+    : AccessibleGraphicShape (rShapeInfo, rShapeTreeInfo)
 {
 }
 
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index a5c16cf477c5..a72c53b38408 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePresentationOLEShape.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: af $ $Date: 2002-04-18 17:02:20 $
+ *  last change: $Author: af $ $Date: 2002-05-06 09:44:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,13 +79,9 @@ namespace accessibility {
 //=====  internal  ============================================================
 
 AccessiblePresentationOLEShape::AccessiblePresentationOLEShape (
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape>& rxShape,
-        const ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::accessibility::XAccessible>& rxParent,
-    const AccessibleShapeTreeInfo& rShapeTreeInfo,
-    long nIndex)
-    :   AccessibleOLEShape (rxShape, rxParent, rShapeTreeInfo, nIndex)
+    const AccessibleShapeInfo& rShapeInfo,
+    const AccessibleShapeTreeInfo& rShapeTreeInfo)
+    :   AccessibleOLEShape (rShapeInfo, rShapeTreeInfo)
 {
 }
 
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index 78a6db8e77e2..342dc87c7cd9 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePresentationShape.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: af $ $Date: 2002-04-18 17:02:20 $
+ *  last change: $Author: af $ $Date: 2002-05-06 09:44:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,13 +79,9 @@ namespace accessibility {
 //=====  internal  ============================================================
 
 AccessiblePresentationShape::AccessiblePresentationShape (
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape>& rxShape,
-    const ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::accessibility::XAccessible>& rxParent,
-    const AccessibleShapeTreeInfo& rShapeTreeInfo,
-    long nIndex)
-    :   AccessibleShape (rxShape, rxParent, rShapeTreeInfo, nIndex)
+    const AccessibleShapeInfo& rShapeInfo,
+    const AccessibleShapeTreeInfo& rShapeTreeInfo)
+    : AccessibleShape (rShapeInfo, rShapeTreeInfo)
 {
 }
 
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index 28b704ba3472..f792cc04aa36 100644
--- a/sd/source/ui/accessibility/SdShapeTypes.cxx
+++ b/sd/source/ui/accessibility/SdShapeTypes.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SdShapeTypes.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: af $ $Date: 2002-04-18 17:02:20 $
+ *  last change: $Author: af $ $Date: 2002-05-06 09:46:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,10 +71,8 @@
 namespace accessibility {
 
 AccessibleShape*
-    CreateSdAccessibleShape (const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::accessibility::XAccessible>& rxParent,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XShape>& rxShape,
+    CreateSdAccessibleShape (
+        const AccessibleShapeInfo& rShapeInfo,
         const AccessibleShapeTreeInfo& rShapeTreeInfo,
         ShapeTypeId nId)
 {
@@ -86,18 +84,18 @@ AccessibleShape*
         case PRESENTATION_PAGE:
         case PRESENTATION_NOTES:
         case PRESENTATION_HANDOUT:
-            return new AccessiblePresentationShape (rxShape, rxParent, rShapeTreeInfo);
+            return new AccessiblePresentationShape (rShapeInfo, rShapeTreeInfo);
 
         case PRESENTATION_GRAPHIC_OBJECT:
-            return new AccessiblePresentationGraphicShape (rxShape, rxParent, rShapeTreeInfo);
+            return new AccessiblePresentationGraphicShape (rShapeInfo, rShapeTreeInfo);
 
         case PRESENTATION_OLE:
         case PRESENTATION_CHART:
         case PRESENTATION_TABLE:
-            return new AccessiblePresentationOLEShape (rxShape, rxParent, rShapeTreeInfo);
+            return new AccessiblePresentationOLEShape (rShapeInfo, rShapeTreeInfo);
 
         default:
-            return new AccessibleShape (rxShape, rxParent, rShapeTreeInfo);
+            return new AccessibleShape (rShapeInfo, rShapeTreeInfo);
     }
 }