#104426# XAccessible(Extended)Component reorganization changes.

4 files changed, 39 insertions, 62 deletions

diff --git a/svx/source/accessibility/AccessibleComponentBase.cxx b/svx/source/accessibility/AccessibleComponentBase.cxx
index 90e320393071..4764ef9df39c 100644
--- a/svx/source/accessibility/AccessibleComponentBase.cxx
+++ b/svx/source/accessibility/AccessibleComponentBase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleComponentBase.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: af $ $Date: 2002-08-05 09:13:55 $
+ *  last change: $Author: af $ $Date: 2002-10-23 09:45:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -167,7 +167,7 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen (void)
 
 
 
-
+/*
 sal_Bool SAL_CALL AccessibleComponentBase::isShowing (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -191,7 +191,7 @@ sal_Bool SAL_CALL AccessibleComponentBase::isFocusTraversable (void)
 {
     return sal_False;
 }
-
+*/
 
 
 
@@ -264,15 +264,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void)
 
 
 
-sal_Bool SAL_CALL AccessibleComponentBase::isEnabled (void)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    return sal_True;
-}
-
-
-
-
 ::rtl::OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void)
         throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 4677aceb27cf..3526106375d0 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleShape.cxx,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: af $ $Date: 2002-07-24 13:23:55 $
+ *  last change: $Author: af $ $Date: 2002-10-23 09:45:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -681,26 +681,6 @@ awt::Size SAL_CALL AccessibleShape::getSize (void)
 
 
 
-sal_Bool SAL_CALL AccessibleShape::isShowing (void)
-    throw (uno::RuntimeException)
-{
-    return mxStateSet->contains (AccessibleStateType::SHOWING);
-}
-
-
-
-
-sal_Bool SAL_CALL AccessibleShape::isVisible (void)
-    throw (uno::RuntimeException)
-{
-    return mxStateSet->contains (AccessibleStateType::VISIBLE);
-}
-
-
-
-
-//=====  XAccessibleExtendedComponent  ========================================
-
 sal_Int32 SAL_CALL AccessibleShape::getForeground (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 34fe461f1745..ea903d318c02 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GraphCtlAccessibleContext.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: af $ $Date: 2002-10-17 12:14:48 $
+ *  last change: $Author: af $ $Date: 2002-10-23 09:45:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -332,26 +332,6 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept
     return awt::Size( aRect.getWidth(), aRect.getHeight() );
 }
 
-//-----------------------------------------------------------------------------
-
-sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isShowing() throw( RuntimeException )
-{
-    return sal_True;
-}
-
-//-----------------------------------------------------------------------------
-
-sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isVisible() throw( RuntimeException )
-{
-    return sal_True;
-}
-
-//-----------------------------------------------------------------------------
-
-sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isFocusTraversable() throw( RuntimeException )
-{
-    return sal_True;
-}
 
 //=====  XAccessibleContext  ==================================================
 
@@ -617,6 +597,28 @@ Any SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleKeyBinding() throw( Run
     return Any();
 }
 
+
+
+
+
+sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
+    return static_cast<sal_Int32>(nColor);
+}
+
+
+
+
+sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void)
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
+    return static_cast<sal_Int32>(nColor);
+}
+
+
 //=====  XServiceInfo  ========================================================
 
 OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException )
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 0643c0f4c820..04b1258ca878 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GraphCtlAccessibleContext.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: af $ $Date: 2002-09-12 09:43:17 $
+ *  last change: $Author: af $ $Date: 2002-10-23 09:44:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -196,14 +196,18 @@ public:
     virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isShowing() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isFocusTraversable() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException);
 
+    virtual sal_Int32 SAL_CALL getForeground (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getBackground (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+
     //=====  XAccessibleContext  ==============================================
 
     virtual long SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException);