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

[Michael Stahl]

 sw/source/core/access/acccontext.hxx |    4 ++--
 sw/source/core/access/accframe.cxx   |    1 +
 sw/source/core/access/accmap.cxx     |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3b83ef0d24347a39a925996c5d2958fcdc2473d7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Apr 24 11:46:56 2017 +0200

    sw: let's check GetFrame() instead, it's already public
    
    Change-Id: I0dc25c519a8c9d658acd80372c41be0ee22c6d8b

diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index d41400a0fe65..1d4808bf34da 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -112,6 +112,8 @@ protected:
     bool IsDisposing() const { return m_isDisposing; }
 
     vcl::Window *GetWindow();
+    SwAccessibleMap *GetMap() { return m_pMap; }
+    const SwAccessibleMap *GetMap() const { return m_pMap; }
 
     /** convenience method to get the SwViewShell through accessibility map */
     SwViewShell* GetShell()
@@ -169,8 +171,6 @@ protected:
 
 public:
     void FireAccessibleEvent( css::accessibility::AccessibleEventObject& rEvent );
-    SwAccessibleMap *GetMap() { return m_pMap; }
-    const SwAccessibleMap *GetMap() const { return m_pMap; }
 
 protected:
     // broadcast visual data event
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 8a93692db121..db6ddc049684 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -417,6 +417,7 @@ SwAccessibleFrame::SwAccessibleFrame( const SwRect& rVisArea,
     mpFrame( pF ),
     mbIsInPagePreview( bIsPagePreview )
 {
+    assert(mpFrame);
 }
 
 SwAccessibleFrame::~SwAccessibleFrame()
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index bf530abb7349..895a4bfd9c7e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2390,7 +2390,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrame *pFrame,
             else
             {
                 FireEvents();
-                if (xAccImpl->GetMap()) // not if disposed by FireEvents()
+                if (xAccImpl->GetFrame()) // not if disposed by FireEvents()
                 {
                     xAccImpl->InvalidatePosOrSize(rOldBox);
                 }