openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1526782 [5/6] - in /openoffice/branches/ia2/main: accessibility/source/extended/ accessibility/source/standard/ cui/source/customize/ cui/source/inc/ editeng/inc/editeng/ editeng/source/accessibility/ editeng/source/editeng/ filter/source/...
Date Fri, 27 Sep 2013 03:21:47 GMT
Modified: openoffice/branches/ia2/main/sd/source/ui/func/fusel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/func/fusel.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/func/fusel.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/func/fusel.cxx Fri Sep 27 03:21:44 2013
@@ -113,6 +113,13 @@ FuSelection::FuSelection (
       bMirrorSide0(sal_False),
       nEditMode(SID_BEZIER_MOVE),
       pWaterCanCandidate(NULL)
+//IAccessibility2 Implementation 2009-----
+  //Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, 
+  //and SHIFT+ENTER key to decide the postion and draw the new insert point
+    ,bBeginInsertPoint(sal_False),
+  	oldPoint(0,0)
+  ,bMovedToCenterPoint(sal_False)
+//-----IAccessibility2 Implementation 2009
 {
 }
 
@@ -948,8 +955,80 @@ sal_Bool FuSelection::KeyInput(const Key
 			bReturn = FuSelection::cancel();
         }
         break;
+//IAccessibility2 Implementation 2009-----
+  //Solution: add keyboard operation for insert points in drawing curve
+		case KEY_UP:
+		case KEY_DOWN:
+		case KEY_LEFT:
+		case KEY_RIGHT:
+		{
+			if(rKEvt.GetKeyCode().IsShift()&&(nEditMode == SID_BEZIER_INSERT)){
+				long nX = 0;
+				long nY = 0;
+				sal_uInt16  nCode = rKEvt.GetKeyCode().GetCode();
+				if (nCode == KEY_UP)
+				{
+					// Scroll nach oben
+					nX = 0;
+					nY =-1;
     }
+				else if (nCode == KEY_DOWN)
+				{
+					// Scroll nach unten
+					nX = 0;
+					nY = 1;
+				}
+				else if (nCode == KEY_LEFT)
+				{
+					// Scroll nach links
+					nX =-1;
+					nY = 0;
+				}
+				else if (nCode == KEY_RIGHT)
+				{
+					// Scroll nach rechts
+					nX = 1;
+					nY = 0;
+				}
 
+				Point centerPoint;
+				Rectangle rect = mpView->GetMarkedObjRect();
+				centerPoint = mpWindow->LogicToPixel(rect.Center());
+				Point aPoint = bMovedToCenterPoint? oldPoint:centerPoint;
+				Point ePoint = aPoint + Point(nX,nY);
+				mpWindow->SetPointerPosPixel(ePoint);
+				//simulate mouse move action
+				MouseEvent eMevt(ePoint,1,2, MOUSE_LEFT, 0);
+				MouseMove(eMevt);
+				oldPoint = ePoint;
+				bMovedToCenterPoint = sal_True;
+				bReturn = sal_True;
+			}
+		}
+		break;
+		case KEY_RETURN:
+			if(rKEvt.GetKeyCode().IsShift()&&(nEditMode == SID_BEZIER_INSERT))
+			{
+				if(!bBeginInsertPoint)
+				{
+					//simulate mouse button down action
+					MouseEvent aMevt(oldPoint,1,3, MOUSE_LEFT, KEY_SHIFT);
+					MouseButtonDown(aMevt);
+					mpWindow->CaptureMouse();
+					bBeginInsertPoint = sal_True;
+				}
+				else
+				{
+					//simulate mouse button up action
+					MouseEvent rMEvt(oldPoint,1,17, MOUSE_LEFT, KEY_SHIFT);
+					MouseButtonUp(rMEvt);
+					bBeginInsertPoint = sal_False;
+				}
+				bReturn= sal_True;
+			}
+			break;
+    }
+//-----IAccessibility2 Implementation 2009
 	if (!bReturn)
 	{
 		bReturn = FuDraw::KeyInput(rKEvt);
@@ -967,6 +1046,21 @@ sal_Bool FuSelection::KeyInput(const Key
 }
 
 
+//IAccessibility2 Implementation 2009-----
+void FuSelection::ForcePointer(const MouseEvent* pMEvt)
+{
+	if(bMovedToCenterPoint && !bBeginInsertPoint && pMEvt)
+	{
+		MouseEvent aMEvt(pMEvt->GetPosPixel(), pMEvt->GetClicks(), 
+			pMEvt->GetMode(), pMEvt->GetButtons(), pMEvt->GetModifier() & ~KEY_SHIFT);  
+		FuDraw::ForcePointer(&aMEvt);
+	}
+	else
+	{
+		FuDraw::ForcePointer(pMEvt);
+	}
+}
+//-----IAccessibility2 Implementation 2009
 /*************************************************************************
 |*
 |* Function aktivieren

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx Fri Sep 27 03:21:44 2013
@@ -38,6 +38,17 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <tools/link.hxx>
 
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+#include "DrawViewShell.hxx"
+#include "sdpage.hxx"
+#include "drawdoc.hxx"
+#include "FrameView.hxx"
+#include "PresentationViewShell.hxx"
+#include <editeng/outlobj.hxx>
+#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
+class SdViewShell;
+//-----IAccessibility2 Implementation 2009
 namespace sd {
 class ViewShell;
 class Window;
@@ -86,6 +97,10 @@ class AccessibleDocumentViewBase
         public ::com::sun::star::beans::XPropertyChangeListener,
         public ::com::sun::star::awt::XWindowListener,
         public ::com::sun::star::awt::XFocusListener
+//IAccessibility2 Implementation 2009-----
+		,public ::com::sun::star::accessibility::XAccessibleExtendedAttributes
+	       ,public com::sun::star::accessibility::XAccessibleGetAccFlowTo
+//-----IAccessibility2 Implementation 2009
 {
 public:
     //=====  internal  ========================================================
@@ -250,7 +265,12 @@ public:
         throw (::com::sun::star::uno::RuntimeException); 
 	virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e)
         throw (::com::sun::star::uno::RuntimeException); 
-
+//IAccessibility2 Implementation 2009-----
+	//----------------------------xAttribute----------------------------
+	virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes() 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+	 ::sd::ViewShell* mpViewShell;
+//-----IAccessibility2 Implementation 2009
 private:
 
     // return the member maMutex;
@@ -359,7 +379,20 @@ protected:
     virtual void SetAccessibleOLEObject (
         const ::com::sun::star::uno::Reference <
         ::com::sun::star::accessibility::XAccessible>& xOLEObject);
+//IAccessibility2 Implementation 2009-----
+	//=====  XAccessibleGetAccFromXShape  ============================================
+	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+		SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+		throw ( ::com::sun::star::uno::RuntimeException );
 
+public:
+	virtual void SwitchViewActivated (void) { Activated(); }
+	 virtual sal_Int32 SAL_CALL getForeground(  ) 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getBackground(  ) 
+        throw (::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
     virtual void impl_dispose (void);
 };
 

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx Fri Sep 27 03:21:44 2013
@@ -26,6 +26,10 @@
 
 #include "AccessibleDocumentViewBase.hxx"
 
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
+//-----IAccessibility2 Implementation 2009
+
 namespace accessibility {
 
 
@@ -39,6 +43,9 @@ namespace accessibility {
 */
 class AccessibleDrawDocumentView : 
     public AccessibleDocumentViewBase
+//IAccessibility2 Implementation 2009-----
+    ,public ::com::sun::star::accessibility::XAccessibleGroupPosition
+//-----IAccessibility2 Implementation 2009
 {
 public:
     //=====  internal  ========================================================
@@ -73,6 +80,11 @@ public:
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IndexOutOfBoundsException);
 
+//IAccessibility2 Implementation 2009-----
+	virtual ::rtl::OUString SAL_CALL
+		getAccessibleName(void)
+		throw (::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
 
     //=====  lang::XEventListener  ============================================
 
@@ -86,6 +98,28 @@ public:
 	virtual void SAL_CALL
 		propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject)
         throw (::com::sun::star::uno::RuntimeException);
+//IAccessibility2 Implementation 2009-----
+    //=====  XInterface  ======================================================
+    
+    virtual com::sun::star::uno::Any SAL_CALL
+		queryInterface (const com::sun::star::uno::Type & rType)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL
+        acquire (void) 
+        throw ();
+        
+    virtual void SAL_CALL
+        release (void)
+        throw ();
+	
+    //=====  XAccessibleGroupPosition  =========================================
+	virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+		getGroupPosition( const ::com::sun::star::uno::Any& rAny )
+        throw (::com::sun::star::uno::RuntimeException);
+	virtual ::rtl::OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject )
+        throw (::com::sun::star::uno::RuntimeException);	
+//-----IAccessibility2 Implementation 2009
 
 protected:
 
@@ -120,6 +154,10 @@ protected:
     virtual void
         implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) 
         throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+//IAccessibility2 Implementation 2009-----
+private:
+	::sd::ViewShell* mpSdViewSh;
+//-----IAccessibility2 Implementation 2009
 
 protected:
     /** This object manages the shapes of the represented draw page.  It is
@@ -159,6 +197,15 @@ protected:
     virtual void Deactivated (void);
 
     virtual void impl_dispose (void);
+
+//IAccessibility2 Implementation 2009-----
+    //=====  XAccessibleGetAccFromXShape  ============================================
+	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+		SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+		throw ( ::com::sun::star::uno::RuntimeException );
+	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+		GetSelAccContextInTable();
+//-----IAccessibility2 Implementation 2009
     
 private:
     void UpdateAccessibleName (void);

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleOutlineView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleOutlineView.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleOutlineView.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleOutlineView.hxx Fri Sep 27 03:21:44 2013
@@ -75,7 +75,11 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
         getAccessibleChild (sal_Int32 nIndex)
         throw (::com::sun::star::uno::RuntimeException);
-
+//IAccessibility2 Implementation 2009-----
+    virtual ::rtl::OUString SAL_CALL
+        getAccessibleName(void)
+        throw (::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
     //=====  XAccessibleEventBroadcaster  ========================================
 
     virtual void SAL_CALL 

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx Fri Sep 27 03:21:44 2013
@@ -27,6 +27,9 @@
 
 #include <svx/AccessibleGraphicShape.hxx>
 
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+//-----IAccessibility2 Implementation 2009
 namespace accessibility {
 
 /**	This class makes Impress shapes accessible.
@@ -60,6 +63,10 @@ public:
 	virtual ::rtl::OUString
     	CreateAccessibleDescription ()
         throw (::com::sun::star::uno::RuntimeException);
+//IAccessibility2 Implementation 2009-----
+	///	Return this object's role.
+	virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
 };
 
 } // end of namespace accessibility

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx Fri Sep 27 03:21:44 2013
@@ -27,6 +27,9 @@
 
 #include <svx/AccessibleOLEShape.hxx>
 
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+//-----IAccessibility2 Implementation 2009
 namespace accessibility {
 
 /**	This class makes Impress shapes accessible.
@@ -60,6 +63,10 @@ public:
 	virtual ::rtl::OUString
     	CreateAccessibleDescription ()
         throw (::com::sun::star::uno::RuntimeException);
+//IAccessibility2 Implementation 2009-----
+	///	Return this object's role.
+	virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
 };
 
 } // end of namespace accessibility

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationShape.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationShape.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessiblePresentationShape.hxx Fri Sep 27 03:21:44 2013
@@ -59,6 +59,9 @@ public:
 	virtual ::rtl::OUString
     	CreateAccessibleDescription ()
         throw (::com::sun::star::uno::RuntimeException);
+//IAccessibility2 Implementation 2009-----
+	::rtl::OUString GetStyle();
+//-----IAccessibility2 Implementation 2009
 
 private:
     /** Don't use the default constructor.  Use the public constructor that 

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx Fri Sep 27 03:21:44 2013
@@ -286,7 +286,8 @@ public:
     	getSupportedServiceNames (void)
         throw (::com::sun::star::uno::RuntimeException);
 
-    
+	// IAccessibility2 Implementation 2009
+	virtual void SwitchViewActivated (void);
 private:
     class Implementation;
     ::std::auto_ptr<Implementation> mpImpl;

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideView.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideView.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/AccessibleSlideView.hxx Fri Sep 27 03:21:44 2013
@@ -25,7 +25,10 @@
 #define SD_ACCESSIBILITY_ACCESSIBLE_SLIDE_VIEW_HXX
 
 #include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/implbase7.hxx>
+//IAccessibility2 Implementation 2009-----
+#include <cppuhelper/implbase9.hxx>
+//#include <cppuhelper/implbase7.hxx>
+//-----IAccessibility2 Implementation 2009
 #include "SlideView.hxx"
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -35,6 +38,9 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+//-----IAccessibility2 Implementation 2009
 #include <vector>
 
 class SdDrawDocument;
@@ -156,14 +162,18 @@ public:                 
 // - AccessibleSlideView -
 // -----------------------
 
-class AccessibleSlideView : public ::cppu::WeakImplHelper7< 
+class AccessibleSlideView : public ::cppu::WeakImplHelper9< 
     ::com::sun::star::lang::XUnoTunnel,
     ::com::sun::star::accessibility::XAccessible,
     ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
     ::com::sun::star::accessibility::XAccessibleContext,
     ::com::sun::star::accessibility::XAccessibleComponent,
     ::com::sun::star::accessibility::XAccessibleSelection,
-    ::com::sun::star::lang::XServiceInfo >
+    ::com::sun::star::lang::XServiceInfo
+//IAccessibility2 Implementation 2009-----
+	,::com::sun::star::accessibility::XAccessibleExtendedAttributes
+	,::com::sun::star::awt::XFocusListener >
+//-----IAccessibility2 Implementation 2009
 {
 public:
 
@@ -189,8 +199,18 @@ public:
 	void			            SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible );
 	void			            Reset();
     void                        FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage );
-
-
+//IAccessibility2 Implementation 2009-----
+	void 			SelectionHasChanged (sal_uInt16 nPage, sal_Bool bSelect );
+	//=====  XFocusListener  =================================================
+	virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e)
+		throw (::com::sun::star::uno::RuntimeException); 
+	virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e)
+		throw (::com::sun::star::uno::RuntimeException); 
+	//=====  lang::XEventListener  ============================================
+	virtual void SAL_CALL disposing (const struct com::sun::star::lang::EventObject &) throw (::com::sun::star::uno::RuntimeException);
+	// This method is called from the component helper base class while disposing.
+	virtual void SAL_CALL disposing (void);
+//-----IAccessibility2 Implementation 2009
 private:
     ::osl::Mutex maMutex;
 	::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > >               maSlidePageObjects;
@@ -199,6 +219,10 @@ private:
     ::sd::Window* mpParentWindow;
      /// client id in the AccessibleEventNotifier queue
     sal_uInt32 mnClientId;
+//IAccessibility2 Implementation 2009-----
+	sal_uInt32	nFocusPageIndex;
+	::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>			mxWindow;
+//-----IAccessibility2 Implementation 2009
 
     // internal
 	static const ::com::sun::star::uno::Sequence< sal_Int8 >&                                   getUnoTunnelId();
@@ -253,6 +277,11 @@ private:
 
 	//=====  XServiceInfo  ====================================================
 
+//IAccessibility2 Implementation 2009-----
+	//----------------------------xAttribute----------------------------
+	virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes() 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+//-----IAccessibility2 Implementation 2009
     /**	Returns an identifier for the implementation of this object.
     */
 	virtual ::rtl::OUString SAL_CALL

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/DrawController.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/DrawController.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/DrawController.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/DrawController.hxx Fri Sep 27 03:21:44 2013
@@ -44,6 +44,9 @@
 #include <memory>
 #include <vector>
 #include <boost/scoped_ptr.hpp>
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/drawing/XLayer.hpp>
+//-----IAccessibility2 Implementation 2009
 
 class SfxViewShell;
 class SdXImpressDocument;
@@ -102,6 +105,10 @@ public:
         PROPERTY_ZOOMVALUE = 7,
         PROPERTY_VIEWOFFSET = 8,
 		PROPERTY_DRAWVIEWMODE = 9
+		//IAccessibility2 Implementation 2009-----
+		,PROPERTY_UPDATEACC = 10
+		,PROPERTY_PAGE_CHANGE = 11
+		//-----IAccessibility2 Implementation 2009
     };
 
     /** Create a new DrawController object for the given ViewShellBase.
@@ -147,7 +154,15 @@ public:
         switch.
     */
     void BroadcastContextChange (void) const;
-    
+//IAccessibility2 Implementation 2009-----
+	void NotifyAccUpdate();
+	void fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw();
+	// change the parameter to int
+	//void fireSwitchCurrentPage( String pageName) throw();
+	void fireSwitchCurrentPage( sal_Int32 pageIndex) throw();
+	::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* mpCurrentLayer;
+//-----IAccessibility2 Implementation 2009
+
     /** Return a pointer to the ViewShellBase object that the DrawController
         is connected to.
         @return

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/DrawDocShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/DrawDocShell.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/DrawDocShell.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/DrawDocShell.hxx Fri Sep 27 03:21:44 2013
@@ -136,6 +136,12 @@ public:
 
 	sal_Bool			        GotoBookmark(const String& rBookmark);
 
+//IAccessibility2 Implementation 2009-----
+	//Solution: realize multi-selection of objects
+	sal_Bool					GotoTreeBookmark(const String& rBookmark);
+	sal_Bool					IsMarked(  SdrObject* pObject  ); 
+	sal_Bool					GetObjectIsmarked(const String& rBookmark);
+//-----IAccessibility2 Implementation 2009
 	Bitmap                  GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel);
 
     /** checks, if the given name is a valid new name for a slide
@@ -225,6 +231,13 @@ protected:
 	bool					mbOwnDocument;			// if true, we own mpDoc and will delete it in our d'tor
     void					Construct(bool bClipboard);
     virtual void            InPlaceActivate( sal_Bool bActive );
+//IAccessibility2 Implementation 2009-----
+public:
+	virtual void setDocAccTitle( const String& rTitle );
+	virtual const String getDocAccTitle() const;
+	virtual void setDocReadOnly( sal_Bool bReadOnly);
+	virtual sal_Bool getDocReadOnly() const;
+//-----IAccessibility2 Implementation 2009
 };
 
 #ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/DrawViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/DrawViewShell.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/DrawViewShell.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/DrawViewShell.hxx Fri Sep 27 03:21:44 2013
@@ -252,6 +252,12 @@ public:
 	sal_Bool		    IsSwitchPageAllowed() const;
 
 	sal_Bool		    GotoBookmark(const String& rBookmark);
+//IAccessibility2 Implementation 2009-----
+	//Solution: realize multi-selection of objects ,If object is marked , 
+	//the corresponding entry is set true ,else the corresponding entry is set false .
+	void                    FreshNavigatrEntry();
+	void                    FreshNavigatrTree();
+//-----IAccessibility2 Implementation 2009
 	void            MakeVisible(const Rectangle& rRect, ::Window& rWin);
 
 	virtual void    ReadFrameViewData(FrameView* pView);
@@ -372,6 +378,10 @@ public:
 
     ::rtl::OUString GetSidebarContextName (void) const;
 
+//IAccessibility2 Implementation 2009-----
+	//move this method to ViewShell. 
+	//void	NotifyAccUpdate();
+//-----IAccessibility2 Implementation 2009
 protected:
 	DrawView*		mpDrawView;
 	SdPage* 		mpActualPage;
@@ -497,6 +507,10 @@ private:
         const Point& rMouseLocation);
 
 	using ViewShell::Notify;
+
+//IAccessibility2 Implementation 2009-----
+	//const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & GetForms() const;
+//-----IAccessibility2 Implementation 2009
 	
 	::std::auto_ptr< AnnotationManager > mpAnnotationManager;
 	::std::auto_ptr< ViewOverlayManager > mpViewOverlayManager;

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/OutlineViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/OutlineViewShell.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/OutlineViewShell.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/OutlineViewShell.hxx Fri Sep 27 03:21:44 2013
@@ -139,6 +139,9 @@ public:
         ::com::sun::star::accessibility::XAccessible>
         CreateAccessibleDocumentView (::sd::Window* pWindow);
 
+//IAccessibility2 Implementation 2009-----
+	String m_StrOldPageName;
+//-----IAccessibility2 Implementation 2009
     /** Update the preview to show the specified page.
     */
 	virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False);

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/SdUnoDrawView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/SdUnoDrawView.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/SdUnoDrawView.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/SdUnoDrawView.hxx Fri Sep 27 03:21:44 2013
@@ -112,14 +112,14 @@ protected:
 	void setMasterPageMode(sal_Bool MasterPageMode_) throw();
 	sal_Bool getLayerMode(void) const throw();
 	void setLayerMode(sal_Bool LayerMode_) throw();
-
+public:
     /** Return a reference to the active layer object.
         @return
             The returned value may be empty when the internal state of this
             view is not valid (like during destruction.)
     */
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> getActiveLayer (void) throw ();
-
+protected:
     /** Make the specified object the active layer.
         @param rxLayer
             The new layer object.

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/SlideSorterViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/SlideSorterViewShell.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/SlideSorterViewShell.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/SlideSorterViewShell.hxx Fri Sep 27 03:21:44 2013
@@ -174,6 +174,10 @@ public:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible>
         CreateAccessibleDocumentView (::sd::Window* pWindow);
+	//IAccessibility2 Implementation 2009-----
+	// handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase
+	virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
+	//-----IAccessibility2 Implementation 2009
 
     SlideSorter& GetSlideSorter (void) const;
 

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/SlideViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/SlideViewShell.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/SlideViewShell.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/SlideViewShell.hxx Fri Sep 27 03:21:44 2013
@@ -140,6 +140,10 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView( ::sd::Window* pWindow );
 
     void            SelectionHasChanged();
+//IAccessibility2 Implementation 2009-----
+    //Notify the SELECTION_CHANGE, SELECTION_ADD, SELECTION_REMOVE events
+    void            SelectionHasChanged(sal_uInt16 nPage, sal_Bool bSelect);
+//-----IAccessibility2 Implementation 2009
     void            PageLayoutHasChanged();
     void            FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage );
     void            PageVisibilityHasChanged( sal_uInt16 nPage, sal_Bool bVisible );
@@ -148,6 +152,9 @@ public:
     */
     virtual void Activate (sal_Bool IsMDIActivate);
 
+//IAccessibility2 Implementation 2009-----
+	void SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
+//-----IAccessibility2 Implementation 2009
 protected:
 	virtual Size    GetOptimalSizePixel() const;
 	virtual long    VirtHScrollHdl(ScrollBar* pHScroll);

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/TabControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/TabControl.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/TabControl.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/TabControl.hxx Fri Sep 27 03:21:44 2013
@@ -42,6 +42,10 @@ class TabControl 
       public DragSourceHelper, 
       public DropTargetHelper 
 {
+//IAccessibility2 Implementation 2009-----
+	//Solution: declare bIsMarked variable 
+	sal_uInt16    RrePageID;
+//-----IAccessibility2 Implementation 2009
 public:
     TabControl (DrawViewShell* pDrViewSh, ::Window* pParent);
     virtual ~TabControl (void);

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/ViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/ViewShell.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/ViewShell.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/ViewShell.hxx Fri Sep 27 03:21:44 2013
@@ -317,6 +317,13 @@ public:
         ::com::sun::star::accessibility::XAccessible>
         CreateAccessibleDocumentView (::sd::Window* pWindow);
 
+//IAccessibility2 Implementation 2009-----
+	virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
+	virtual void SwitchActiveViewFireFocus( );
+	// Move these two methods from DrawViewShell to enable slide show view
+	void	NotifyAccUpdate();
+	void	fireSwitchCurrentPage(sal_Int32 pageIndex);
+//-----IAccessibility2 Implementation 2009
 	void SetWinViewPos(const Point& rWinPos, bool bUpdate);
 	Point GetWinViewPos() const;
 	Point GetViewOrigin() const;

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/Window.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/Window.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/Window.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/Window.hxx Fri Sep 27 03:21:44 2013
@@ -202,6 +202,9 @@ protected:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> 
         CreateAccessible (void);
+//IAccessibility2 Implementation 2009-----
+	virtual void SwitchView();
+//-----IAccessibility2 Implementation 2009
 
     XubString GetSurroundingText() const;
     Selection GetSurroundingTextSelection() const;

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/fuediglu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/fuediglu.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/fuediglu.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/fuediglu.hxx Fri Sep 27 03:21:44 2013
@@ -54,6 +54,14 @@ public:
 	virtual void Activate();		   // Function aktivieren
 	virtual void Deactivate();		   // Function deaktivieren
 
+//IAccessibility2 Implementation 2009-----
+  //Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, 
+  //and SHIFT+ENTER key to decide the postion and draw the new insert point
+    virtual void ForcePointer(const MouseEvent* pMEvt = NULL);
+private:
+    sal_Bool   bBeginInsertPoint;
+    Point    oldPoint;
+//-----IAccessibility2 Implementation 2009
 protected:
 	FuEditGluePoints (
         ViewShell* pViewSh, 

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/fusel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/fusel.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/fusel.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/fusel.hxx Fri Sep 27 03:21:44 2013
@@ -68,6 +68,10 @@ public:
 	*/
 	virtual bool cancel();
 
+//IAccessibility2 Implementation 2009-----
+	//Solution: let mouse cursor move
+	virtual void ForcePointer(const MouseEvent* pMEvt = NULL);
+//-----IAccessibility2 Implementation 2009
 protected:
 	FuSelection (ViewShell* pViewSh, 
         ::sd::Window* pWin, 
@@ -100,6 +104,14 @@ private:
             position then NULL is returned.
     */
     SdrObject* pickObject (const Point& rTestPoint);
+//IAccessibility2 Implementation 2009-----
+  //Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, 
+  //and SHIFT+ENTER key to decide the postion and draw the new insert point
+    sal_Bool   bBeginInsertPoint;
+    Point    oldPoint;
+  //Solution: let mouse cursor move
+  sal_Bool   bMovedToCenterPoint;
+//-----IAccessibility2 Implementation 2009
 };
 
 } // end of namespace sd

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/navigatr.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/navigatr.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/navigatr.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/navigatr.hxx Fri Sep 27 03:21:44 2013
@@ -165,6 +165,13 @@ private:
 	virtual void				DataChanged( const DataChangedEvent& rDCEvt );
 	void						SetDragImage();
 	void						ApplyImageList();
+//IAccessibility2 Implementation 2009-----
+public:	
+	//Solution: when object is marked , fresh the corresponding entry tree .
+	sd::DrawDocShell*             GetDrawDocShell(const SdDrawDocument*);
+    void                        FreshTree ( const  SdDrawDocument* pDoc );
+	void                        FreshEntry( );
+//-----IAccessibility2 Implementation 2009
 };
 
 

Modified: openoffice/branches/ia2/main/sd/source/ui/inc/sdtreelb.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/inc/sdtreelb.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/inc/sdtreelb.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/inc/sdtreelb.hxx Fri Sep 27 03:21:44 2013
@@ -36,6 +36,10 @@
 #include <svl/urlbmk.hxx>
 #include <tools/ref.hxx>
 #include "sdxfer.hxx"
+//IAccessibility2 Implementation 2009-----
+#include <vector>
+using namespace std;
+//-----IAccessibility2 Implementation 2009
 #include <boost/scoped_ptr.hpp>
 #include <boost/function.hpp>
 
@@ -70,6 +74,10 @@ private:
 	
 	static sal_Bool  SD_DLLPRIVATE bIsInDrag;      // static, falls der Navigator im ExecuteDrag geloescht wird
 
+//IAccessibility2 Implementation 2009-----
+	//Solution: set contenttree in SdNavigatorWin
+    sal_Bool                           bisInSdNavigatorWin;
+//-----IAccessibility2 Implementation 2009
 public:
 
 	// nested class to implement the TransferableHelper
@@ -144,6 +152,11 @@ protected:
 	::sd::DrawDocShell* 		mpDropDocSh;
 	SdNavigatorWin*			mpDropNavWin;
 	SfxViewFrame*           mpFrame;
+	//IAccessibility2 Implementation 2009-----
+	vector<String>			maTreeItem;
+	sal_Bool					mbSaveTreeItemState;
+	String					maSelectionEntryText;
+	//-----IAccessibility2 Implementation 2009
 
 	// DragSourceHelper		
 	virtual void			StartDrag( sal_Int8 nAction, const Point& rPosPixel );
@@ -188,12 +201,20 @@ protected:
     
     using Window::GetDropTarget;
     virtual SvLBoxEntry* GetDropTarget (const Point& rLocation);
+//IAccessibility2 Implementation 2009-----
+	virtual void 	InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind );
+//-----IAccessibility2 Implementation 2009
 
 public:
 							
 							SdPageObjsTLB( Window* pParent, const SdResId& rSdResId );
 							~SdPageObjsTLB();
-
+//IAccessibility2 Implementation 2009-----
+   // helper function for 	GetEntryAltText and GetEntryLongDescription
+    String			getAltLongDescText( SvLBoxEntry* pEntry , sal_Bool isAltText) const;
+    String  		GetEntryAltText( SvLBoxEntry* pEntry ) const;
+    String  		GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
+//-----IAccessibility2 Implementation 2009
 	virtual void			SelectHdl();
 	virtual void			KeyInput( const KeyEvent& rKEvt );
 							
@@ -208,6 +229,16 @@ public:
 	sal_Bool					HasSelectedChilds( const String& rName );
 	sal_Bool					SelectEntry( const String& rName );
 	String					GetSelectEntry();
+//IAccessibility2 Implementation 2009-----
+	//Solution: Mark Current Entry
+	void                    MarkCurEntry( const String& rName );
+	void                    SetSdNavigatorWinFlag(sal_Bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;};
+	void                    FreshCurEntry();
+
+	void					Clear();
+	void					SetSaveTreeItemStateFlag(sal_Bool bState){mbSaveTreeItemState = bState;}
+	void					SaveExpandedTreeItemState(SvLBoxEntry* pEntry, vector<String>& vectTreeItem);
+//-----IAccessibility2 Implementation 2009
 	List*					GetSelectEntryList( sal_uInt16 nDepth );
 	SdDrawDocument*			GetBookmarkDoc(SfxMedium* pMedium = NULL);
 	::sd::DrawDocShell*			GetDropDocSh() { return(mpDropDocSh); }

Modified: openoffice/branches/ia2/main/sd/source/ui/slideshow/showwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/slideshow/showwin.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/slideshow/showwin.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/slideshow/showwin.cxx Fri Sep 27 03:21:44 2013
@@ -738,4 +738,28 @@ void ShowWindow::AddWindowToPaintView()
 		GetChild( nChild )->Show( sal_True );
 }
 
+//IAccessibility2 Implementation 2009-----
+// Overload the sd::Window's CreateAccessible to create a different accessible object
+::com::sun::star::uno::Reference<
+    ::com::sun::star::accessibility::XAccessible>
+    ShowWindow::CreateAccessible (void)
+{
+	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(sal_False);
+	if (xAcc.get())
+	{
+		return xAcc;
+	}
+    if (mpViewShell != NULL)
+	{
+		xAcc = mpViewShell->CreateAccessibleDocumentView (this);
+		SetAccessible(xAcc);
+		return xAcc;
+	}
+    else
+    {
+        OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
+	return ::Window::CreateAccessible ();
+    }
+}
+//-----IAccessibility2 Implementation 2009
 } // end of namespace sd

Modified: openoffice/branches/ia2/main/sd/source/ui/slideshow/showwindow.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/slideshow/showwindow.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/slideshow/showwindow.hxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/slideshow/showwindow.hxx Fri Sep 27 03:21:44 2013
@@ -102,6 +102,11 @@ public:
 	virtual void	MouseButtonDown(const MouseEvent& rMEvt);
 	virtual void	Paint(const Rectangle& rRect);
 	virtual long	Notify(NotifyEvent& rNEvt);
+	//IAccessibility2 Implementation 2009-----
+	//Overload the sd::Window's CreateAccessible to create a different accessible object
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible> 
+        CreateAccessible (void);
 
 	void			TerminateShow();
 	void			RestartShow();

Modified: openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshow.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshow.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshow.cxx Fri Sep 27 03:21:44 2013
@@ -818,6 +818,12 @@ void SAL_CALL SlideShow::end() throw(Run
                     }
 				}
 			}
+			//IAccessibility2 Implementation 2009-----
+			//Fire the acc focus event when focus is switched back. The above method mpCurrentViewShellBase->GetWindow()->GrabFocus() will
+			//set focus to WorkWindow instead of the sd::window, so here call Shell's method to fire the focus event
+			if (pViewShell)
+				pViewShell->SwitchActiveViewFireFocus();
+			//-----IAccessibility2 Implementation 2009
 		}
 		mpCurrentViewShellBase = 0;
 	}
@@ -1044,6 +1050,10 @@ void SlideShow::activate( ViewShellBase&
 			if( mxController->startShow(mxCurrentSettings.get()) )
 			{
 				pShell->Resize();
+				//IAccessibility2 Implementation 2009-----
+				// Defer the sd::ShowWindow's GrabFocus to here. so that the accessible event can be fired correctly. 
+				pShell->GetActiveWindow()->GrabFocus();
+				//-----IAccessibility2 Implementation 2009
 			}
 			else
 			{
@@ -1218,6 +1228,13 @@ void SlideShow::StartInPlacePresentation
 			
 		if( !bSuccess )	
 			end();
+		//IAccessibility2 Implementation 2009-----
+		else
+		{
+			if(mpCurrentViewShellBase)
+				mpCurrentViewShellBase->GetWindow()->GrabFocus();
+		}
+		//-----IAccessibility2 Implementation 2009
 	}
 }
 

Modified: openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/slideshow/slideshowimpl.cxx Fri Sep 27 03:21:44 2013
@@ -1096,7 +1096,10 @@ bool SlideshowImpl::startShow( Presentat
 				pBindings->Invalidate( SID_REHEARSE_TIMINGS );
 			}
 
-			mpShowWindow->GrabFocus();
+			//IAccessibility2 Implementation 2009-----
+			// Defer the sd::ShowWindow's GrabFocus to SlideShow::activate. so that the accessible event can be fired correctly. 
+			//mpShowWindow->GrabFocus();
+			//-----IAccessibility2 Implementation 2009
 
 			std::vector<beans::PropertyValue> aProperties;
 			aProperties.reserve( 4 );
@@ -1472,6 +1475,15 @@ void SlideshowImpl::displayCurrentSlide 
 			pBindings->Invalidate( SID_NAVIGATOR_PAGENAME );
 		}
 	}
+	//IAccessibility2 Implementation 2009-----
+	// send out page change event and notity to update all acc info for current page
+	if (mpViewShell)
+	{
+		sal_Int32 currentPageIndex = getCurrentSlideIndex();
+		mpViewShell->fireSwitchCurrentPage(currentPageIndex);
+		mpViewShell->NotifyAccUpdate();
+	}
+	//-----IAccessibility2 Implementation 2009
 }
 
 // ---------------------------------------------------------

Modified: openoffice/branches/ia2/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx Fri Sep 27 03:21:44 2013
@@ -284,6 +284,11 @@ void FocusManager::HideFocusIndicator (c
 	if (rpDescriptor.get() != NULL)
 	{
         mrSlideSorter.GetView().SetState(rpDescriptor, model::PageDescriptor::ST_Focused, false);
+
+		//IAccessibility2 Implementation 2009-----
+		// Hide focus should also fire the focus event, Currently, only accessibility add the focus listener
+		NotifyFocusChangeListeners();
+		//-----IAccessibility2 Implementation 2009
 	}
 }
 

Modified: openoffice/branches/ia2/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx Fri Sep 27 03:21:44 2013
@@ -215,6 +215,12 @@ void SlideSorterViewShell::Init (bool bI
 {
     ViewShell::Init(bIsMainViewShell);
 
+//IAccessibility2 Implementation 2009-----
+	// since the updatePageList will show focus, the window.show() must be called ahead. This show is deferred from Init()
+	::sd::Window* pActiveWindow = GetActiveWindow();
+	if (pActiveWindow)
+		pActiveWindow->Show();
+//-----IAccessibility2 Implementation 2009
     mpSlideSorter->GetModel().UpdatePageList();
 
     if (mpContentWindow.get() != NULL)
@@ -296,7 +302,19 @@ Reference<drawing::XDrawSubController> S
         pWindow);
 }
 
-
+//IAccessibility2 Implementation 2009-----
+void SlideSorterViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc )
+{
+	if (xAcc.get())
+	{
+		::accessibility::AccessibleSlideSorterView* pBase = static_cast< ::accessibility::AccessibleSlideSorterView* >(xAcc.get());	
+		if (pBase)
+		{
+			pBase->SwitchViewActivated();
+		}
+	}
+}
+//-----IAccessibility2 Implementation 2009
 
 
 SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const

Modified: openoffice/branches/ia2/main/sd/source/ui/unoidl/DrawController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/unoidl/DrawController.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/unoidl/DrawController.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/unoidl/DrawController.cxx Fri Sep 27 03:21:44 2013
@@ -539,9 +539,45 @@ void DrawController::FireSwitchCurrentPa
         }
     }
 }
+//IAccessibility2 Implementation 2009-----
+void DrawController::NotifyAccUpdate()
+{
+	sal_Int32 nHandle = PROPERTY_UPDATEACC;
+	Any aNewValue, aOldValue;
+	fire (&nHandle, &aNewValue, &aOldValue, 1, sal_False);
+}
+
+void DrawController::fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw()
+{
+	if( pCurrentLayer != mpCurrentLayer )
+	{
+		sal_Int32 nHandle = PROPERTY_ACTIVE_LAYER;
+		
+		Any aNewValue (makeAny( *pCurrentLayer) );
+
+		Any aOldValue ;
 
+		fire (&nHandle, &aNewValue, &aOldValue, 1, sal_False);
 
+		mpCurrentLayer = pCurrentLayer;
+	}
+}
 
+// This method is only called in slide show and outline view
+//void DrawController::fireSwitchCurrentPage(String pageName ) throw()
+void DrawController::fireSwitchCurrentPage(sal_Int32 pageIndex ) throw()
+{
+		Any aNewValue;
+		Any aOldValue;
+		//OUString aPageName(  pageName );
+		//aNewValue <<= aPageName ;
+		aNewValue <<= pageIndex;
+
+		// Use new property to handle page change event
+		sal_Int32 nHandles = PROPERTY_PAGE_CHANGE;
+		fire( &nHandles, &aNewValue, &aOldValue, 1, sal_False );
+}
+//-----IAccessibility2 Implementation 2009
 
 void DrawController::FirePropertyChange (
     sal_Int32 nHandle,
@@ -750,6 +786,19 @@ void DrawController::FillPropertyTable (
 			PROPERTY_DRAWVIEWMODE,
             ::getCppuType((const ::com::sun::star::awt::Point*)0),
             beans::PropertyAttribute::BOUND|beans::PropertyAttribute::READONLY|beans::PropertyAttribute::MAYBEVOID ));
+	    //IAccessibility2 Implementation 2009-----
+	// add new property to update current page's acc information
+    rProperties.push_back(
+        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("UpdateAcc") ),
+			PROPERTY_UPDATEACC,
+            ::getCppuType((const sal_Int16*)0),
+            beans::PropertyAttribute::BOUND ));	
+	rProperties.push_back(
+        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("PageChange") ),
+			PROPERTY_PAGE_CHANGE,
+            ::getCppuType((const sal_Int16*)0),
+            beans::PropertyAttribute::BOUND ));	
+	    //-----IAccessibility2 Implementation 2009
 }
 
 

Modified: openoffice/branches/ia2/main/sd/source/ui/unoidl/SdUnoDrawView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/unoidl/SdUnoDrawView.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/unoidl/SdUnoDrawView.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/unoidl/SdUnoDrawView.cxx Fri Sep 27 03:21:44 2013
@@ -151,6 +151,9 @@ Reference<drawing::XLayer> SdUnoDrawView
             xCurrentLayer = pManager->GetLayer (pLayer);
     }
     while (false);
+//IAccessibility2 Implementation 2009-----
+	mrController.mpCurrentLayer = &(xCurrentLayer) ;
+//-----IAccessibility2 Implementation 2009
 
     return xCurrentLayer;
 }

Modified: openoffice/branches/ia2/main/sd/source/ui/view/Outliner.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/Outliner.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/Outliner.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/Outliner.cxx Fri Sep 27 03:21:44 2013
@@ -535,7 +535,17 @@ bool Outliner::StartSearchAndReplace (co
             else
                 mnStartPageIndex = (sal_uInt16)-1;
         }
-    }
+//IAccessibility2 Implementation 2009-----
+	if ( Application::IsAccessibilityEnabled() )
+	{
+		SvxSearchDialog* pSearchDlg = 
+			((SvxSearchDialog*)(SfxViewFrame::Current()->GetChildWindow(
+			SvxSearchDialogWrapper::GetChildWindowId())->GetWindow()));
+		pSearchDlg->SetDocWin( pViewShell->GetActiveWindow() );
+		pSearchDlg->SetSrchFlag();
+	}
+//-----IAccessibility2 Implementation 2009
+        }
     else
         mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
 

Modified: openoffice/branches/ia2/main/sd/source/ui/view/drviews4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/drviews4.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/drviews4.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/drviews4.cxx Fri Sep 27 03:21:44 2013
@@ -79,6 +79,9 @@
 // #97016# IV
 #include <svx/svditer.hxx>
 
+//IAccessibility2 Implementation 2009-----
+#include <navigatr.hxx>
+//-----IAccessibility2 Implementation 2009
 namespace sd {
 
 #define PIPETTE_RANGE 0
@@ -227,6 +230,14 @@ sal_Bool DrawViewShell::KeyInput (const 
 		else
 		{
 			bRet = ViewShell::KeyInput(rKEvt, pWin);
+//IAccessibility2 Implementation 2009-----
+    		//Solution: If object is marked , the corresponding entry is set true ,
+    		//else the corresponding entry is set false .
+       	    if(KEY_TAB == rKEvt.GetKeyCode().GetCode())
+       	    {
+   			   FreshNavigatrTree();
+       	    }
+//-----IAccessibility2 Implementation 2009
 		}
 	}
 
@@ -271,7 +282,33 @@ void DrawViewShell::StartRulerDrag (
         mbIsRulerDrag = sal_True;
 	}
 }
+//IAccessibility2 Implementation 2009-----
+//Solution: If object is marked , the corresponding entry is set true ,
+//else the corresponding entry is set false .
+void DrawViewShell::FreshNavigatrEntry()
+{
+		sal_uInt16 nId = SID_NAVIGATOR;
+		SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId );
+		if( pWindow )
+		{
+			SdNavigatorWin* pNavWin = (SdNavigatorWin*)( pWindow->GetContextWindow( SD_MOD() ) );
+			if( pNavWin )
+				pNavWin->FreshEntry();
+		}
+}
 
+void DrawViewShell::FreshNavigatrTree()
+{
+		sal_uInt16 nId = SID_NAVIGATOR;
+		SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId );
+		if( pWindow )
+		{
+			SdNavigatorWin* pNavWin = (SdNavigatorWin*)( pWindow->GetContextWindow( SD_MOD() ) );
+			if( pNavWin )
+				pNavWin->FreshTree( GetDoc() );
+		}
+}
+//-----IAccessibility2 Implementation 2009
 /*************************************************************************
 |*
 |* MouseButtonDown event
@@ -298,6 +335,11 @@ void DrawViewShell::MouseButtonDown(cons
 	{
 		ViewShell::MouseButtonDown(rMEvt, pWin);
 
+//IAccessibility2 Implementation 2009-----
+		//Solution: If object is marked , the corresponding entry is set true ,
+		//else the corresponding entry is set false .
+              FreshNavigatrTree();
+//-----IAccessibility2 Implementation 2009
 		if ( mbPipette )
 			( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )->PipetteClicked();
 	}
@@ -467,6 +509,11 @@ void DrawViewShell::MouseButtonUp(const 
 		}
 		else
     		ViewShell::MouseButtonUp(rMEvt, pWin);
+//IAccessibility2 Implementation 2009-----
+		//Solution: If object is marked , the corresponding entry is set true ,
+		//else the corresponding entry is set false .
+		FreshNavigatrTree();
+//-----IAccessibility2 Implementation 2009
 	}
 }
 

Modified: openoffice/branches/ia2/main/sd/source/ui/view/drviews5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/drviews5.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/drviews5.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/drviews5.cxx Fri Sep 27 03:21:44 2013
@@ -705,6 +705,15 @@ void DrawViewShell::SetActiveTabLayerInd
             // Tell the draw view and the tab control of the new active layer.
             mpDrawView->SetActiveLayer (pBar->GetPageText (pBar->GetPageId ((sal_uInt16)nIndex)));
             pBar->SetCurPageId (pBar->GetPageId ((sal_uInt16)nIndex));
+		//IAccessibility2 Implementation 2009-----
+		SdUnoDrawView* pUnoDrawView = new SdUnoDrawView (
+            GetViewShellBase().GetDrawController(),
+            *this,
+            *GetView());
+		::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer();
+		GetViewShellBase().GetDrawController().fireChangeLayer( &rLayer );
+		delete pUnoDrawView;
+		//-----IAccessibility2 Implementation 2009
         }
     }
 }

Modified: openoffice/branches/ia2/main/sd/source/ui/view/outlnvsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/outlnvsh.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/outlnvsh.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/outlnvsh.cxx Fri Sep 27 03:21:44 2013
@@ -235,6 +235,9 @@ OutlineViewShell::OutlineViewShell (
 	Construct(GetDocSh());
 
     SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OutlineText));
+//IAccessibility2 Implementation 2009-----
+	m_StrOldPageName.EmptyString();
+//-----IAccessibility2 Implementation 2009
 }
 
 /*************************************************************************
@@ -1472,6 +1475,14 @@ void OutlineViewShell::GetStatusBarState
 
 		aLayoutStr = pPage->GetLayoutName();
 		aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
+		//IAccessibility2 Implementation 2009-----
+			//Now, CurrentPage property change is already sent for DrawView and OutlineView, so it is not necessary to send again here
+			if(m_StrOldPageName!=aPageStr)
+			{
+				GetViewShellBase().GetDrawController().fireSwitchCurrentPage(nPos);
+				m_StrOldPageName = aPageStr;
+			}	
+		//-----IAccessibility2 Implementation 2009
 	}
 	rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) );
 	rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );

Modified: openoffice/branches/ia2/main/sd/source/ui/view/sdwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/sdwindow.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/sdwindow.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/sdwindow.cxx Fri Sep 27 03:21:44 2013
@@ -45,6 +45,10 @@
 #include "AccessibleDrawDocumentView.hxx"
 #include "WindowUpdater.hxx"
 
+//IAccessibility2 Implementation 2009-----
+#include <vcl/svapp.hxx>
+//-----IAccessibility2 Implementation 2009
+
 namespace sd {
 
 #define SCROLL_LINE_FACT   0.05     // Faktor fuer Zeilenscrolling
@@ -1160,8 +1164,25 @@ void Window::DropScroll(const Point& rMo
     ::com::sun::star::accessibility::XAccessible>
     Window::CreateAccessible (void)
 {
+//IAccessibility2 Implementation 2009-----
+	// If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. 
+	if (mpViewShell && mpViewShell->ISA(PresentationViewShell))
+	{
+		return ::Window::CreateAccessible ();
+	}
+	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(sal_False);
+	if (xAcc.get())
+	{
+		return xAcc;
+	}
     if (mpViewShell != NULL)
-        return mpViewShell->CreateAccessibleDocumentView (this);
+	//return mpViewShell->CreateAccessibleDocumentView (this);
+	{
+		xAcc = mpViewShell->CreateAccessibleDocumentView (this);
+		SetAccessible(xAcc);
+		return xAcc;
+	}
+//-----IAccessibility2 Implementation 2009
     else
     {
         OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
@@ -1169,6 +1190,22 @@ void Window::DropScroll(const Point& rMo
     }
 }
 
+//IAccessibility2 Implementation 2009-----
+// MT: Removed Windows::SwitchView() introduced with IA2 CWS.
+// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism
+void Window::SwitchView()
+{
+	if (!Application::IsAccessibilityEnabled())
+	{
+		return ;
+	}
+	if (mpViewShell)
+	{
+		mpViewShell->SwitchViewFireFocus(GetAccessible(sal_False));
+	}
+}
+//-----IAccessibility2 Implementation 2009
+
 XubString Window::GetSurroundingText() const
 {
     if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )

Modified: openoffice/branches/ia2/main/sd/source/ui/view/tabcontr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/tabcontr.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/tabcontr.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/tabcontr.cxx Fri Sep 27 03:21:44 2013
@@ -92,6 +92,7 @@ TabControl::TabControl(DrawViewShell* pV
 	TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE | WB_DRAG) ),
 	DragSourceHelper( this ),
 	DropTargetHelper( this ),
+    RrePageID(1),
 	pDrViewSh(pViewSh),
 	bInternalMove(sal_False)
 {
@@ -136,6 +137,12 @@ void  TabControl::MouseButtonDown(const 
 		Point aPos = PixelToLogic( rMEvt.GetPosPixel() );
 		sal_uInt16 aPageId = GetPageId(aPos);
 
+//IAccessibility2 Implementation 2009-----
+		//Solution: initialize
+        if(RrePageID!=aPageId)
+			pDrViewSh->FreshNavigatrEntry(); 
+		RrePageID=aPageId;
+//-----IAccessibility2 Implementation 2009
 		if (aPageId == 0)
 		{
 			SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();

Modified: openoffice/branches/ia2/main/sd/source/ui/view/viewshel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/viewshel.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/viewshel.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/viewshel.cxx Fri Sep 27 03:21:44 2013
@@ -95,7 +95,9 @@
 #include <editeng/eeitem.hxx>
 #include <svl/poolitem.hxx>
 #include <glob.hrc>
-
+//IAccessibility2 Implementation 2009-----
+#include "AccessibleDocumentViewBase.hxx"
+//-----IAccessibility2 Implementation 2009
 #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
 #define SO2_DECL_SVINPLACEOBJECT_DEFINED
 SO2_DECL_REF(SvInPlaceObject)
@@ -479,6 +481,9 @@ sal_Bool ViewShell::KeyInput(const KeyEv
 		bReturn = (sal_Bool)GetViewShell()->KeyInput(rKEvt);
 	}
 
+//IAccessibility2 Implementation 2009-----
+	sal_Int32 OriCount = GetView()->GetMarkedObjectList().GetMarkCount();
+//-----IAccessibility2 Implementation 2009
 	if(!bReturn)
 	{
 		rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) );
@@ -508,6 +513,14 @@ sal_Bool ViewShell::KeyInput(const KeyEv
 			}
 		}
 	}
+//IAccessibility2 Implementation 2009-----
+	sal_Int32 EndCount = GetView()->GetMarkedObjectList().GetMarkCount();
+	// Here, oriCount or endCount must have one value=0, another value > 0, then to switch focus between Document and shape objects
+	if(bReturn &&  (OriCount + EndCount > 0) && (OriCount * EndCount == 0))
+	{
+		SwitchActiveViewFireFocus();
+	}
+//-----IAccessibility2 Implementation 2009
 
 	if(!bReturn && GetActiveWindow())
 	{
@@ -1624,7 +1637,36 @@ bool ViewShell::RelocateToParentWindow (
     return true;
 }
 
+//IAccessibility2 Implementation 2009-----
+void ViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc )
+{
+	if (xAcc.get())
+	{
+		::accessibility::AccessibleDocumentViewBase* pBase = static_cast< ::accessibility::AccessibleDocumentViewBase* >(xAcc.get());	
+		if (pBase)
+		{
+			pBase->SwitchViewActivated();
+		}
+	}
+}
+void ViewShell::SwitchActiveViewFireFocus()
+{
+	if (mpContentWindow)
+	{
+		SwitchViewFireFocus(mpContentWindow->GetAccessible(sal_False));
+	}
+}
+// move these two methods from DrawViewShell. 
+void ViewShell::fireSwitchCurrentPage(sal_Int32 pageIndex)
+{
+	GetViewShellBase().GetDrawController().fireSwitchCurrentPage(pageIndex);
+}
+void ViewShell::NotifyAccUpdate( )
+{
+	GetViewShellBase().GetDrawController().NotifyAccUpdate();
+}
 
+//-----IAccessibility2 Implementation 2009
 
 } // end of namespace sd
 

Modified: openoffice/branches/ia2/main/sfx2/inc/sfx2/dinfdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sfx2/inc/sfx2/dinfdlg.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sfx2/inc/sfx2/dinfdlg.hxx (original)
+++ openoffice/branches/ia2/main/sfx2/inc/sfx2/dinfdlg.hxx Fri Sep 27 03:21:44 2013
@@ -550,7 +550,7 @@ class SfxCustomPropertiesPage : public S
 private:
     CustomPropertiesControl m_aPropertiesCtrl;
     PushButton              m_aAddBtn;
-	FixedText               m_aPropertiesFT; // Sym2_5121----, Moved by Steve Yin
+	FixedText               m_aPropertiesFT;
 
     DECL_LINK(  AddHdl, PushButton* );
 

Modified: openoffice/branches/ia2/main/sfx2/inc/sfx2/viewsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sfx2/inc/sfx2/viewsh.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sfx2/inc/sfx2/viewsh.hxx (original)
+++ openoffice/branches/ia2/main/sfx2/inc/sfx2/viewsh.hxx Fri Sep 27 03:21:44 2013
@@ -326,9 +326,6 @@ public:
     SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl();
     SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey);
 #endif
-	// IAccessibility2 implementation 2009. ------
-	virtual sal_Bool IsEditorEnableAutoSpell() const { return sal_False; } 
-	// ------ IAccessibility2 implementation 2009.
 };
 
 //========================================================================

Modified: openoffice/branches/ia2/main/sfx2/source/dialog/newstyle.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sfx2/source/dialog/newstyle.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sfx2/source/dialog/newstyle.cxx (original)
+++ openoffice/branches/ia2/main/sfx2/source/dialog/newstyle.cxx Fri Sep 27 03:21:44 2013
@@ -87,7 +87,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* 
 	aOKBtn.SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
 	aColBox.SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl));
 	aColBox.SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
-	// aColBox.SetAccessibleName(SfxResId(FL_COL));
+	aColBox.SetAccessibleName(SfxResId(FL_COL));
 
 	SfxStyleSheetBase *pStyle = rPool.First();
 	while ( pStyle )

Modified: openoffice/branches/ia2/main/sfx2/source/menu/mnuitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sfx2/source/menu/mnuitem.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sfx2/source/menu/mnuitem.cxx (original)
+++ openoffice/branches/ia2/main/sfx2/source/menu/mnuitem.cxx Fri Sep 27 03:21:44 2013
@@ -291,6 +291,10 @@ void SfxMenuControl::StateChanged
 		DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
 					"SfxBoolItem not allowed for SID_OBJECTMENUx" );
 		bCheck = ((const SfxBoolItem*)pState)->GetValue();
+		// IAccessibility2 implementation 2009. ------
+		Menu* pMenu = pOwnMenu->GetSVMenu();
+		pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
+		// ------ IAccessibility2 implementation 2009.
 	}
 	else if ( pState->ISA(SfxEnumItemInterface) &&
 			  ((SfxEnumItemInterface *)pState)->HasBoolValue() )
@@ -299,6 +303,10 @@ void SfxMenuControl::StateChanged
 		DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
 					"SfxEnumItem not allowed for SID_OBJECTMENUx" );
 		bCheck = ((SfxEnumItemInterface *)pState)->GetBoolValue();
+		// IAccessibility2 implementation 2009. ------
+		Menu* pMenu = pOwnMenu->GetSVMenu();
+		pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
+		// ------ IAccessibility2 implementation 2009.
 	}
 	else if ( ( b_ShowStrings || bIsObjMenu ) && pState->ISA(SfxStringItem) )
 	{

Modified: openoffice/branches/ia2/main/sfx2/source/view/viewfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sfx2/source/view/viewfrm.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sfx2/source/view/viewfrm.cxx (original)
+++ openoffice/branches/ia2/main/sfx2/source/view/viewfrm.cxx Fri Sep 27 03:21:44 2013
@@ -683,7 +683,13 @@ void SfxViewFrame::ExecReload_Impl( SfxR
 				if( pSalvageItem )
 				{
 					aURL = pSalvageItem->GetValue();
-					pNewSet->ClearItem( SID_DOC_SALVAGE );
+					// IAccessibility2 implementation 2009. ------
+                    if (pNewSet)
+                    {
+                        pNewSet->ClearItem( SID_ORIGURL );
+					    pNewSet->ClearItem( SID_DOC_SALVAGE );
+                    }
+					// ------ IAccessibility2 implementation 2009.
 				}
 
                 // TODO/LATER: Temporary solution, the SfxMedium must know the original URL as aLogicName
@@ -3379,13 +3385,17 @@ void SfxViewFrame::ChildWindowExecute( S
 	sal_Bool bShow = sal_False;
 	sal_Bool bHasChild = HasChildWindow(nSID);
 	bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
+	// IAccessibility2 implementation 2009. ------
+    GetDispatcher()->Update_Impl( sal_True );
 
 	// ausf"uhren
 	if ( !pShowItem || bShow != bHasChild )
 		ToggleChildWindow( nSID );
 
 	GetBindings().Invalidate( nSID );
-    GetDispatcher()->Update_Impl( sal_True );
+	// Move to the before show()
+    //GetDispatcher()->Update_Impl( sal_True );
+	// ------ IAccessibility2 implementation 2009.
 
 	// ggf. recorden
     if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG )

Modified: openoffice/branches/ia2/main/soldep/source/soldep.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/soldep/source/soldep.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/soldep/source/soldep.cxx (original)
+++ openoffice/branches/ia2/main/soldep/source/soldep.cxx Fri Sep 27 03:21:44 2013
@@ -979,7 +979,7 @@ sal_Bool SolDep::MarkObjects( ObjectWin*
 
 void SolDep::Resize()
 {
-//funzt! muß aber von der applikation aufgerufen werden.
+//funzt! mu?aber von der applikation aufgerufen werden.
     Point aOutPos = Point( 0, 0 );
 	Size aOutSize = mpProcessWin->GetOutputSizePixel();
 		// calculate output size
@@ -991,7 +991,7 @@ void SolDep::Resize()
     Point aGraphWinPos = Point(0,0);
     Size  aGraphWinSize = Size(0,0);
 
-//weiß nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues
+//wei?nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues
 
     //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
     // Set Docking-Rectangle for ToolBar
@@ -1714,7 +1714,7 @@ sal_uInt16 SolDep::OptimizePos(SolIdMapp
 
 	sal_uIntPtr nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );
 
-    //    sal_uIntPtr aObjID = GetStart(pIdMapper, pObjLst) //hier muß man switchen GetStart/GetPrjStart oder so
+    //    sal_uIntPtr aObjID = GetStart(pIdMapper, pObjLst) //hier mu?man switchen GetStart/GetPrjStart oder so
 
     ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
 
@@ -1763,7 +1763,7 @@ sal_uInt16 SolDep::OptimizePos(SolIdMapp
 	aWorkList.Clear();
 	GetDepWin()->EnablePaint( sal_True );
 	GetDepWin()->Invalidate();
-//LevelListen loeschen	                Hä? Welche Levellisten?
+//LevelListen loeschen	                H? Welche Levellisten?
 
 //Update all Connectors
 // --> To be done: Don't call twice Object1-Connector-Object2

Modified: openoffice/branches/ia2/main/svtools/source/control/accessibleruler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/source/control/accessibleruler.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/source/control/accessibleruler.cxx (original)
+++ openoffice/branches/ia2/main/svtools/source/control/accessibleruler.cxx Fri Sep 27 03:21:44 2013
@@ -29,11 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-//add by duan mei hua, 2006/09/04, for issue 174
 #ifndef _SVTRULERACCESSIBLE_HXX
 #include <svtools/accessibleruler.hxx>
 #endif
-//end add by duan mei hua, 2006/09/04, for issue 174
+
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #endif
@@ -503,10 +502,9 @@ Rectangle SvtRulerAccessible::GetBoundin
 
 	ThrowExceptionIfNotAlive();
 //IAccessibility2 Implementation 2009-----
-	//Modified by Li Xing, 2007/03/26, SODC_7333, the absolute on screen pixel is wrong
+	//the absolute on screen pixel is wrong
 	//return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
 	return Rectangle( mpRepr->GetParent()->OutputToAbsoluteScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
-	//Ended by Li Xing, 2007/03/26, SODC_7333.
 //-----IAccessibility2 Implementation 2009
 }
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/AccessibleTableShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/AccessibleTableShape.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/AccessibleTableShape.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/AccessibleTableShape.hxx Fri Sep 27 03:21:44 2013
@@ -36,10 +36,8 @@
 #include <svx/AccessibleShape.hxx>
 //IAccessibility2 Implementation 2009-----
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-// SD table ACC----, added by Steve Yin
 #include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
 #include <cppuhelper/compbase5.hxx>
-// ----SD table ACC
 //-----IAccessibility2 Implementation 2009
 
 #include <boost/noncopyable.hpp>
@@ -117,7 +115,7 @@ public:
     virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw ( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex )  throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException );
-	// SD table ACC----, added by Steve Yin
+	//IAccessibility2 Implementation 2009-----
 	//=====  XAccessibleTableSelection ============================================
 	virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) 
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
@@ -127,7 +125,7 @@ public:
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
 	virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) 
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
-	// ----SD table ACC
+	//-----IAccessibility2 Implementation 2009
 
 	// XServiceInfo
 	virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
@@ -144,11 +142,11 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 	sal_Int32 mnPreviousSelectionCount;
 	using AccessibleShape::disposing;
-	// SD table ACC----, added by Steve Yin
+	//IAccessibility2 Implementation 2009-----
 	friend class AccessibleTableHeaderShape;
-	// Sym2_6134
+	
 	void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException );
-	//Sym2_6108, overwrite the SetState & ResetState to do special operation for table cell's internal text
+	// overwrite the SetState & ResetState to do special operation for table cell's internal text
 	virtual sal_Bool SetState (sal_Int16 aState);
 	virtual sal_Bool ResetState (sal_Int16 aState);
 	// The following two methods are used to set state directly on table object, instread of the internal cell or paragraph. 
@@ -156,7 +154,7 @@ public:
 	sal_Bool ResetStateDirectly (sal_Int16 aState);
 	// Get the currently active cell which is text editing
 	AccessibleCell* GetActiveAccessibleCell();
-	// ----SD table ACC
+	//-----IAccessibility2 Implementation 2009
 
 protected:
 	virtual ::rtl::OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException);
@@ -164,17 +162,17 @@ protected:
 	sdr::table::SvxTableController* getTableController();
 
 	void checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
-	// Sym2_6134, move to public
+	//IAccessibility2 Implementation 2009, move to public
 	//void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException );
 
 private:
 	rtl::Reference< AccessibleTableShapeImpl > mxImpl;
-	// SD table ACC----, added by Steve Yin
+	//IAccessibility2 Implementation 2009-----
 	sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const;
-	// ----SD table ACC
+	//-----IAccessibility2 Implementation 2009
 };
 
-// SD table ACC----, added by Steve Yin
+//IAccessibility2 Implementation 2009-----
 typedef ::cppu::WeakImplHelper5<
 			::com::sun::star::accessibility::XAccessible,
 			::com::sun::star::accessibility::XAccessibleComponent,
@@ -254,7 +252,7 @@ private:
 	sal_Bool mbRow;
 	rtl::Reference< AccessibleTableShape > mpTable;
 };
-// ----SD table ACC
+//-----IAccessibility2 Implementation 2009
 
 } // end of namespace accessibility
 

Modified: openoffice/branches/ia2/main/svx/inc/svx/nbdtmg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/nbdtmg.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/inc/svx/nbdtmg.hxx (original)
+++ openoffice/branches/ia2/main/svx/inc/svx/nbdtmg.hxx Fri Sep 27 03:21:44 2013
@@ -199,7 +199,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
 	private:
 		const SfxItemSet*	pSet;
 		SfxMapUnit		eCoreUnit;
-		//Sym3_2508    store the attributes passed from pSet
+		// store the attributes passed from pSet
 		String			aNumCharFmtName;
 		void			StoreBulCharFmtName_impl();
 		void			StoreMapUnit_impl();
@@ -217,7 +217,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
 		virtual sal_Bool IsCustomized(sal_uInt16 nIndex)=0;
 		sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel);
 		const SfxItemSet* GetItems() { return pSet;}
-		//Sym3_2508    store the attributes passed from pSet
+		// store the attributes passed from pSet
 		void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();}
 	protected:
 		String GetBulCharFmtName();

Modified: openoffice/branches/ia2/main/svx/source/accessibility/AccessibleTextHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/accessibility/AccessibleTextHelper.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/accessibility/AccessibleTextHelper.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/accessibility/AccessibleTextHelper.cxx Fri Sep 27 03:21:44 2013
@@ -76,10 +76,10 @@
 #include "editeng/AccessibleEditableTextPara.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-// SD table ACC----, added by Steve Yin
+//IAccessibility2 Implementation 2009-----
 #include "../table/cell.hxx"
 #include "../table/accessiblecell.hxx"
-// ----SD table ACC
+//-----IAccessibility2 Implementation 2009
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
@@ -512,20 +512,20 @@ namespace accessibility
         {
             if( bHaveFocus )
             {
-				// SD table ACC----, added by Steve Yin
+				//IAccessibility2 Implementation 2009-----
 				if( mxFrontEnd.is() )
 				{
 					AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* > ( mxFrontEnd.get() );
 					if ( !pAccessibleCell )
 						GotPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED), AccessibleEventId::STATE_CHANGED );
-					else	// Sym2_6108, the focus event on cell should be fired on table directly
+					else	// the focus event on cell should be fired on table directly
 					{
 						AccessibleTableShape* pAccTable = pAccessibleCell->GetParentTable();
 						if (pAccTable)
 							pAccTable->SetStateDirectly(AccessibleStateType::FOCUSED);
 					}
 				}
-				// ----SD table ACC
+				//-----IAccessibility2 Implementation 2009
                 DBG_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" );
             }
             else
@@ -597,7 +597,7 @@ namespace accessibility
             if( !pViewForwarder )
                 return sal_False;
 
-			// SD table ACC----, added by Steve Yin
+			//IAccessibility2 Implementation 2009-----
 			if( mxFrontEnd.is() )
 			{
 				AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* > ( mxFrontEnd.get() );
@@ -608,7 +608,7 @@ namespace accessibility
 						return xCell->IsTextEditActive();
 				}
 			}
-			// ----SD table ACC
+			//-----IAccessibility2 Implementation 2009
             if( pViewForwarder->IsValid() )
                 return sal_True;
             else

Modified: openoffice/branches/ia2/main/svx/source/accessibility/ChildrenManagerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/accessibility/ChildrenManagerImpl.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/accessibility/ChildrenManagerImpl.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/accessibility/ChildrenManagerImpl.cxx Fri Sep 27 03:21:44 2013
@@ -1056,7 +1056,7 @@ void ChildrenManagerImpl::UpdateSelectio
     */
 	Window *pParentWidow = maShapeTreeInfo.GetWindow();
 	bool bShapeActive= false;
-	// Sym2_6146, For table cell, the table's parent must be checked to make sure it has focus. 
+	// For table cell, the table's parent must be checked to make sure it has focus. 
 	Window *pPWindow = pParentWidow->GetParent();
 	if (pParentWidow && ( pParentWidow->HasFocus() || (pPWindow && pPWindow->HasFocus())))
 	{

Modified: openoffice/branches/ia2/main/svx/source/sidebar/nbdtmg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/nbdtmg.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/nbdtmg.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/nbdtmg.cxx Fri Sep 27 03:21:44 2013
@@ -301,7 +301,7 @@ void NBOTypeMgrBase::StoreMapUnit_impl()
 		{
 			eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
 		} else {
-			//Sym3_2508 sd use different sid for numbering rule
+			//sd use different sid for numbering rule
 			eState = pSet->GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem);
 			if(eState == SFX_ITEM_SET)
 			{

Modified: openoffice/branches/ia2/main/svx/source/table/accessiblecell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/table/accessiblecell.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/table/accessiblecell.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/table/accessiblecell.cxx Fri Sep 27 03:21:44 2013
@@ -251,7 +251,7 @@ Reference<XAccessibleStateSet> SAL_CALL 
 				pStateSet->AddState(AccessibleStateType::VISIBLE);
 
 
-			//Sym2_6167, IAccessibility2 Implementation 2009-----
+			//IAccessibility2 Implementation 2009-----
 			//Solution:Just when the parent table is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE
 		    ::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
 		    if( xTempAcc.is() )
@@ -602,7 +602,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAc
     return mnIndexInParent;
 }
 
-// SD table ACC----, added by Steve Yin
+//IAccessibility2 Implementation 2009-----
 sdr::table::CellRef AccessibleCell::getCellRef()
 {
 	return mxCell;
@@ -666,7 +666,7 @@ void AccessibleCell::UpdateChildren()
 	if (mpText)						
 		mpText->UpdateChildren();
 }
-// ----SD table ACC
+//-----IAccessibility2 Implementation 2009
 
 /* MT: Above getAccessibleName was introduced with IA2 CWS, while below was introduce in 3.3 meanwhile. Check which one is correct
 If this is correct, we also don't need 	sdr::table::CellRef getCellRef(), UpdateChildren(), getCellName( sal_Int32 nCol, sal_Int32 nRow ) above

Modified: openoffice/branches/ia2/main/sw/source/core/access/accdoc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/accdoc.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/access/accdoc.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/access/accdoc.cxx Fri Sep 27 03:21:44 2013
@@ -894,10 +894,10 @@ uno::Any SAL_CALL SwAccessibleDocument::
 sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() 
 		throw (::com::sun::star::uno::RuntimeException)
 {
-	// Sym2_3241----, added by Steve Yin
+	//IAccessibility2 Implementation 2009-----
 	vos::OGuard aGuard(Application::GetSolarMutex());
 	return SW_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
-	// ----Sym2_3241
+	//-----IAccessibility2 Implementation 2009
 }
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >

Modified: openoffice/branches/ia2/main/sw/source/core/access/accfield.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/accfield.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/access/accfield.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/access/accfield.cxx Fri Sep 27 03:21:44 2013
@@ -55,7 +55,6 @@
 #include <accfield.hxx>
 #endif
 
-//Add by qinsh && Li Xing, fix bug SODC_3508,2006/6/22
 #include <comphelper/processfactory.hxx>
 
 #ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HPP_

Modified: openoffice/branches/ia2/main/sw/source/core/access/accframebase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/accframebase.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/access/accframebase.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/access/accframebase.hxx Fri Sep 27 03:21:44 2013
@@ -72,7 +72,6 @@ public:
 
 	// The object is not visible an longer and should be destroyed
 	virtual void Dispose( sal_Bool bRecursive = sal_False );
-	//Added by yangzhh for SODC_3622, 2006/06/14
 	virtual sal_Bool SetSelectedState( sal_Bool bSeleted );
 	//-----IAccessibility2 Implementation 2009
 };



Mime
View raw message