slidecopy: merge CWS wth MWS-m76

2 files changed, 36 insertions, 8 deletions

diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 50d3ac682377..7279b5e2ff60 100644..100755
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -29,18 +29,12 @@
 #include "precompiled_accessibility.hxx"
 #include <accessibility/helper/acc_factory.hxx>
 
-#ifndef _TOOLKIT_AWT_VCLXWINDOWS_HXX
 #include <toolkit/awt/vclxwindows.hxx>
-#endif
 #include <accessibility/standard/vclxaccessiblebutton.hxx>
 #include <accessibility/standard/vclxaccessiblecheckbox.hxx>
-#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWCOMBOBOX_HXX
 #include <accessibility/standard/vclxaccessibledropdowncombobox.hxx>
-#endif
 #include <accessibility/standard/vclxaccessiblecombobox.hxx>
-#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWLISTBOX_HXX
 #include <accessibility/standard/vclxaccessibledropdownlistbox.hxx>
-#endif
 #include <accessibility/standard/vclxaccessibleedit.hxx>
 #include <accessibility/standard/vclxaccessiblefixedhyperlink.hxx>
 #include <accessibility/standard/vclxaccessiblefixedtext.hxx>
@@ -67,13 +61,17 @@
 #include <accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx>
 #include <accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx>
 #include <accessibility/extended/accessibleeditbrowseboxcell.hxx>
+#include <accessibility/extended/AccessibleToolPanelDeck.hxx>
+#include <accessibility/extended/AccessibleToolPanelDeckTabBar.hxx>
+#include <accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <accessibility/extended/AccessibleGridControl.hxx>
 #include <svtools/accessibletable.hxx>
-#include "vcl/popupmenuwindow.hxx"
+#include <vcl/popupmenuwindow.hxx>
+#include <cppuhelper/implbase1.hxx>
 
-#include <floatingwindowaccessible.hxx>
+#include "floatingwindowaccessible.hxx"
 
 //........................................................................
 namespace accessibility
@@ -227,6 +225,18 @@ inline bool hasFloatingChild(Window *pWindow)
                 sal_uInt16 _nColPos
             ) const;
 
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleToolPanelDeck(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+                ::svt::ToolPanelDeck& i_rPanelDeck
+            );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleToolPanelTabBar(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+                ::svt::IToolPanelDeck& i_rPanelDeck,
+                ::svt::PanelTabBar& i_rTabBar
+            );
+
     protected:
         virtual ~AccessibleFactory();
     };
@@ -508,6 +518,20 @@ inline bool hasFloatingChild(Window *pWindow)
             _rxFocusWindow, _rBrowseBox, _nRowPos, _nColPos );
     }
 
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelDeck(
+            const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck )
+    {
+        return new AccessibleToolPanelDeck( i_rAccessibleParent, i_rPanelDeck );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabBar(
+        const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
+    {
+        return new AccessibleToolPanelTabBar( i_rAccessibleParent, i_rPanelDeck, i_rTabBar );
+    }
+
 //........................................................................
 }   // namespace accessibility
 //........................................................................
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src
index 4df1391f3c1d..ee7f77f9b502 100644
--- a/accessibility/source/helper/accessiblestrings.src
+++ b/accessibility/source/helper/accessiblestrings.src
@@ -70,3 +70,7 @@ String RID_STR_ACC_NAME_BROWSEBUTTON
     Text [ en-US ] = "Browse";
 };
 
+String RID_STR_ACC_DESC_PANELDECL_TABBAR
+{
+    Text [ en-US ] = "Panel Deck Tab Bar";
+};