From 6d7c82a57377a6d8c13e3c990466232cbec7e4f9 Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.versini@gmail.com>
Date: Sun, 25 Feb 2018 12:25:18 +0100
Subject: accessibility : remove useless Impl pattern

Change-Id: I6a3744b742db12ded79d273d49b041c578eccab6
Reviewed-on: https://gerrit.libreoffice.org/50302
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 accessibility/inc/extended/AccessibleBrowseBox.hxx   | 15 ++++++++++++---
 accessibility/inc/extended/AccessibleGridControl.hxx | 18 +++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'accessibility/inc')

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index ea96ca44be00..2f6c60f64f57 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -29,7 +29,7 @@
 
 namespace accessibility {
 
-    class AccessibleBrowseBoxImpl;
+    class AccessibleBrowseBoxHeaderBar;
     class AccessibleBrowseBoxTable;
 
 
@@ -174,8 +174,17 @@ protected:
     virtual AccessibleBrowseBoxTable*   createAccessibleTable();
 
 private:
-    // members
-    std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl;
+    /// the css::accessibility::XAccessible which created the AccessibleBrowseBox
+    css::uno::WeakReference< css::accessibility::XAccessible >  m_aCreator;
+
+    /** The data table child. */
+    rtl::Reference<AccessibleBrowseBoxTable>                    mxTable;
+
+    /** The header bar for rows ("handle column"). */
+    rtl::Reference<AccessibleBrowseBoxHeaderBar>                mxRowHeaderBar;
+
+    /** The header bar for columns (first row of the table). */
+    rtl::Reference<AccessibleBrowseBoxHeaderBar>                mxColumnHeaderBar;
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index d4cf435590a8..3cd2a4d102fc 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -29,7 +29,7 @@
 
 namespace accessibility {
 
-    class AccessibleGridControl_Impl;
+    class AccessibleGridControlHeader;
 
 
 /** This class represents the complete accessible Grid Control object. */
@@ -138,8 +138,20 @@ private:
         @return  An AccessibleGridControlTable. */
     AccessibleGridControlTable* createAccessibleTable();
 
-    // members ----------------------------------------------------------------
-    std::unique_ptr< AccessibleGridControl_Impl > m_xImpl;
+    /// the css::accessibility::XAccessible which created the AccessibleGridControl
+    css::uno::WeakReference< css::accessibility::XAccessible >                    m_aCreator;
+
+    /** The data table child. */
+    rtl::Reference<AccessibleGridControlTable>                m_xTable;
+
+    /** The header bar for rows. */
+    rtl::Reference<AccessibleGridControlHeader>               m_xRowHeaderBar;
+
+    /** The header bar for columns (first row of the table). */
+    rtl::Reference<AccessibleGridControlHeader>               m_xColumnHeaderBar;
+
+    /** The table cell child. */
+    rtl::Reference<AccessibleGridControlTableCell>            m_xCell;
 };
 
 
-- 
cgit