ok, lets assert and code defensively

1 files changed, 16 insertions, 6 deletions

diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 0f7aabd130..6c8825a467 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -321,13 +321,23 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq)
 SfxTabPage* CreatePrintOptionsPage( Window *pParent,
                                 const SfxItemSet &rOptions, BOOL bPreview )
 {
+    SfxTabPage* pPage = NULL;
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-    ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( TP_OPTPRINT_PAGE );
-    SfxTabPage* pPage = (*fnCreatePage)( pParent, rOptions );
-    SfxAllItemSet aSet(*(rOptions.GetPool()));
-    aSet.Put (SfxBoolItem(SID_PREVIEWFLAG_TYPE, bPreview));
-    aSet.Put (SfxBoolItem(SID_FAX_LIST, sal_True));
-    pPage->PageCreated(aSet);
+    DBG_ASSERT( pFac, "No Print Dialog" );
+    if ( pFact )
+    {
+        ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( TP_OPTPRINT_PAGE );
+        pPage = (*fnCreatePage)( pParent, rOptions );
+    }
+
+    DBG_ASSERT( pPage, "No page" );
+    if ( pPage )
+    {
+        SfxAllItemSet aSet(*(rOptions.GetPool()));
+        aSet.Put (SfxBoolItem(SID_PREVIEWFLAG_TYPE, bPreview));
+        aSet.Put (SfxBoolItem(SID_FAX_LIST, sal_True));
+        pPage->PageCreated(aSet);
+    }
     return pPage;
 }