renaissance1: merge with DEV300_m84

6 files changed, 10 insertions, 129 deletions

diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index e35eefbe3d10..510f0233667c 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -257,25 +257,21 @@ Reference<XAccessibleStateSet> SAL_CALL
 
     if (mxParent.is())
     {
-        // SELECTABLE
+        // Unconditional states.
         pStateSet->AddState(AccessibleStateType::SELECTABLE);
+        pStateSet->AddState(AccessibleStateType::FOCUSABLE);
+        pStateSet->AddState(AccessibleStateType::ENABLED);
+        pStateSet->AddState(AccessibleStateType::VISIBLE);
+        pStateSet->AddState(AccessibleStateType::SHOWING);
+        pStateSet->AddState(AccessibleStateType::ACTIVE);
+        pStateSet->AddState(AccessibleStateType::SENSITIVE);
 
-        // SELECTED
+        // Conditional states.
         if (mrSlideSorter.GetController().GetPageSelector().IsPageSelected(mnPageNumber))
             pStateSet->AddState(AccessibleStateType::SELECTED);
-
-        // FOCUSABLE
-        pStateSet->AddState(AccessibleStateType::FOCUSABLE);
-
-        // FOCUSED
         if (mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex() == mnPageNumber)
             if (mrSlideSorter.GetController().GetFocusManager().IsFocusShowing())
                 pStateSet->AddState(AccessibleStateType::FOCUSED);
-
-        pStateSet->AddState(AccessibleStateType::ENABLED);
-        pStateSet->AddState(AccessibleStateType::VISIBLE);
-        pStateSet->AddState(AccessibleStateType::SHOWING);
-        pStateSet->AddState(AccessibleStateType::ACTIVE);
     }
 
     return pStateSet;
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 5cf595fced13..91c09b55697d 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -65,7 +65,7 @@ namespace accessibility {
 /** Inner implementation class of the AccessibleSlideSorterView.
 
     Note that some event broadcasting is done asynchronously because
-    otherwise it could lead to deadlocks on (at lease) some Solaris
+    otherwise it could lead to deadlocks on (at least) some Solaris
     machines.  Probably (but unverified) this can happen on all GTK based
     systems.  The asynchronous broadcasting is just a workaround for a
     poorly understood problem.
diff --git a/sd/source/ui/accessibility/AccessibleTaskPane.cxx b/sd/source/ui/accessibility/AccessibleTaskPane.cxx
deleted file mode 100644
index c2a2dafef296..000000000000
--- a/sd/source/ui/accessibility/AccessibleTaskPane.cxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "AccessibleTaskPane.hxx"
-
-#include "AccessibleTreeNode.hxx"
-
-#include "taskpane/ToolPanel.hxx"
-#include "taskpane/ControlContainer.hxx"
-#include "taskpane/TitledControl.hxx"
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-
-#include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::uno;
-
-namespace accessibility {
-
-AccessibleTaskPane::AccessibleTaskPane (
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible> & rxParent,
-    const OUString& rsName,
-    const OUString& rsDescription,
-    ::sd::toolpanel::ToolPanel& rTaskPane)
-    : AccessibleTreeNode(
-        rxParent,
-        rTaskPane,
-        rsName,
-        rsDescription,
-        AccessibleRole::PANEL)
-{
-}
-
-
-
-
-AccessibleTaskPane::~AccessibleTaskPane (void)
-{
-}
-
-
-
-
-//=====  XServiceInfo  ========================================================
-
-OUString SAL_CALL
-    AccessibleTaskPane::getImplementationName (void)
-    throw (RuntimeException)
-{
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTaskPane"));
-}
-
-
-
-
-void AccessibleTaskPane::UpdateStateSet (void)
-{
-    // The task pane itself can not be focused.
-    UpdateState(AccessibleStateType::FOCUSED, false);
-}
-
-
-} // end of namespace accessibility
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index ad8d8facf9da..5c7462581d0b 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -714,6 +714,7 @@ IMPL_LINK(AccessibleTreeNode, WindowEventListener, VclWindowEvent*, pEvent)
         case VCLEVENT_WINDOW_GETFOCUS:
         case VCLEVENT_WINDOW_LOSEFOCUS:
             UpdateStateSet();
+            break;
     }
     return 1;
 }
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 70734ac23198..de5342afd23f 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -44,18 +44,6 @@ namespace accessibility {
     May change in the future.
 */
 
-AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, USHORT nWindowId)
-    : mpView (pView),
-      mnWindowId (nWindowId),
-      mrDevice (pView->GetPaintWindow((sal_uInt32)nWindowId)->GetOutputDevice())
-{
-    OSL_ASSERT (mpView != NULL);
-    // empty
-}
-
-
-
-
 AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice)
     : mpView (pView),
       mnWindowId (0),
@@ -86,15 +74,6 @@ AccessibleViewForwarder::~AccessibleViewForwarder (void)
 
 
 
-void AccessibleViewForwarder::SetView (SdrPaintView* pView)
-{
-    mpView = pView;
-    OSL_ASSERT (mpView != NULL);
-}
-
-
-
-
 sal_Bool AccessibleViewForwarder::IsValid (void) const
 {
     return sal_True;
diff --git a/sd/source/ui/accessibility/makefile.mk b/sd/source/ui/accessibility/makefile.mk
index d5eb47b06149..25d79aa7f8da 100755
--- a/sd/source/ui/accessibility/makefile.mk
+++ b/sd/source/ui/accessibility/makefile.mk
@@ -56,7 +56,6 @@ SLOFILES =      									\
     $(SLO)$/AccessibleScrollPanel.obj				\
     $(SLO)$/AccessibleSlideSorterView.obj			\
     $(SLO)$/AccessibleSlideSorterObject.obj			\
-    $(SLO)$/AccessibleTaskPane.obj					\
     $(SLO)$/AccessibleTreeNode.obj					\
     $(SLO)$/SdShapeTypes.obj