Remove some deprecated AccessibleShapeTreeInfo member functions

Change-Id: I3cdf1cb2feef1cd107b4d554679038eeb5003898

include/svx/AccessibleShapeTreeInfo.hxx

@@ -76,18 +76,6 @@ public:
         ::com::sun::star::accessibility::XAccessibleComponent>
         GetDocumentWindow() const { return mxDocumentWindow;}
 
-    /** Deprecated.   Use the correctly named SetModelBroadcaster method
-        instead.
-    */
-    void SetControllerBroadcaster (const ::com::sun::star::uno::Reference<
-        ::com::sun::star::document::XEventBroadcaster>& rxControllerBroadcaster);
-    /** Deprecated.   Use the correctly named GetModelBroadcaster method
-        instead.
-    */
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::document::XEventBroadcaster>
-        GetControllerBroadcaster() const { return mxModelBroadcaster;}
-
     /** Set a new broadcaster that sends events indicating shape changes.
         The broadcaster usually is or belongs to a document model.
         @param rxModelBroadcaster

sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx

@@ -516,7 +516,7 @@ void AccessibleDocumentViewBase::impl_dispose()
     }
 
     // Propagate change of controller down the shape tree.
-    maShapeTreeInfo.SetControllerBroadcaster (NULL);
+    maShapeTreeInfo.SetModelBroadcaster (NULL);
 
     // Reset the model reference.
     mxModel = NULL;

svx/source/accessibility/AccessibleShapeTreeInfo.cxx

@@ -83,26 +83,6 @@ void AccessibleShapeTreeInfo::SetDocumentWindow (
         mxDocumentWindow = rxDocumentWindow;
 }
 
-
-
-
-
-
-
-
-void AccessibleShapeTreeInfo::SetControllerBroadcaster (
-    const uno::Reference<document::XEventBroadcaster>& rxControllerBroadcaster)
-{
-    mxModelBroadcaster = rxControllerBroadcaster;
-}
-
-
-
-
-
-
-
-
 void AccessibleShapeTreeInfo::SetModelBroadcaster (
     const Reference<document::XEventBroadcaster>& rxModelBroadcaster)
 {

sw/source/core/access/accmap.cxx

@@ -244,7 +244,7 @@ public:
         uno::Reference < document::XEventBroadcaster > xModelBroadcaster =
             new SwDrawModellListener_Impl(
                     pMap->GetShell()->getIDocumentDrawModelAccess()->GetOrCreateDrawModel() );
-        maInfo.SetControllerBroadcaster( xModelBroadcaster );
+        maInfo.SetModelBroadcaster( xModelBroadcaster );
     }
 
     ~SwAccessibleShapeMap_Impl();
@@ -267,7 +267,7 @@ public:
 
 SwAccessibleShapeMap_Impl::~SwAccessibleShapeMap_Impl()
 {
-    uno::Reference < document::XEventBroadcaster > xBrd( maInfo.GetControllerBroadcaster() );
+    uno::Reference < document::XEventBroadcaster > xBrd( maInfo.GetModelBroadcaster() );
     if( xBrd.is() )
         static_cast < SwDrawModellListener_Impl * >( xBrd.get() )->Dispose();
 }