[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source

[Libreoffice Gerrit user]

 svx/source/form/fmvwimp.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a0ab9803ec7e1effe7ff77fdfd13b9540ca7f6b8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 10 22:55:02 2012 +0100

    Resolves: rhbz#855972 crash on switching to outline view
    
    Change-Id: Ic2675e9d1d8ce6bb67e9c9e4db292f79c4240409
    (cherry picked from commit d1c1cce4ec0222ac50f9f78ddf5f4ce7aa7377ab)
    Reviewed-on: https://gerrit.libreoffice.org/598
    Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
    Tested-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 546540e..b22c633 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -940,8 +940,10 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
     do
     {
 
+    SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : NULL;
+    SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : NULL;
     // get the forms collection of the page we belong to
-    FmFormPage* pPage = m_pView ? PTR_CAST( FmFormPage, m_pView->GetSdrPageView()->GetPage() ) : NULL;
+    FmFormPage* pPage = PTR_CAST( FmFormPage, pSdrPage );
     Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() );
 
     const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0];