boost::foo_ptr->std::foo_ptr

Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a

11 files changed, 169 insertions, 173 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 74a96adba625..faef86e00e6b 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -22,11 +22,9 @@
 #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
 
 #include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <svtools/accessibletableprovider.hxx>
-
-
+#include <memory>
 
 namespace accessibility {
 
@@ -185,7 +183,7 @@ protected:
 
 private:
     // members ----------------------------------------------------------------
-    boost::scoped_ptr< AccessibleBrowseBoxImpl > m_pImpl;
+    std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl;
 };
 
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 8d174d62190e..db50af9ee0a5 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -22,11 +22,9 @@
 
 #include <accessibility/extended/AccessibleGridControlBase.hxx>
 #include <accessibility/extended/AccessibleGridControlTable.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <svtools/accessibletable.hxx>
-
-
+#include <memory>
 
 namespace accessibility {
 
@@ -173,7 +171,7 @@ protected:
 
 private:
     // members ----------------------------------------------------------------
-    boost::scoped_ptr< AccessibleGridControl_Impl > m_pImpl;
+    std::unique_ptr< AccessibleGridControl_Impl > m_xImpl;
 };
 
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index b627e9e8ad74..8c7df5fd6464 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace svt
 {
@@ -71,7 +71,7 @@ namespace accessibility
         virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) SAL_OVERRIDE;
 
     private:
-        ::boost::scoped_ptr< AccessibleToolPanelDeck_Impl > m_pImpl;
+        std::unique_ptr< AccessibleToolPanelDeck_Impl > m_xImpl;
     };
 
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
index 5ea31e7cd741..a1e74e01fcf6 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace svt
 {
@@ -72,7 +72,7 @@ namespace accessibility
         virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) SAL_OVERRIDE;
 
     private:
-        ::boost::scoped_ptr< AccessibleToolPanelTabBar_Impl > m_pImpl;
+        std::unique_ptr< AccessibleToolPanelTabBar_Impl > m_xImpl;
     };
 
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index 01749067ec0a..9124c701f380 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -23,7 +23,7 @@
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace svt
 {
@@ -87,7 +87,7 @@ namespace accessibility
         virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     protected:
-        ::boost::scoped_ptr< AccessibleToolPanelDeckTabBarItem_Impl >   m_pImpl;
+        std::unique_ptr< AccessibleToolPanelDeckTabBarItem_Impl >   m_xImpl;
     };
 
 
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 05c87f08f1df..a24e8c94af77 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -53,7 +53,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <queue>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <unordered_map>
 
 class TextEngine;
@@ -655,7 +655,7 @@ private:
 
     // All the following members have valid values only after calling init:
 
-    boost::scoped_ptr< Paragraphs > m_xParagraphs;
+    std::unique_ptr< Paragraphs > m_xParagraphs;
 
     // m_nViewOffset is from the start of the document (0) to the start of the
     // current view, and m_nViewHeight is the height of the view:
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index fbb8a02c57ed..03a5d342d2c5 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -67,8 +67,8 @@ AccessibleBrowseBox::AccessibleBrowseBox(
             IAccessibleTableProvider& _rBrowseBox )
     : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,NULL, BBTYPE_BROWSEBOX )
 {
-    m_pImpl.reset( new AccessibleBrowseBoxImpl() );
-    m_pImpl->m_aCreator = _rxCreator;
+    m_xImpl.reset( new AccessibleBrowseBoxImpl() );
+    m_xImpl->m_aCreator = _rxCreator;
 
     m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance());
 }
@@ -76,10 +76,10 @@ AccessibleBrowseBox::AccessibleBrowseBox(
 void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator )
 {
 #if OSL_DEBUG_LEVEL > 0
-    Reference< XAccessible > xCreator(m_pImpl->m_aCreator);
+    Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
     OSL_ENSURE( !xCreator.is(), "accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!" );
 #endif
-    m_pImpl->m_aCreator = _rxCreator;
+    m_xImpl->m_aCreator = _rxCreator;
 }
 
 
@@ -92,22 +92,22 @@ void SAL_CALL AccessibleBrowseBox::disposing()
 {
     ::osl::MutexGuard aGuard( getOslMutex() );
 
-    m_pImpl->m_pTable           = NULL;
-    m_pImpl->m_pColumnHeaderBar = NULL;
-    m_pImpl->m_pRowHeaderBar    = NULL;
-    m_pImpl->m_aCreator.clear();
+    m_xImpl->m_pTable           = NULL;
+    m_xImpl->m_pColumnHeaderBar = NULL;
+    m_xImpl->m_pRowHeaderBar    = NULL;
+    m_xImpl->m_aCreator.clear();
 
-    Reference< XAccessible >  xTable = m_pImpl->mxTable;
+    Reference< XAccessible >  xTable = m_xImpl->mxTable;
 
-    Reference< XComponent > xComp( m_pImpl->mxTable, UNO_QUERY );
+    Reference< XComponent > xComp( m_xImpl->mxTable, UNO_QUERY );
     if ( xComp.is() )
     {
         xComp->dispose();
 
     }
-//!    ::comphelper::disposeComponent(m_pImpl->mxTable);
-    ::comphelper::disposeComponent(m_pImpl->mxRowHeaderBar);
-    ::comphelper::disposeComponent(m_pImpl->mxColumnHeaderBar);
+//!    ::comphelper::disposeComponent(m_xImpl->mxTable);
+    ::comphelper::disposeComponent(m_xImpl->mxRowHeaderBar);
+    ::comphelper::disposeComponent(m_xImpl->mxColumnHeaderBar);
 
     AccessibleBrowseBoxBase::disposing();
 }
@@ -224,13 +224,13 @@ Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
 
 Reference< XAccessible > AccessibleBrowseBox::implGetTable()
 {
-    if( !m_pImpl->mxTable.is() )
+    if( !m_xImpl->mxTable.is() )
     {
-        m_pImpl->m_pTable = createAccessibleTable();
-        m_pImpl->mxTable  = m_pImpl->m_pTable;
+        m_xImpl->m_pTable = createAccessibleTable();
+        m_xImpl->mxTable  = m_xImpl->m_pTable;
 
     }
-    return m_pImpl->mxTable;
+    return m_xImpl->mxTable;
 }
 
 
@@ -241,21 +241,21 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
     Reference< XAccessible >* pxMember = NULL;
 
     if( eObjType == BBTYPE_ROWHEADERBAR )
-        pxMember = &m_pImpl->mxRowHeaderBar;
+        pxMember = &m_xImpl->mxRowHeaderBar;
     else if( eObjType ==  BBTYPE_COLUMNHEADERBAR )
-        pxMember = &m_pImpl->mxColumnHeaderBar;
+        pxMember = &m_xImpl->mxColumnHeaderBar;
 
     if( pxMember )
     {
         if( !pxMember->is() )
         {
             AccessibleBrowseBoxHeaderBar* pHeaderBar = new AccessibleBrowseBoxHeaderBar(
-                m_pImpl->m_aCreator, *mpBrowseBox, eObjType );
+                m_xImpl->m_aCreator, *mpBrowseBox, eObjType );
 
             if ( BBTYPE_COLUMNHEADERBAR == eObjType)
-                m_pImpl->m_pColumnHeaderBar = pHeaderBar;
+                m_xImpl->m_pColumnHeaderBar = pHeaderBar;
             else
-                m_pImpl->m_pRowHeaderBar    = pHeaderBar;
+                m_xImpl->m_pRowHeaderBar    = pHeaderBar;
 
             *pxMember = pHeaderBar;
         }
@@ -286,16 +286,16 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
 
 AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable()
 {
-    Reference< XAccessible > xCreator(m_pImpl->m_aCreator);
+    Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
     OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" );
     return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
 }
 
 void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue)
 {
-    if ( m_pImpl->mxTable.is() )
+    if ( m_xImpl->mxTable.is() )
     {
-        m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+        m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
     }
 }
 
@@ -303,8 +303,8 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId,
                                                 const Any& _rNewValue,
                                                 const Any& _rOldValue,bool _bColumnHeaderBar)
 {
-    Reference< XAccessible > xHeaderBar = _bColumnHeaderBar ? m_pImpl->mxColumnHeaderBar : m_pImpl->mxRowHeaderBar;
-    AccessibleBrowseBoxHeaderBar* pHeaderBar = _bColumnHeaderBar ? m_pImpl->m_pColumnHeaderBar : m_pImpl->m_pRowHeaderBar;
+    Reference< XAccessible > xHeaderBar = _bColumnHeaderBar ? m_xImpl->mxColumnHeaderBar : m_xImpl->mxRowHeaderBar;
+    AccessibleBrowseBoxHeaderBar* pHeaderBar = _bColumnHeaderBar ? m_xImpl->m_pColumnHeaderBar : m_xImpl->m_pRowHeaderBar;
     if ( xHeaderBar.is() )
         pHeaderBar->commitEvent(_nEventId,_rNewValue,_rOldValue);
 }
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 1f927ad08b26..34ca1fba3c6f 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -75,8 +75,8 @@ AccessibleGridControl::AccessibleGridControl(
             IAccessibleTable& _rTable )
     : AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL )
 {
-    m_pImpl.reset( new AccessibleGridControl_Impl() );
-    m_pImpl->m_aCreator = _rxCreator;
+    m_xImpl.reset( new AccessibleGridControl_Impl() );
+    m_xImpl->m_aCreator = _rxCreator;
 }
 
 
@@ -89,29 +89,29 @@ void SAL_CALL AccessibleGridControl::disposing()
 {
     SolarMutexGuard g;
 
-    m_pImpl->m_pTable       = NULL;
-    m_pImpl->m_pColumnHeaderBar = NULL;
-    m_pImpl->m_pRowHeaderBar    = NULL;
-    m_pImpl->m_pCell            = NULL;
-    m_pImpl->m_aCreator.clear();
+    m_xImpl->m_pTable       = NULL;
+    m_xImpl->m_pColumnHeaderBar = NULL;
+    m_xImpl->m_pRowHeaderBar    = NULL;
+    m_xImpl->m_pCell            = NULL;
+    m_xImpl->m_aCreator.clear();
 
-    Reference< XAccessible >  xTable = m_pImpl->m_xTable;
+    Reference< XAccessible >  xTable = m_xImpl->m_xTable;
 
-    Reference< XComponent > xComp( m_pImpl->m_xTable, UNO_QUERY );
+    Reference< XComponent > xComp( m_xImpl->m_xTable, UNO_QUERY );
     if ( xComp.is() )
     {
         xComp->dispose();
     }
-    Reference< XAccessible >  xCell = m_pImpl->m_xCell;
+    Reference< XAccessible >  xCell = m_xImpl->m_xCell;
 
-    Reference< XComponent > xCellComp( m_pImpl->m_xCell, UNO_QUERY );
+    Reference< XComponent > xCellComp( m_xImpl->m_xCell, UNO_QUERY );
     if ( xCellComp.is() )
     {
         xCellComp->dispose();
     }
 
-    ::comphelper::disposeComponent(m_pImpl->m_xRowHeaderBar);
-    ::comphelper::disposeComponent(m_pImpl->m_xColumnHeaderBar);
+    ::comphelper::disposeComponent(m_xImpl->m_xRowHeaderBar);
+    ::comphelper::disposeComponent(m_xImpl->m_xColumnHeaderBar);
     AccessibleGridControlBase::disposing();
 }
 
@@ -141,31 +141,31 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
     {
         if(nChildIndex == 0 && m_aTable.HasColHeader())
         {
-            if(!m_pImpl->m_xColumnHeaderBar.is())
+            if(!m_xImpl->m_xColumnHeaderBar.is())
             {
-                AccessibleGridControlHeader* pColHeaderBar = new AccessibleGridControlHeader(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_COLUMNHEADERBAR);
-                m_pImpl->m_xColumnHeaderBar = pColHeaderBar;
+                AccessibleGridControlHeader* pColHeaderBar = new AccessibleGridControlHeader(m_xImpl->m_aCreator, m_aTable, svt::table::TCTYPE_COLUMNHEADERBAR);
+                m_xImpl->m_xColumnHeaderBar = pColHeaderBar;
             }
-            xChild = m_pImpl->m_xColumnHeaderBar;
+            xChild = m_xImpl->m_xColumnHeaderBar;
         }
         else if(m_aTable.HasRowHeader() && (nChildIndex == 1 || nChildIndex == 0))
         {
-            if(!m_pImpl->m_xRowHeaderBar.is())
+            if(!m_xImpl->m_xRowHeaderBar.is())
             {
-                AccessibleGridControlHeader* pRowHeaderBar = new AccessibleGridControlHeader(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_ROWHEADERBAR);
-                m_pImpl->m_xRowHeaderBar = pRowHeaderBar;
+                AccessibleGridControlHeader* pRowHeaderBar = new AccessibleGridControlHeader(m_xImpl->m_aCreator, m_aTable, svt::table::TCTYPE_ROWHEADERBAR);
+                m_xImpl->m_xRowHeaderBar = pRowHeaderBar;
             }
-            xChild = m_pImpl->m_xRowHeaderBar;
+            xChild = m_xImpl->m_xRowHeaderBar;
         }
         else
         {
-            if(!m_pImpl->m_xTable.is())
+            if(!m_xImpl->m_xTable.is())
             {
-            AccessibleGridControlTable* pTable = new AccessibleGridControlTable(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_TABLE);
-            m_pImpl->m_xTable = pTable;
-                m_pImpl->m_pTable = pTable;
+            AccessibleGridControlTable* pTable = new AccessibleGridControlTable(m_xImpl->m_aCreator, m_aTable, svt::table::TCTYPE_TABLE);
+            m_xImpl->m_xTable = pTable;
+                m_xImpl->m_pTable = pTable;
             }
-            xChild = m_pImpl->m_xTable;
+            xChild = m_xImpl->m_xTable;
         }
     }
     return xChild;
@@ -250,12 +250,12 @@ Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
 
 Reference< XAccessible > AccessibleGridControl::implGetTable()
 {
-    if( !m_pImpl->m_xTable.is() )
+    if( !m_xImpl->m_xTable.is() )
     {
-        m_pImpl->m_pTable = createAccessibleTable();
-        m_pImpl->m_xTable  = m_pImpl->m_pTable;
+        m_xImpl->m_pTable = createAccessibleTable();
+        m_xImpl->m_xTable  = m_xImpl->m_pTable;
     }
-    return m_pImpl->m_xTable;
+    return m_xImpl->m_xTable;
 }
 
 
@@ -266,21 +266,21 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType
     Reference< XAccessible >* pxMember = NULL;
 
     if( eObjType == TCTYPE_ROWHEADERBAR )
-        pxMember = &m_pImpl->m_xRowHeaderBar;
+        pxMember = &m_xImpl->m_xRowHeaderBar;
     else if( eObjType ==  TCTYPE_COLUMNHEADERBAR )
-        pxMember = &m_pImpl->m_xColumnHeaderBar;
+        pxMember = &m_xImpl->m_xColumnHeaderBar;
 
     if( pxMember )
     {
         if( !pxMember->is() )
         {
             AccessibleGridControlHeader* pHeaderBar = new AccessibleGridControlHeader(
-                m_pImpl->m_aCreator, m_aTable, eObjType );
+                m_xImpl->m_aCreator, m_aTable, eObjType );
 
             if ( TCTYPE_COLUMNHEADERBAR == eObjType)
-                m_pImpl->m_pColumnHeaderBar = pHeaderBar;
+                m_xImpl->m_pColumnHeaderBar = pHeaderBar;
             else
-                m_pImpl->m_pRowHeaderBar    = pHeaderBar;
+                m_xImpl->m_pRowHeaderBar    = pHeaderBar;
 
             *pxMember = pHeaderBar;
         }
@@ -310,7 +310,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
 
 AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
 {
-    Reference< XAccessible > xCreator(m_pImpl->m_aCreator);
+    Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
     OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGirdControl::createAccessibleTable: my creator died - how this?" );
     return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
 }
@@ -324,35 +324,35 @@ void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNew
         {
             Reference< XAccessible > xAccessible = getAccessibleChild(i);
             com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > xAccessibleChild = xAccessible->getAccessibleContext();
-            if(m_pImpl->m_xTable == xAccessible)
+            if(m_xImpl->m_xTable == xAccessible)
             {
                 std::vector< AccessibleGridControlTableCell* >& rCells =
-                    m_pImpl->m_pTable->getCellVector();
+                    m_xImpl->m_pTable->getCellVector();
                 size_t nIndex = m_aTable.GetCurrentRow() * m_aTable.GetColumnCount()
                               + m_aTable.GetCurrentColumn();
                 if (nIndex < rCells.size() && rCells[nIndex])
                 {
-                    m_pImpl->m_pCell = rCells[nIndex];
-                    m_pImpl->m_pCell->commitEvent( _nEventId, _rNewValue, _rOldValue );
+                    m_xImpl->m_pCell = rCells[nIndex];
+                    m_xImpl->m_pCell->commitEvent( _nEventId, _rNewValue, _rOldValue );
                 }
             }
         }
     }
     else
     {
-        if ( m_pImpl->m_xTable.is() )
-            m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+        if ( m_xImpl->m_xTable.is() )
+            m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
     }
 }
 
 void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue)
 {
-    if ( m_pImpl->m_xTable.is() )
+    if ( m_xImpl->m_xTable.is() )
     {
         if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED)
         {
-            Reference< XAccessible > xChild = m_pImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn());
-            m_pImpl->m_pTable->commitEvent(_nEventId, makeAny(xChild),_rOldValue);
+            Reference< XAccessible > xChild = m_xImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn());
+            m_xImpl->m_pTable->commitEvent(_nEventId, makeAny(xChild),_rOldValue);
         }
         else if(_nEventId == AccessibleEventId::TABLE_MODEL_CHANGED)
         {
@@ -362,33 +362,33 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe
                 if(aChange.Type == AccessibleTableModelChangeType::DELETE)
                 {
                     std::vector< AccessibleGridControlTableCell* >& rCells =
-                        m_pImpl->m_pTable->getCellVector();
+                        m_xImpl->m_pTable->getCellVector();
                     std::vector< Reference< XAccessible > >& rAccCells =
-                        m_pImpl->m_pTable->getAccessibleCellVector();
+                        m_xImpl->m_pTable->getAccessibleCellVector();
                     int nColCount = m_aTable.GetColumnCount();
                     // check valid index - entries are inserted lazily
                     size_t const nStart = nColCount * aChange.FirstRow;
                     size_t const nEnd   = nColCount * aChange.LastRow;
                     if (nStart < rCells.size())
                     {
-                        m_pImpl->m_pTable->getCellVector().erase(
+                        m_xImpl->m_pTable->getCellVector().erase(
                             rCells.begin() + nStart,
                             rCells.begin() + std::min(rCells.size(), nEnd));
                     }
                     if (nStart < rAccCells.size())
                     {
-                        m_pImpl->m_pTable->getAccessibleCellVector().erase(
+                        m_xImpl->m_pTable->getAccessibleCellVector().erase(
                             rAccCells.begin() + nStart,
                             rAccCells.begin() + std::min(rAccCells.size(), nEnd));
                     }
-                    m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+                    m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
                 }
                 else
-                    m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+                    m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
             }
         }
         else
-            m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+            m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
     }
 }
 
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index 78e093d21a88..dfb8ede26120 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -229,7 +229,7 @@ namespace accessibility
     AccessibleToolPanelDeck::AccessibleToolPanelDeck( const Reference< XAccessible >& i_rAccessibleParent,
             ::svt::ToolPanelDeck& i_rPanelDeck )
         :AccessibleToolPanelDeck_Base( i_rPanelDeck.GetWindowPeer() )
-        ,m_pImpl( new AccessibleToolPanelDeck_Impl( *this, i_rAccessibleParent, i_rPanelDeck ) )
+        ,m_xImpl( new AccessibleToolPanelDeck_Impl( *this, i_rAccessibleParent, i_rPanelDeck ) )
     {
     }
 
@@ -239,11 +239,11 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleToolPanelDeck::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
 
-        sal_Int32 nChildCount( m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
+        sal_Int32 nChildCount( m_xImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
 
-        ::boost::optional< size_t > aActivePanel( m_pImpl->m_pPanelDeck->GetActivePanel() );
+        ::boost::optional< size_t > aActivePanel( m_xImpl->m_pPanelDeck->GetActivePanel() );
         if ( !!aActivePanel )
             return ++nChildCount;
 
@@ -252,62 +252,62 @@ namespace accessibility
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
 
         const sal_Int32 nChildCount( getAccessibleChildCount() );
         if ( ( i_nIndex < 0 ) || ( i_nIndex >= nChildCount ) )
             throw IndexOutOfBoundsException( OUString(), *this );
 
         // first "n" children are provided by the layouter
-        const size_t nLayouterCount( m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
+        const size_t nLayouterCount( m_xImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
         if ( size_t( i_nIndex ) < nLayouterCount )
-            return m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChild(
+            return m_xImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChild(
                 size_t( i_nIndex ),
-                m_pImpl->getOwnAccessible()
+                m_xImpl->getOwnAccessible()
             );
 
         // the last child is the XAccessible of the active panel
-        return m_pImpl->getActivePanelAccessible();
+        return m_xImpl->getActivePanelAccessible();
     }
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleParent(  ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
         const Reference< XAccessible > xParent = implGetForeignControlledParent();
         if ( xParent.is() )
             return xParent;
-        return m_pImpl->m_xAccessibleParent;
+        return m_xImpl->m_xAccessibleParent;
     }
 
     sal_Int16 SAL_CALL AccessibleToolPanelDeck::getAccessibleRole(  ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
         return AccessibleRole::PANEL;
     }
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
 
         const ::Point aRequestedPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
         // check the panel window itself
-        const vcl::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() );
+        const vcl::Window& rActivePanelAnchor( m_xImpl->m_pPanelDeck->GetPanelWindowAnchor() );
         const Rectangle aPanelAnchorArea( rActivePanelAnchor.GetPosPixel(), rActivePanelAnchor.GetOutputSizePixel() );
         if ( aPanelAnchorArea.IsInside( aRequestedPoint ) )
             // note that this assumes that the Window which actually implements the concrete panel covers
             // the complete area of its "anchor" Window. But this is ensured by the ToolPanelDeck implementation.
-            return m_pImpl->getActivePanelAccessible();
+            return m_xImpl->getActivePanelAccessible();
 
         // check the XAccessible instances provided by the layouter
         try
         {
-            const ::svt::PDeckLayouter pLayouter( m_pImpl->m_pPanelDeck->GetLayouter() );
+            const ::svt::PDeckLayouter pLayouter( m_xImpl->m_pPanelDeck->GetLayouter() );
             ENSURE_OR_THROW( pLayouter.get() != NULL, "invalid layouter" );
 
             const size_t nLayouterChildren = pLayouter->GetAccessibleChildCount();
             for ( size_t i=0; i<nLayouterChildren; ++i )
             {
-                const Reference< XAccessible > xLayoutItemAccessible( pLayouter->GetAccessibleChild( i, m_pImpl->getOwnAccessible() ), UNO_SET_THROW );
+                const Reference< XAccessible > xLayoutItemAccessible( pLayouter->GetAccessibleChild( i, m_xImpl->getOwnAccessible() ), UNO_SET_THROW );
                 const Reference< XAccessibleComponent > xLayoutItemComponent( xLayoutItemAccessible->getAccessibleContext(), UNO_QUERY_THROW );
                 const ::Rectangle aLayoutItemBounds( VCLUnoHelper::ConvertToVCLRect( xLayoutItemComponent->getBounds() ) );
                 if ( aLayoutItemBounds.IsInside( aRequestedPoint ) )
@@ -324,14 +324,14 @@ namespace accessibility
 
     void SAL_CALL AccessibleToolPanelDeck::grabFocus(  ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
-        m_pImpl->m_pPanelDeck->GrabFocus();
+        MethodGuard aGuard( *m_xImpl );
+        m_xImpl->m_pPanelDeck->GrabFocus();
     }
 
     void SAL_CALL AccessibleToolPanelDeck::disposing()
     {
         AccessibleToolPanelDeck_Base::disposing();
-        m_pImpl->dispose();
+        m_xImpl->dispose();
     }
 
     Reference< XAccessible > AccessibleToolPanelDeck::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
@@ -345,7 +345,7 @@ namespace accessibility
     void AccessibleToolPanelDeck::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
     {
         AccessibleToolPanelDeck_Base::FillAccessibleStateSet( i_rStateSet );
-        if ( m_pImpl->isDisposed() )
+        if ( m_xImpl->isDisposed() )
         {
             i_rStateSet.AddState( AccessibleStateType::DEFUNC );
         }
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 855419267baa..757c45257c6e 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -276,7 +276,7 @@ namespace accessibility
     AccessibleToolPanelTabBar::AccessibleToolPanelTabBar( const Reference< XAccessible >& i_rAccessibleParent,
             ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
         :AccessibleToolPanelTabBar_Base( i_rTabBar.GetWindowPeer() )
-        ,m_pImpl( new AccessibleToolPanelTabBar_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar ) )
+        ,m_xImpl( new AccessibleToolPanelTabBar_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar ) )
     {
     }
 
@@ -286,22 +286,22 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleToolPanelTabBar::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
 
-        const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
-        const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+        const bool bHasScrollBack = m_xImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+        const bool bHasScrollForward = m_xImpl->getTabBar()->GetScrollButton( true ).IsVisible();
 
-        return  m_pImpl->getPanelDeck()->GetPanelCount()
+        return  m_xImpl->getPanelDeck()->GetPanelCount()
             +   ( bHasScrollBack ? 1 : 0 )
             +   ( bHasScrollForward ? 1 : 0 );
     }
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
 
-        const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
-        const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+        const bool bHasScrollBack = m_xImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+        const bool bHasScrollForward = m_xImpl->getTabBar()->GetScrollButton( true ).IsVisible();
 
         const bool bScrollBackRequested = ( bHasScrollBack && ( i_nIndex == 0 ) );
         const bool bScrollForwardRequested = ( bHasScrollForward && ( i_nIndex == getAccessibleChildCount() - 1 ) );
@@ -309,29 +309,29 @@ namespace accessibility
 
         if ( bScrollBackRequested || bScrollForwardRequested )
         {
-            Reference< XAccessible > xScrollButtonAccessible( m_pImpl->getTabBar()->GetScrollButton( bScrollForwardRequested ).GetAccessible() );
+            Reference< XAccessible > xScrollButtonAccessible( m_xImpl->getTabBar()->GetScrollButton( bScrollForwardRequested ).GetAccessible() );
             ENSURE_OR_RETURN( xScrollButtonAccessible.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible!", NULL );
         #if OSL_DEBUG_LEVEL > 0
             Reference< XAccessibleContext > xScrollButtonContext( xScrollButtonAccessible->getAccessibleContext() );
             ENSURE_OR_RETURN( xScrollButtonContext.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible context!", xScrollButtonAccessible );
-            OSL_ENSURE( xScrollButtonContext->getAccessibleParent() == m_pImpl->getOwnAccessible(),
+            OSL_ENSURE( xScrollButtonContext->getAccessibleParent() == m_xImpl->getOwnAccessible(),
                 "AccessibleToolPanelTabBar::getAccessibleChild: wrong parent at the button's accessible!" );
         #endif
             return xScrollButtonAccessible;
         }
 
-        return m_pImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) );
+        return m_xImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) );
     }
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleParent(  ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
-        return m_pImpl->getAccessibleParent();
+        MethodGuard aGuard( *m_xImpl );
+        return m_xImpl->getAccessibleParent();
     }
 
     sal_Int16 SAL_CALL AccessibleToolPanelTabBar::getAccessibleRole(  ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
         return AccessibleRole::PAGE_TAB_LIST;
     }
 
@@ -346,29 +346,29 @@ namespace accessibility
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception)
     {
-        MethodGuard aGuard( *m_pImpl );
+        MethodGuard aGuard( *m_xImpl );
 
         // check the tab items
         const UnoPoint aOwnScreenPos( getLocationOnScreen() );
         const ::Point aRequestedScreenPoint( i_rPoint.X + aOwnScreenPos.X, i_rPoint.Y + aOwnScreenPos.Y );
 
-        for ( size_t i=0; i<m_pImpl->getPanelDeck()->GetPanelCount(); ++i )
+        for ( size_t i=0; i<m_xImpl->getPanelDeck()->GetPanelCount(); ++i )
         {
-            const ::Rectangle aItemScreenRect( m_pImpl->getTabBar()->GetItemScreenRect(i) );
+            const ::Rectangle aItemScreenRect( m_xImpl->getTabBar()->GetItemScreenRect(i) );
             if ( aItemScreenRect.IsInside( aRequestedScreenPoint ) )
-                return m_pImpl->getAccessiblePanelItem(i);
+                return m_xImpl->getAccessiblePanelItem(i);
         }
 
         // check the scroll buttons
         const ::Point aRequestedClientPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
 
-        const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
-        if ( bHasScrollBack && lcl_covers( m_pImpl->getTabBar()->GetScrollButton( false ), aRequestedClientPoint ) )
-            return m_pImpl->getTabBar()->GetScrollButton( false ).GetAccessible();
+        const bool bHasScrollBack = m_xImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+        if ( bHasScrollBack && lcl_covers( m_xImpl->getTabBar()->GetScrollButton( false ), aRequestedClientPoint ) )
+            return m_xImpl->getTabBar()->GetScrollButton( false ).GetAccessible();
 
-        const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
-        if ( bHasScrollForward && lcl_covers( m_pImpl->getTabBar()->GetScrollButton( true ), aRequestedClientPoint ) )
-            return m_pImpl->getTabBar()->GetScrollButton( true ).GetAccessible();
+        const bool bHasScrollForward = m_xImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+        if ( bHasScrollForward && lcl_covers( m_xImpl->getTabBar()->GetScrollButton( true ), aRequestedClientPoint ) )
+            return m_xImpl->getTabBar()->GetScrollButton( true ).GetAccessible();
 
         // no hit
         return NULL;
@@ -377,7 +377,7 @@ namespace accessibility
     void SAL_CALL AccessibleToolPanelTabBar::disposing()
     {
         AccessibleToolPanelTabBar_Base::disposing();
-        m_pImpl->dispose();
+        m_xImpl->dispose();
     }
 
     Reference< XAccessible > AccessibleToolPanelTabBar::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
@@ -393,8 +393,8 @@ namespace accessibility
         AccessibleToolPanelTabBar_Base::FillAccessibleStateSet( i_rStateSet );
         i_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
 
-        ENSURE_OR_RETURN_VOID( !m_pImpl->isDisposed(), "AccessibleToolPanelTabBar::FillAccessibleStateSet: already disposed!" );
-        if ( m_pImpl->getTabBar()->IsVertical() )
+        ENSURE_OR_RETURN_VOID( !m_xImpl->isDisposed(), "AccessibleToolPanelTabBar::FillAccessibleStateSet: already disposed!" );
+        if ( m_xImpl->getTabBar()->IsVertical() )
             i_rStateSet.AddState( AccessibleStateType::VERTICAL );
         else
             i_rStateSet.AddState( AccessibleStateType::HORIZONTAL );
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index 0289189e31c6..33bca93ae759 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -238,7 +238,7 @@ namespace accessibility
             ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar, const size_t i_nItemPos )
         : ::comphelper::OAccessibleExtendedComponentHelper(
                 new VCLExternalSolarLock)
-        , m_pImpl(new AccessibleToolPanelDeckTabBarItem_Impl(*this,
+        , m_xImpl(new AccessibleToolPanelDeckTabBarItem_Impl(*this,
                 i_rAccessibleParent, i_rPanelDeck, i_rTabBar, i_nItemPos))
     {
     }
@@ -260,8 +260,8 @@ namespace accessibility
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        return m_pImpl->getAccessibleParent();
+        ItemMethodGuard aGuard( *m_xImpl );
+        return m_xImpl->getAccessibleParent();
     }
 
     sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole(  ) throw (RuntimeException, std::exception)
@@ -271,45 +271,45 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        return m_pImpl->getPanelDisplayName();
+        ItemMethodGuard aGuard( *m_xImpl );
+        return m_xImpl->getPanelDisplayName();
     }
 
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        return m_pImpl->getPanelDisplayName();
+        ItemMethodGuard aGuard( *m_xImpl );
+        return m_xImpl->getPanelDisplayName();
     }
 
     Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
+        ItemMethodGuard aGuard( *m_xImpl );
         ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
         return pRelationSet;
     }
 
     Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
+        ItemMethodGuard aGuard( *m_xImpl );
 
         ::utl::AccessibleStateSetHelper* pStateSet( new ::utl::AccessibleStateSetHelper );
         pStateSet->AddState( AccessibleStateType::FOCUSABLE );
         pStateSet->AddState( AccessibleStateType::SELECTABLE );
         pStateSet->AddState( AccessibleStateType::ICONIFIED );
 
-        if ( m_pImpl->getItemPos() == m_pImpl->getPanelDeck()->GetActivePanel() )
+        if ( m_xImpl->getItemPos() == m_xImpl->getPanelDeck()->GetActivePanel() )
         {
             pStateSet->AddState( AccessibleStateType::ACTIVE );
             pStateSet->AddState( AccessibleStateType::SELECTED );
         }
 
-        if ( m_pImpl->getItemPos() == m_pImpl->getTabBar()->GetFocusedPanelItem() )
+        if ( m_xImpl->getItemPos() == m_xImpl->getTabBar()->GetFocusedPanelItem() )
             pStateSet->AddState( AccessibleStateType::FOCUSED );
 
-        if ( m_pImpl->getTabBar()->IsEnabled() )
+        if ( m_xImpl->getTabBar()->IsEnabled() )
             pStateSet->AddState( AccessibleStateType::ENABLED );
 
-        if ( m_pImpl->getTabBar()->IsVisible() )
+        if ( m_xImpl->getTabBar()->IsVisible() )
         {
             pStateSet->AddState( AccessibleStateType::SHOWING );
             pStateSet->AddState( AccessibleStateType::VISIBLE );
@@ -320,7 +320,7 @@ namespace accessibility
 
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
+        ItemMethodGuard aGuard( *m_xImpl );
         // we do not have children ...
         (void)i_rLocation;
         return NULL;
@@ -328,28 +328,28 @@ namespace accessibility
 
     void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() );
+        ItemMethodGuard aGuard( *m_xImpl );
+        m_xImpl->getTabBar()->FocusPanelItem( m_xImpl->getItemPos() );
     }
 
     ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+        ItemMethodGuard aGuard( *m_xImpl );
+        Reference< XAccessibleComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_SET_THROW );
         return xParentComponent->getForeground();
     }
 
     ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+        ItemMethodGuard aGuard( *m_xImpl );
+        Reference< XAccessibleComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_SET_THROW );
         return xParentComponent->getBackground();
     }
 
     Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        Reference< XAccessibleExtendedComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_QUERY_THROW );
+        ItemMethodGuard aGuard( *m_xImpl );
+        Reference< XAccessibleExtendedComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_QUERY_THROW );
         // TODO: strictly, this is not correct: The TabBar implementation of the TabLayouter might use
         // a different font ...
         return xParentComponent->getFont();
@@ -357,24 +357,24 @@ namespace accessibility
 
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
+        ItemMethodGuard aGuard( *m_xImpl );
         // no support
         return OUString();
     }
 
     OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText(  ) throw (RuntimeException, std::exception)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        return m_pImpl->getPanelDisplayName();
+        ItemMethodGuard aGuard( *m_xImpl );
+        return m_xImpl->getPanelDisplayName();
     }
 
     UnoRectangle AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException)
     {
-        ItemMethodGuard aGuard( *m_pImpl );
+        ItemMethodGuard aGuard( *m_xImpl );
 
-        const ::Rectangle aItemScreenRect( m_pImpl->getTabBar()->GetItemScreenRect( m_pImpl->getItemPos() ) );
+        const ::Rectangle aItemScreenRect( m_xImpl->getTabBar()->GetItemScreenRect( m_xImpl->getItemPos() ) );
 
-        Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+        Reference< XAccessibleComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_SET_THROW );
         const UnoPoint aParentLocation( xParentComponent->getLocationOnScreen() );
         return UnoRectangle(
             aItemScreenRect.Left() - aParentLocation.X,
@@ -386,8 +386,8 @@ namespace accessibility
 
     void SAL_CALL AccessibleToolPanelDeckTabBarItem::disposing()
     {
-        ItemMethodGuard aGuard( *m_pImpl );
-        m_pImpl->dispose();
+        ItemMethodGuard aGuard( *m_xImpl );
+        m_xImpl->dispose();
     }
 } // namespace accessibility