summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/access/acccontext.hxx4
-rw-r--r--sw/source/core/access/accframe.cxx1
-rw-r--r--sw/source/core/access/accmap.cxx2
3 files changed, 4 insertions, 3 deletions
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);
}