sw/source/core/access/acccell.cxx | 31 +++++++++---------------------- sw/source/core/access/acccell.hxx | 6 +++--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4 +++- 3 files changed, 15 insertions(+), 26 deletions(-)
New commits: commit 577c82545201b0b736a21cd22b2bc9404e89ee44 Author: Andre Fischer <a...@apache.org> Date: Tue Apr 1 11:44:40 2014 +0000 i124482: Special handling of input field backgrounds of Adwaita theme (Merged from branch AOO410). diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 1ecc667..6dbe23f 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3615,7 +3615,9 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) bNeedButtonStyleAsEditBackgroundWorkaround = false; // setup some workarounds for "blueprint" theme - if( pThemeName && strncasecmp( pThemeName, "blueprint", 9 ) == 0 ) + if( pThemeName + && ( strncasecmp( pThemeName, "blueprint", 9 ) == 0 + || strncasecmp( pThemeName, "Adwaita", 7 ) == 0 )) { bNeedButtonStyleAsEditBackgroundWorkaround = true; if( GetX11SalData()->GetDisplay()->GetServerVendor() == vendor_sun ) commit 4f34412da1ed29d51ba24fb4e33ecd9088811a08 Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Tue Apr 1 10:00:47 2014 +0000 124553: <SwAcccessibleCell::SwAccessibleCell(..)> - correct initialization of new members introduced for IA2 diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index d3e747e..f92e807 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -114,17 +114,21 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap, : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm ) , aSelectionHelper( *this ) , bIsSelected( sal_False ) + , m_xTableReference( NULL ) + , m_pAccTable( NULL ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + vos::OGuard aGuard( Application::GetSolarMutex() ); OUString sBoxName( pCellFrm->GetTabBox()->GetName() ); SetName( sBoxName ); bIsSelected = IsSelected(); - //Need not assign the pointer of accessible table object to m_pAccTable, - //for it already done in SwAccessibleCell::GetTable(); Former codes: - //m_pAccTable= GetTable(); - GetTable(); + m_xTableReference = getAccessibleParent(); +#if OSL_DEBUG_LEVEL > 1 + uno::Reference< XAccessibleContext > xContextTable( m_xTableReference, uno::UNO_QUERY ); + OSL_ASSERT( xContextTable.is() && xContextTable->getAccessibleRole() == AccessibleRole::TABLE ); +#endif + m_pAccTable = static_cast< SwAccessibleTable * >( m_xTableReference.get() ); } sal_Bool SwAccessibleCell::_InvalidateMyCursorPos() @@ -556,20 +560,3 @@ void SwAccessibleCell::deselectAccessibleChild( aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex); } -SwAccessibleTable *SwAccessibleCell::GetTable() -{ - if (!m_pAccTable) - { - if (!xTableReference.is()) - { - xTableReference = getAccessibleParent(); - #ifdef OSL_DEBUG_LEVEL - uno::Reference<XAccessibleContext> xContextTable(xTableReference, uno::UNO_QUERY); - OSL_ASSERT(xContextTable.is() && xContextTable->getAccessibleRole() == AccessibleRole::TABLE); - #endif - //SwAccessibleTable aTable = *(static_cast<SwAccessibleTable *>(xTable.get())); - } - m_pAccTable = static_cast<SwAccessibleTable *>(xTableReference.get()); - } - return m_pAccTable; -} diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 50152d2..7f32318 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -47,6 +47,9 @@ class SwAccessibleCell : public SwAccessibleContext, SwAccessibleSelectionHelper aSelectionHelper; sal_Bool bIsSelected; // protected by base class mutex + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xTableReference; + SwAccessibleTable *m_pAccTable; + sal_Bool IsSelected(); sal_Bool _InvalidateMyCursorPos(); @@ -171,9 +174,6 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); - SwAccessibleTable *GetTable(); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTableReference; - SwAccessibleTable *m_pAccTable; }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits