From da51db02977ef2e5878486f515f5cbc84292cc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Mon, 7 Jul 2008 13:28:01 +0000
Subject: [PATCH] INTEGRATION: CWS impressa11y (1.3.86); FILE MERGED 2008/06/11
 11:01:35 af 1.3.86.1: Resolved merge conflicts.

---
 svx/inc/svx/AccessibleShape.hxx | 50 ++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index 80d7c1248b98..f545771728ed 100755
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
@@ -1,5 +1,37 @@
 /*************************************************************************
  *
+<<<<<<< AccessibleShape.hxx
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: AccessibleShape.hxx,v $
+ *
+ *  $Revision: 1.4 $
+ *
+ *  last change: $Author: rt $ $Date: 2008-07-07 14:28:01 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+=======
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2008 by Sun Microsystems, Inc.
@@ -7,7 +39,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AccessibleShape.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -25,9 +57,11 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
+>>>>>>> 1.3
  *
  ************************************************************************/
 
+
 #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
 #define _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
 
@@ -163,6 +197,7 @@ public:
     */
     sal_Bool GetState (sal_Int16 aState);
 
+
     //=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
@@ -184,6 +219,7 @@ public:
         getAccessibleChild (sal_Int32 nIndex)
         throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
+
     /// Return the set of current states.
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
@@ -220,6 +256,8 @@ public:
     virtual sal_Int32 SAL_CALL getBackground (void)
         throw (::com::sun::star::uno::RuntimeException);
 
+
+
     //=====  XComponent  ========================================================
 
     using WeakComponentImplHelperBase::addEventListener;
@@ -252,6 +290,7 @@ public:
             ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener)
         throw (::com::sun::star::uno::RuntimeException);
 
+
     //=====  XInterface  ======================================================
 
     virtual com::sun::star::uno::Any SAL_CALL
@@ -266,6 +305,7 @@ public:
         release (void)
         throw ();
 
+
     //=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
@@ -303,6 +343,7 @@ public:
         notifyEvent (const ::com::sun::star::document::EventObject& rEventObject)
         throw (::com::sun::star::uno::RuntimeException);
 
+
     //===== XUnoTunnel ========================================================
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 >&   getUnoTunnelImplementationId() throw();
@@ -389,6 +430,13 @@ private:
     SVX_DLLPRIVATE explicit AccessibleShape (const AccessibleShape&);
     /// Don't use the assignment operator.  Do we need this?
     SVX_DLLPRIVATE AccessibleShape& operator= (const AccessibleShape&);
+
+    /** Call this method when the title, name, or description of the mxShape
+        member (may) have been changed.
+        This method adapts the name and description members of the
+        AccessibleContextBase base class.
+    */
+    void UpdateNameAndDescription (void);
 };
 
 } // end of namespace accessibility