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

[Caolán McNamara]

 sw/source/uibase/web/wview.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 8712f0555baab0830aace424f143ad3c9eeaa028
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 11 10:42:24 2014 +0100

    fix corner case crash in xhtml headless export as pdf
    
    Change-Id: I255504e2c84783387d2fc308800812bef5e82734

diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index b215f53..c2bd48b 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -142,9 +142,12 @@ void SwWebView::SelectShell()
                     pSfxShell->ISA( SwDrawTextShell ) || pSfxShell->ISA( SwAnnotationShell ) ) )
                     break;
             }
-            pSfxShell = rDispatcher.GetShell( --i );
-            OSL_ENSURE( pSfxShell, "My Shell ist lost in space" );
-            rDispatcher.Pop( *pSfxShell, SFX_SHELL_POP_UNTIL | SFX_SHELL_POP_DELETE);
+            if (i)
+            {
+                pSfxShell = rDispatcher.GetShell( --i );
+                OSL_ENSURE( pSfxShell, "My Shell ist lost in space" );
+                rDispatcher.Pop( *pSfxShell, SFX_SHELL_POP_UNTIL | SFX_SHELL_POP_DELETE);
+            }
         }
 
         bool bInitFormShell = false;