[Libreoffice-commits] core.git: accessibility/source

[Stephan Bergmann]

 accessibility/source/extended/AccessibleGridControlBase.cxx      |    2 +-
 accessibility/source/extended/AccessibleGridControlTableCell.cxx |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 2da7ce3ba8e5838b782fe4f9e26a29c1c7face54
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 10 11:24:05 2014 +0200

    -Werror,-Wundefined-bool-conversion
    
    Change-Id: I373d795951120d19bc7664282741d956d1ec3768

diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index f79d64c..dafe083 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -320,7 +320,7 @@ bool AccessibleGridControlBase::implIsShowing()
 bool AccessibleGridControlBase::isAlive() const
 {
     ::osl::MutexGuard g(m_aMutex); // guards rBHelper members
-    return !rBHelper.bDisposed && !rBHelper.bInDispose && &m_aTable;
+    return !rBHelper.bDisposed && !rBHelper.bInDispose;
 }
 
 void AccessibleGridControlBase::ensureIsAlive() const
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 08cfe0b..f55f1cb 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -145,11 +145,7 @@ namespace accessibility
         if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
             throw IndexOutOfBoundsException();
 
-        ::com::sun::star::awt::Rectangle aRect;
-
-        if ( &m_aTable )
-            aRect = AWTRectangle( m_aTable.GetFieldCharacterBounds( getRowPos(), getColumnPos(), nIndex ) );
-        return aRect;
+        return AWTRectangle( m_aTable.GetFieldCharacterBounds( getRowPos(), getColumnPos(), nIndex ) );
     }
 
     sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException, std::exception)