CWS-TOOLING: integrate CWS impressaccessibility3

2009-09-18 16:10:59 +0200 af  r276289 : #i102525# Fixed some minor compilation problems.
2009-09-17 14:11:23 +0200 af  r276243 : #i102525# Fixed F1 shortcut for help view.
2009-09-16 16:20:58 +0200 af  r276205 : #i102525# Removing const to make Solaris linker happy.
2009-09-16 16:13:25 +0200 af  r276204 : #i90690# Initializing variable to avoid compilation problem.
2009-09-15 19:10:04 +0200 af  r276186 : #i90825# Replace edit source proxy when an outliner object is set.
2009-09-15 11:12:07 +0200 af  r276160 : #i90690# Broadcast accessibility events when the current slide is changed.
2009-09-15 09:37:48 +0200 af  r276148 : #i102525# Fixed Solaris compilation problem.
2009-09-14 18:12:40 +0200 af  r276142 : #i102525# Added missing implementation for some font related functions.
2009-09-14 18:02:05 +0200 af  r276139 : #i102525# Added accessibility support.
2009-09-14 17:30:13 +0200 af  r276136 : #i102525# Added support for interface XPane2 to panes.
2009-09-14 17:00:27 +0200 af  r276133 : #i102525# Added XPane2 interface.
2009-09-14 16:13:04 +0200 af  r276131 : #i50376# Make the focus indicator visible when the slide sorter has the focus.

2 files changed, 35 insertions, 9 deletions

diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index fc0ce20cd710..74aef069d7f5 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -166,6 +166,9 @@ protected:
     virtual void Deactivated (void);
 
     virtual void impl_dispose (void);
+
+private:
+    void UpdateAccessibleName (void);
 };
 
 } // end of namespace accessibility
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index b8a015859885..f9f2a14e2846 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -34,19 +34,24 @@
 #include "MutexOwner.hxx"
 
 #include <com/sun/star/drawing/framework/XPane.hpp>
+#include <com/sun/star/drawing/framework/XPane2.hpp>
 #include <com/sun/star/drawing/framework/TabBarButton.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase3.hxx>
 #include <tools/link.hxx>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
 class Window;
 
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
 namespace {
 
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper3 <
     ::com::sun::star::drawing::framework::XPane,
+    ::com::sun::star::drawing::framework::XPane2,
       ::com::sun::star::lang::XUnoTunnel
     > PaneInterfaceBase;
 
@@ -96,22 +101,39 @@ public:
     */
     virtual ::Window* GetWindow (void);
 
-    // XPane
+
+    //----- XPane -------------------------------------------------------------
 
     /** For a UNO API based implementation of a view this may the most
         important method of this class because the view is only interested
         in the window of the pane.
     */
-    virtual ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>
+    virtual cssu::Reference<css::awt::XWindow>
         SAL_CALL getWindow (void)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (cssu::RuntimeException);
 
-    virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas>
+    virtual cssu::Reference<css::rendering::XCanvas>
         SAL_CALL getCanvas (void)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (cssu::RuntimeException);
+
 
+    //----- XPane2 -------------------------------------------------------------
 
-    // XResource
+    virtual sal_Bool SAL_CALL isVisible (void)
+        throw (cssu::RuntimeException);
+
+    virtual void SAL_CALL setVisible (sal_Bool bIsVisible)
+        throw (cssu::RuntimeException);
+
+    virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void)
+        throw (cssu::RuntimeException);
+
+    virtual void SAL_CALL setAccessible (
+        const cssu::Reference<css::accessibility::XAccessible>& rxAccessible)
+        throw (cssu::RuntimeException);
+
+
+    //----- XResource ---------------------------------------------------------
 
     virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>
         SAL_CALL getResourceId (void)
@@ -124,11 +146,12 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 
 
-    // XUnoTunnel
+    //----- XUnoTunnel --------------------------------------------------------
 
     virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId)
         throw (com::sun::star::uno::RuntimeException);
 
+
 protected:
     ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId;
     ::Window* mpWindow;