Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba33e

53 files changed, 187 insertions, 213 deletions

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 360f32e880bf..45dfb16dbd52 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -481,7 +481,6 @@
 #include "sfx2/tabdlg.hxx"
 #include "sfx2/tbxctrl.hxx"
 #include "sfx2/templdlg.hxx"
-#include "sfx2/topfrm.hxx"
 #include "sfx2/tplpitem.hxx"
 #include "sfx2/viewfac.hxx"
 #include "sfx2/viewfrm.hxx"
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index e4122ca0d4c3..b0c592243bb2 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -72,6 +72,11 @@ class DrawDocShell;
 class SdGlobalResourceContainer;
 }
 
+namespace com { namespace sun { namespace star { namespace frame {
+    class XFrame;
+} } } }
+
+
 // ----------------------
 // - SdOptionStreamMode -
 // ----------------------
@@ -168,8 +173,8 @@ private:
     SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
 
     static void ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium );
-    static SfxFrame* CreateEmptyDocument( DocumentType eDocType, SfxFrame* pTargetFrame = 0  );
-    static SfxFrame* CreateFromTemplate( const String& rTemplatePath, SfxFrame* pTargetFrame = 0 );
+    static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
+    static SfxFrame* CreateFromTemplate( const String& rTemplatePath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
 
     /** The resource container controls the lifetime of some singletons.
     */
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index c86296a90997..654ef970a132 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -45,7 +45,6 @@
 #include <unotools/useroptions.hxx>
 
 #include <sfx2/printer.hxx>
-#include <sfx2/topfrm.hxx>
 #include <sfx2/app.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/dialogs.hrc>
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 9e650d0da43c..d393aaf717c4 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1075,7 +1075,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
     USHORT nId = 0;
 
     // set slot images
-    Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface() );
+    Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() );
     if( xFrame.is() )
     {
         const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src
index 935b23b38016..b9311d0180df 100644
--- a/sd/source/ui/app/menuportal_tmpl.src
+++ b/sd/source/ui/app/menuportal_tmpl.src
@@ -71,7 +71,6 @@ Menu SD_MENU_PORTAL
                     MI ( ITEM_FILE_PRINTDOC )
                     MI ( ITEM_FILE_SETUPPRINTER )
                     SEPARATOR
-                    MI ( ITEM_FILE_BACKTOWEBTOP )
                     MI ( ITEM_FILE_LOGOUT )
                 };
             };
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 65485d9df447..f771388e5a09 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -87,6 +87,8 @@
 
 
 using ::sd::framework::FrameworkHelper;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::frame::XFrame;
 
 namespace {
 
@@ -305,13 +307,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest)
                 }
 
                 SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE);
-                if ( pFrmItem )
-                {
-                    SfxFrame* pFrame = pFrmItem->GetFrame();
-                    pFrame->InsertDocument( pDocSh );
-                }
-                else
-                    SfxViewFrame::CreateViewFrame(*pDocSh, ::sd::OUTLINE_FACTORY_ID);
+                SfxViewFrame::LoadDocumentIntoFrame( *pDocSh, pFrmItem, ::sd::OUTLINE_FACTORY_ID );
 
                 ::sd::ViewShell* pViewSh = pDocSh->GetViewShell();
 
@@ -536,7 +532,7 @@ void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocume
     }
 }
 
-SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, SfxFrame* pTargetFrame )
+SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, const Reference< XFrame >& i_rFrame )
 {
     SfxFrame* pFrame = 0;
 
@@ -555,17 +551,9 @@ SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, SfxFrame* p
     }
     else if( pDocShell )
     {
-        if ( pTargetFrame )
-        {
-            pFrame = pTargetFrame;
-            pFrame->InsertDocument( pDocShell );
-        }
-        else
-        {
-            SfxViewFrame* pViewFrame = SfxViewFrame::CreateViewFrame( *pDocShell );
-            if( pViewFrame )
-                pFrame = pViewFrame->GetFrame();
-        }
+        SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pDocShell, i_rFrame );
+        OSL_ENSURE( pViewFrame, "SdModule::CreateFromTemplate: no view frame - was the document really loaded?" );
+        pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
     }
 
     return pFrame;
@@ -577,10 +565,10 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
     SfxFrame* pFrame = 0;
     if ( SvtModuleOptions().IsImpress() )
     {
-        SfxFrame* pTargetFrame = 0;
-        SFX_REQUEST_ARG( rReq, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE);
+        Reference< XFrame > xTargetFrame;
+        SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE);
         if ( pFrmItem )
-            pTargetFrame = pFrmItem->GetFrame();
+            xTargetFrame = pFrmItem->GetFrame();
 
         bool bMakeLayoutVisible = false;
         SfxViewFrame* pViewFrame = NULL;
@@ -600,12 +588,12 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
             if( aStandardTemplate.Len() > 0 )
             {
                 //load a template document
-                pFrame = CreateFromTemplate( aStandardTemplate, pTargetFrame );
+                pFrame = CreateFromTemplate( aStandardTemplate, xTargetFrame );
             }
             else
             {
                 //create an empty document
-                pFrame = CreateEmptyDocument( DOCUMENT_TYPE_IMPRESS, pTargetFrame );
+                pFrame = CreateEmptyDocument( DOCUMENT_TYPE_IMPRESS, xTargetFrame );
                 bMakeLayoutVisible = true;
             }
         }
@@ -638,7 +626,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                         SfxStringItem aReferer( SID_REFERER, UniString() );
                         SfxStringItem aPassword( SID_PASSWORD, aPasswrd );
 
-                        if ( pTargetFrame )
+                        if ( xTargetFrame.is() )
                         {
                             SfxAllItemSet aSet( *rReq.GetArgs()->GetPool() );
                             aSet.Put( aFile );
@@ -648,10 +636,10 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                             if (aPasswrd.Len() > 0)
                                 aSet.Put( aPassword );
 
-                            const SfxPoolItem* pRet = pTargetFrame->LoadDocumentSynchron( aSet );
+                            const SfxPoolItem* pRet = SfxFrame::OpenDocumentSynchron( aSet, xTargetFrame );
                             const SfxViewFrameItem* pFrameItem = PTR_CAST( SfxViewFrameItem, pRet );
                             if ( pFrameItem && pFrameItem->GetFrame() )
-                                pFrame = pFrameItem->GetFrame()->GetFrame();
+                                pFrame = &pFrameItem->GetFrame()->GetFrame();
                         }
                         else
                         {
@@ -670,7 +658,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                                 const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot (aRequest);
                                 const SfxViewFrameItem* pFrameItem = PTR_CAST( SfxViewFrameItem, pRet );
                                 if ( pFrameItem )
-                                    pFrame = pFrameItem->GetFrame()->GetFrame();
+                                    pFrame = &pFrameItem->GetFrame()->GetFrame();
                             }
                             catch (::com::sun::star::uno::Exception e)
                             {
@@ -694,20 +682,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                     SfxObjectShell* pShell = xShell;
                     if( pShell )
                     {
-                        if ( pTargetFrame )
-                        {
-                            pFrame = pTargetFrame;
-                            pFrame->InsertDocument( pShell );
-                            pViewFrame = pFrame->GetCurrentViewFrame();
-                        }
-                        else
-                        {
-                            pViewFrame = SfxViewFrame::CreateViewFrame( *pShell );
-                            if( pViewFrame )
-                                pFrame = pViewFrame->GetFrame();
-                        }
-
+                        pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pShell, xTargetFrame );
                         DBG_ASSERT( pViewFrame, "no ViewFrame!!" );
+                        pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
 
                         if(bNewDocDirect && !bStartWithTemplate)
                         {
@@ -793,7 +770,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
     return pFrame;
 }
 
-SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, SfxFrame* pTargetFrame )
+SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, const Reference< XFrame >& i_rFrame )
 {
     SfxFrame* pFrame = 0;
 
@@ -810,17 +787,9 @@ SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, SfxFrame* pTarge
             pDoc->StopWorkStartupDelay();
         }
 
-        if ( pTargetFrame )
-        {
-            pFrame = pTargetFrame;
-            pFrame->InsertDocument( pNewDocSh );
-        }
-        else
-        {
-            SfxViewFrame* pViewFrame = SfxViewFrame::CreateViewFrame( *pNewDocSh );
-            if( pViewFrame )
-                pFrame = pViewFrame->GetFrame();
-        }
+        SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pNewDocSh, i_rFrame );
+        OSL_ENSURE( pViewFrame, "SdModule::CreateEmptyDocument: no view frame - was the document really loaded?" );
+        pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
     }
 
     return pFrame;
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index ea89fba79500..5fdb08e112b1 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -304,8 +304,8 @@ public:
     OKButton            maFinishButton;
     SdDocPreviewWin     maPreview;
 
-    String              maCreateStr;

-    String              maOpenStr;

+    String              maCreateStr;
+    String              maOpenStr;
 
     // Seite 1
     FixedBitmap*        mpPage1FB;
@@ -385,8 +385,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     maLastPageButton(pWindow,SdResId(BUT_LAST)),
     maNextPageButton(pWindow,SdResId(BUT_NEXT)),
     maFinishButton(pWindow,SdResId(BUT_FINISH)),
-    maPreview(pWindow,SdResId(CT_PREVIEW)),

-    maCreateStr(SdResId(STR_CREATE)),

+    maPreview(pWindow,SdResId(CT_PREVIEW)),
+    maCreateStr(SdResId(STR_CREATE)),
     maOpenStr(SdResId(STR_OPEN))
 {
     maPageListFile += sal_Unicode('?'),
@@ -974,9 +974,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
     mpPage1OpenLB->Show(eType == ST_OPEN);
     mpPage1OpenPB->Show(eType == ST_OPEN);
 
-    if (eType == ST_OPEN)

-        maFinishButton.SetText(maOpenStr);

-    else

+    if (eType == ST_OPEN)
+        maFinishButton.SetText(maOpenStr);
+    else
         maFinishButton.SetText(maCreateStr);
 }
 
@@ -1594,14 +1594,13 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
             aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile ));
             aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) );
             aReq.AppendItem( SfxStringItem( SID_TARGETNAME, aTargetStr ) );
-            aReq.AppendItem( SfxBoolItem( SID_VIEW, FALSE ) );
+            aReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
             aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) );
 
-            const SfxObjectShellItem* pRet = (SfxObjectShellItem*)
-                SFX_APP()->ExecuteSlot( aReq );
+            const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SFX_APP()->ExecuteSlot( aReq ) );
 
-            if( pRet && pRet->GetObjectShell() )
-                xDocShell = pRet->GetObjectShell();
+            if ( pRet && pRet->GetFrame() && pRet->GetFrame()->GetObjectShell() )
+                xDocShell = pRet->GetFrame()->GetObjectShell();
         }
 
 
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 7d18f19f1993..fab53be9ec30 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -62,7 +62,6 @@
 #ifndef _SO_CLSIDS_HXX
 #include <sot/clsids.hxx>
 #endif
-#include <sfx2/topfrm.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/visitem.hxx>
 
@@ -149,7 +148,7 @@ void DrawDocShell::Construct( bool bClipboard )
     // the document's ref device.
     UpdateRefDevice();
 
-    SetModel( new SdXImpressDocument( this, bClipboard ) );
+    SetBaseModel( new SdXImpressDocument( this, bClipboard ) );
     SetPool( &mpDoc->GetItemPool() );
     mpUndoManager = new sd::UndoManager;
     mpDoc->SetSdrUndoManager( mpUndoManager );
@@ -166,7 +165,7 @@ void DrawDocShell::Construct( bool bClipboard )
 
 DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
                                BOOL bDataObject,
-                               DocumentType eDocumentType,BOOL bScriptSupport) :
+                               DocumentType eDocumentType) :
     SfxObjectShell( eMode == SFX_CREATE_MODE_INTERNAL ?  SFX_CREATE_MODE_EMBEDDED : eMode),
     mpDoc(NULL),
     mpUndoManager(NULL),
@@ -179,8 +178,6 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
     mbOwnPrinter(FALSE),
     mbNewDocument( sal_True )
 {
-    if ( !bScriptSupport )
-        SetHasNoBasic();
     Construct( eMode == SFX_CREATE_MODE_INTERNAL );
 }
 
@@ -190,6 +187,28 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
 |*
 \************************************************************************/
 
+DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, BOOL bDataObject, DocumentType eDocumentType ) :
+    SfxObjectShell( nModelCreationFlags ),
+    mpDoc(NULL),
+    mpUndoManager(NULL),
+    mpPrinter(NULL),
+    mpViewShell(NULL),
+    mpFontList(NULL),
+    meDocType(eDocumentType),
+    mpFilterSIDs(0),
+    mbSdDataObj(bDataObject),
+    mbOwnPrinter(FALSE),
+    mbNewDocument( sal_True )
+{
+    Construct( FALSE );
+}
+
+/*************************************************************************
+|*
+|* Konstruktor 3
+|*
+\************************************************************************/
+
 DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode,
                                BOOL bDataObject,
                                DocumentType eDocumentType) :
@@ -365,7 +384,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive )
 
             ViewShell* pViewSh = NULL;
             SfxViewShell* pSfxViewSh = NULL;
-            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, 0, false);
+            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, false);
 
             while (pSfxViewFrame)
             {
@@ -379,7 +398,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive )
                     pFrameViewList->Insert( new FrameView( mpDoc, pViewSh->GetFrameView() ) );
                 }
 
-                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, 0, false);
+                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false);
             }
         }
     }
@@ -395,7 +414,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive )
         {
             ViewShell* pViewSh = NULL;
             SfxViewShell* pSfxViewSh = NULL;
-            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, 0,false);
+            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, false);
 
             sal_uInt32 i;
             for( i = 0; pSfxViewFrame && (i < pFrameViewList->Count()); i++ )
@@ -409,7 +428,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive )
                     pViewSh->ReadFrameViewData( (FrameView*)pFrameViewList->GetObject(i) );
                 }
 
-                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, 0,false);
+                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false);
             }
         }
     }
@@ -573,7 +592,7 @@ IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
 void DrawDocShell::ClearUndoBuffer()
 {
     // clear possible undo buffers of outliners
-    SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, 0, false);
+    SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, false);
     while(pSfxViewFrame)
     {
         ViewShellBase* pViewShellBase = dynamic_cast< ViewShellBase* >( pSfxViewFrame->GetViewShell() );
@@ -596,7 +615,7 @@ void DrawDocShell::ClearUndoBuffer()
                 }
             }
         }
-        pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, 0, false);
+        pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false);
     }
 
     SfxUndoManager* pUndoManager = GetUndoManager();
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index 990922111089..07c6f203e3a2 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -71,8 +71,16 @@ SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SFX
 
 GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode,
                                      BOOL bDataObject,
-                                     DocumentType eDocType,BOOL bScriptSupport) :
-    DrawDocShell(eMode, bDataObject, eDocType, bScriptSupport)
+                                     DocumentType eDocType) :
+    DrawDocShell(eMode, bDataObject, eDocType)
+{
+    SetStyleFamily( SD_STYLE_FAMILY_GRAPHICS );
+}
+
+GraphicDocShell::GraphicDocShell(const sal_uInt64 nModelCreationFlags,
+                                     BOOL bDataObject,
+                                     DocumentType eDocType) :
+    DrawDocShell(nModelCreationFlags, bDataObject, eDocType)
 {
     SetStyleFamily( SD_STYLE_FAMILY_GRAPHICS );
 }
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index b6029400ff63..f6f9cb024ab9 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -35,7 +35,7 @@
 #include "ViewShellBase.hxx"
 #include <cppcanvas/vclfactory.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/topfrm.hxx>
+#include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 63dc54edefa5..40c174a5315c 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -213,7 +213,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         SfxAbstractDialog* pDlg = pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet,
-            mpView->GetViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(),
+            mpView->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(),
             RID_SVXDLG_CHARMAP ) : 0;
         if( !pDlg )
             return;
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 6348f330e081..bf9694e0cdf4 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -73,8 +73,12 @@ public:
     DrawDocShell (
         SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED,
         BOOL bSdDataObj=FALSE,
-        DocumentType=DOCUMENT_TYPE_IMPRESS,
-        BOOL bScriptSupport=TRUE);
+        DocumentType=DOCUMENT_TYPE_IMPRESS);
+
+    DrawDocShell (
+        const sal_uInt64 nModelCreationFlags,
+        BOOL bSdDataObj=FALSE,
+        DocumentType=DOCUMENT_TYPE_IMPRESS);
 
     DrawDocShell (
         SdDrawDocument* pDoc,
diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx
index 9171dbefb801..08df27c9cb1c 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -60,8 +60,12 @@ public:
     GraphicDocShell (
         SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED,
         BOOL bSdDataObj=FALSE,
-        DocumentType=DOCUMENT_TYPE_DRAW,
-        BOOL bScriptSupport=TRUE);
+        DocumentType=DOCUMENT_TYPE_DRAW);
+
+    GraphicDocShell (
+        const sal_uInt64 nModelCreationFlags,
+        BOOL bSdDataObj=FALSE,
+        DocumentType=DOCUMENT_TYPE_DRAW);
 
     virtual ~GraphicDocShell (void);
 };
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index fbcc0ffedfdf..1abcfc960a53 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -46,7 +46,6 @@
 
 #include <svl/itemprop.hxx>
 
-#include <sfx2/topfrm.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <toolkit/unohlp.hxx>
@@ -706,9 +705,9 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
         {
             PresentationViewShell* pShell = dynamic_cast<PresentationViewShell*>(pFullScreenViewShellBase->GetMainViewShell().get());
 
-            if( pShell && pShell->GetViewFrame() &&  pShell->GetViewFrame()->GetTopFrame() )
+            if( pShell && pShell->GetViewFrame() )
             {
-                WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame()->GetWindow().GetParent());
+                WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent());
                 if( pWorkWindow )
                 {
                     pWorkWindow->StartPresentationMode( FALSE, isAlwaysOnTop() );
@@ -1202,7 +1201,7 @@ void SlideShow::StartFullscreenPresentation( )
         // The new frame is created hidden.  To make it visible and activate the
         // new view shell--a prerequisite to process slot calls and initialize
         // its panes--a GrabFocus() has to be called later on.
-        SfxTopFrame* pNewFrame = SfxTopFrame::Create( mpDoc->GetDocSh(), pWorkWindow, PRESENTATION_FACTORY_ID, TRUE);
+        SfxFrame* pNewFrame = SfxFrame::Create( *mpDoc->GetDocSh(), *pWorkWindow, PRESENTATION_FACTORY_ID, true );
         pNewFrame->SetPresentationMode(TRUE);
 
         mpFullScreenViewShellBase = static_cast<ViewShellBase*>(pNewFrame->GetCurrentViewFrame()->GetViewShell());
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8881706e62bb..d57c2a418f6c 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2221,9 +2221,9 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
     PopupMenu* pPageMenu = pMenu->GetPopupMenu( CM_GOTO );
 
     SfxViewFrame* pViewFrame = getViewFrame();
-    if( pViewFrame && pViewFrame->GetFrame() )
+    if( pViewFrame )
     {
-        Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame()->GetFrameInterface() );
+        Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
         if( xFrame.is() )
         {
             pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE, FALSE ) );
@@ -2846,12 +2846,12 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible )
             // this is a plugin/activex mode, no toolbars should be visible during slide show
             // after the end of slide show they should be visible again
             SfxViewFrame* pViewFrame = getViewFrame();
-            if( pViewFrame && pViewFrame->GetFrame() && pViewFrame->GetFrame()->GetTopFrame() )
+            if( pViewFrame )
             {
                 try
                 {
                     Reference< frame::XLayoutManager > xLayoutManager;
-                    Reference< beans::XPropertySet > xFrameProps( pViewFrame->GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY_THROW );
+                    Reference< beans::XPropertySet > xFrameProps( pViewFrame->GetFrame().GetTopFrame().GetFrameInterface(), UNO_QUERY_THROW );
                     if ( ( xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) )
                                 >>= xLayoutManager )
                       && xLayoutManager.is() )
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 5303b9dc6426..dbc7828cf649 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -85,7 +85,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/topfrm.hxx>
 #include <tools/link.hxx>
 #include <vcl/svapp.hxx>
 
@@ -652,7 +651,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet)
         SfxViewFrame* pSlideViewFrame = SfxViewFrame::Current();
         DBG_ASSERT(pSlideViewFrame!=NULL,
             "SlideSorterController::GetCtrlState: ViewFrame not found");
-        if (pSlideViewFrame && pSlideViewFrame->ISA(SfxTopViewFrame))
+        if (pSlideViewFrame)
         {
             pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet);
         }
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 4aa35f91292f..4c96b1563871 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -80,7 +80,6 @@
 
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/topfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
@@ -501,14 +500,7 @@ void SlotManager::GetCtrlState (SfxItemSet& rSet)
             SfxViewFrame* pSlideViewFrame = pShell->GetViewFrame();
             DBG_ASSERT(pSlideViewFrame!=NULL,
                 "SlideSorterController::GetCtrlState: ViewFrame not found");
-            if (pSlideViewFrame->ISA(SfxTopViewFrame))
-            {
-                pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet);
-            }
-            else        // MI sagt: kein MDIFrame --> disablen
-            {
-                rSet.DisableItem(SID_RELOAD);
-            }
+            pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet);
         }
     }
 
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 3b9b113bf288..157abc38dc9e 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -268,7 +268,7 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase)
     // Connect to the frame to listen for controllers being exchanged.
     // Listen to changes of certain properties.
     Reference<frame::XFrame> xFrame (
-        mrBase.GetFrame()->GetTopFrame()->GetFrameInterface(),
+        mrBase.GetFrame()->GetTopFrame().GetFrameInterface(),
         uno::UNO_QUERY);
     mxFrameWeak = xFrame;
     if (xFrame.is())
diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx
index 3d18dc014a7a..15942515cb38 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -85,18 +85,15 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void)
         // Ignore the current frame when it does not exist, is not valid, or
         // is not active.
         bool bIgnoreFrame (true);
-        if (pViewFrame->GetFrame() != NULL)
+        uno::Reference<frame::XFrame> xFrame (pViewFrame->GetFrame().GetFrameInterface());
+        try
         {
-            uno::Reference<frame::XFrame> xFrame (pViewFrame->GetFrame()->GetFrameInterface());
-            try
-            {
-                if (xFrame.is() && xFrame->isActive())
-                    bIgnoreFrame = false;
-            }
-            catch (uno::RuntimeException e)
-            {
-                (void) e;
-            }
+            if (xFrame.is() && xFrame->isActive())
+                bIgnoreFrame = false;
+        }
+        catch (uno::RuntimeException e)
+        {
+            (void) e;
         }
         if (bIgnoreFrame)
             continue;
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index 55b7a59fa56f..0efd5128cfc1 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -69,12 +69,9 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance(
 
     SdDLL::Init();
 
-    const SfxObjectCreateMode eCreateMode = ( _nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD;
-    const bool bScriptSupport = ( _nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0;
-
     SfxObjectShell* pShell =
         new ::sd::GraphicDocShell(
-            eCreateMode, FALSE, DOCUMENT_TYPE_DRAW, bScriptSupport );
+            _nCreationFlags, FALSE, DOCUMENT_TYPE_DRAW );
     return uno::Reference< uno::XInterface >( pShell->GetModel() );
 }
 
@@ -101,12 +98,9 @@ uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance
 
     SdDLL::Init();
 
-    const SfxObjectCreateMode eCreateMode = ( _nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD;
-    const bool bScriptSupport = ( _nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0;
-
     SfxObjectShell* pShell =
         new ::sd::DrawDocShell(
-            eCreateMode, FALSE, DOCUMENT_TYPE_IMPRESS, bScriptSupport );
+            _nCreationFlags, FALSE, DOCUMENT_TYPE_IMPRESS );
     return uno::Reference< uno::XInterface >( pShell->GetModel() );
 }
 
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 8019fb7ec1e9..3cc5a023a34b 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -92,10 +92,10 @@ PresentationViewShellBase::PresentationViewShellBase (
     GetUpdateLockManager()->Disable();
 
     // Hide the automatic (non-context sensitive) tool bars.
-    if (_pFrame!=NULL && _pFrame->GetFrame()!=NULL)
+    if (_pFrame!=NULL)
     {
         Reference<beans::XPropertySet> xFrameSet (
-            _pFrame->GetFrame()->GetFrameInterface(),
+            _pFrame->GetFrame().GetFrameInterface(),
             UNO_QUERY);
         if (xFrameSet.is())
         {
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 487794816270..21ad0c484473 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -721,8 +721,8 @@ void ToolBarManager::Implementation::SetValid (bool bValid)
         if (mbIsValid)
         {
             Reference<frame::XFrame> xFrame;
-            if (mrBase.GetViewFrame() != NULL && mrBase.GetViewFrame()->GetFrame())
-                xFrame = mrBase.GetViewFrame()->GetFrame()->GetFrameInterface();
+            if (mrBase.GetViewFrame() != NULL)
+                xFrame = mrBase.GetViewFrame()->GetFrame().GetFrameInterface();
             try
             {
                 Reference<beans::XPropertySet> xFrameProperties (xFrame, UNO_QUERY_THROW);
diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx
index 40515bf20197..51285533a389 100644
--- a/sd/source/ui/view/UpdateLockManager.cxx
+++ b/sd/source/ui/view/UpdateLockManager.cxx
@@ -399,11 +399,10 @@ Reference< ::com::sun::star::frame::XLayoutManager>
 
     if (mxLayoutManager.get() == NULL)
     {
-        if (mrBase.GetViewFrame()!=NULL
-            && mrBase.GetViewFrame()->GetFrame()!=NULL)
+        if (mrBase.GetViewFrame()!=NULL)
         {
             Reference<beans::XPropertySet> xFrameProperties (
-                mrBase.GetViewFrame()->GetFrame()->GetFrameInterface(),
+                mrBase.GetViewFrame()->GetFrame().GetFrameInterface(),
                 UNO_QUERY);
             if (xFrameProperties.is())
             {
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 431add66bc2b..ab09af5df16f 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -283,11 +283,7 @@ ViewShellBase::ViewShellBase (
     SfxViewFrame* _pFrame,
     SfxViewShell*)
     : SfxViewShell (_pFrame,
-        SFX_VIEW_MAXIMIZE_FIRST
-        | SFX_VIEW_OPTIMIZE_EACH
-        | SFX_VIEW_DISABLE_ACCELS
-        | SFX_VIEW_OBJECTSIZE_EMBEDDED
-        | SFX_VIEW_CAN_PRINT
+          SFX_VIEW_CAN_PRINT
         | SFX_VIEW_HAS_PRINTOPTIONS),
       maMutex(),
       mpImpl(),
@@ -1057,7 +1053,7 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ )
     // calls for the views in side panes but prevents calling an already
     // dying SfxViewShell base class.
     // For issue #140703# we have to check the existence of the window,
-    // too.  The SfxTopViewFrame accesses the window without checking it.
+    // too.  The SfxViewFrame accesses the window without checking it.
     ViewShell* pMainViewShell = GetMainViewShell().get();
     if (pMainViewShell != NULL && GetWindow()!=NULL)
     {
@@ -1273,7 +1269,7 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const
         Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
 
         Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW );
-        Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY_THROW );
+        Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY_THROW );
 
         ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
 
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 54e0f37a1b19..cdfb43b3ba2e 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -101,9 +101,12 @@
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/XConfiguration.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
+using ::com::sun::star::frame::XFrame;
+using ::com::sun::star::frame::XController;
 
 namespace sd {
 
@@ -378,17 +381,15 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
 
             try
             {
+                Reference< XFrame > xFrame( pFrame->GetFrame().GetFrameInterface(), UNO_SET_THROW );
+
                 // Save the current configuration of panes and views.
                 Reference<XControllerManager> xControllerManager (
                     GetViewShellBase().GetController(), UNO_QUERY_THROW);
                 Reference<XConfigurationController> xConfigurationController (
-                    xControllerManager->getConfigurationController());
-                if ( ! xConfigurationController.is())
-                    throw RuntimeException();
+                    xControllerManager->getConfigurationController(), UNO_QUERY_THROW );
                 Reference<XConfiguration> xConfiguration (
-                    xConfigurationController->getRequestedConfiguration());
-                if ( ! xConfiguration.is())
-                    throw RuntimeException();
+                    xConfigurationController->getRequestedConfiguration(), UNO_SET_THROW );
 
                 SfxChildWindow* pWindow = pFrame->GetChildWindow(nId);
                 if(pWindow)
@@ -401,14 +402,12 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                 // Normale Weiterleitung an ViewFrame zur Ausfuehrung
                 GetViewFrame()->ExecuteSlot(rReq);
 
-                // From here on we must cope with this object already being
+                // From here on we must cope with this object and the frame already being
                 // deleted.  Do not call any methods or use data members.
-                ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pFrame);
-                OSL_ASSERT(pBase!=NULL);
+                Reference<XController> xController( xFrame->getController(), UNO_SET_THROW );
 
                 // Restore the configuration.
-                xControllerManager = Reference<XControllerManager>(
-                    pBase->GetController(), UNO_QUERY_THROW);
+                xControllerManager = Reference<XControllerManager>( xController, UNO_QUERY_THROW);
                 xConfigurationController = Reference<XConfigurationController>(
                     xControllerManager->getConfigurationController());
                 if ( ! xConfigurationController.is())
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 3f8973fbcd64..5aeb1aa00c53 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -156,7 +156,7 @@ void DrawViewShell::ArrangeGUIElements (void)
     if ( pIPClient && pIPClient->IsObjectInPlaceActive() )
         bClientActive = TRUE;
 
-    BOOL bInPlaceActive = GetViewFrame()->GetFrame()->IsInPlace();
+    BOOL bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace();
 
     if ( mbZoomOnPage && !bInPlaceActive && !bClientActive )
     {
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index cc7fd3106fa2..8d30bd377f01 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1595,9 +1595,9 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
     // view mode is allowed.
     const bool bIsRunning = SlideShow::IsRunning(GetViewShellBase());
 
-    if (GetViewFrame()->GetFrame()->IsInPlace() || bIsRunning)
+    if (GetViewFrame()->GetFrame().IsInPlace() || bIsRunning)
     {
-        if ( !GetViewFrame()->GetFrame()->IsInPlace() )
+        if ( !GetViewFrame()->GetFrame().IsInPlace() )
         {
             rSet.ClearItem( SID_DRAWINGMODE );
             rSet.DisableItem( SID_DRAWINGMODE );
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 1dbfa7211a76..f23c364a7a22 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -69,7 +69,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <svl/urihelper.hxx>
-#include <sfx2/topfrm.hxx>
 #include <sfx2/docfile.hxx>
 
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 3783f20a49ef..a4f0519373ea 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -62,7 +62,6 @@
 #include <svx/svdouno.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/fmshell.hxx>
-#include <sfx2/topfrm.hxx>
 #include <svl/cjkoptions.hxx>
 
 #ifndef SD_FRAME_VIEW
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 503fc5ab0624..a27f648da6bf 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -36,7 +36,6 @@
 #ifndef _SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <sfx2/topfrm.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/framework/ResourceId.hpp>
 #include <rtl/ustrbuf.hxx>
@@ -57,6 +56,7 @@
 #include "sdiocmpt.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <comphelper/processfactory.hxx>
+#include <sfx2/viewfrm.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -103,8 +103,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
             ULONG nSdViewShellCount = 0;
             ViewShellBase* pBase = NULL;
             SfxViewShell* pSfxViewSh = NULL;
-            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell,
-                                                                 TYPE(SfxTopViewFrame));
+            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell);
 
             while (pSfxViewFrame)
             {
@@ -145,8 +144,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
                     }
                 }
 
-                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, pDocShell,
-                                                      TYPE(SfxTopViewFrame));
+                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, pDocShell);
             }
 
             SdDrawDocument* pDoc = pDocShell->GetDoc();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 43a8683cd039..a168f7d6b88b 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -61,7 +61,6 @@
 #include <sfx2/tplpitem.hxx>
 #include <svx/svdorect.hxx>
 #include <sot/formats.hxx>
-#include <sfx2/topfrm.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hdl>
 #include <svx/unolingu.hxx>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index c500a95f2811..3c0f0f51eb88 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -212,7 +212,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
     maBulletFont.SetShadow(FALSE);
 
 
-    Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY);
+    Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY);
 
     const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:ShowSlide" ));
     maSlideImage = GetImage( xFrame, aSlotURL, true, false /* todo, hc mode */ );
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index a9a2d9caac13..ca694b21a095 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -41,7 +41,6 @@
 #include "optsitem.hxx"
 #include "sddll.hxx"
 #include <sfx2/request.hxx>
-#include <sfx2/topfrm.hxx>
 #ifndef _SFX_DISPATCH_HXX
 #include <sfx2/dispatch.hxx>
 #endif
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 61e65981f6ce..61c083db19f6 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -154,7 +154,7 @@ namespace slideshow
 
                 virtual bool operator()( const ::basegfx::B2DTuple& rValue )
                 {
-                    ENSURE_OR_RETURN( mpAttrLayer && mpShape,
+                    ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
                                        "TupleAnimation::operator(): Invalid ShapeAttributeLayer" );
 
                     ValueT aValue( rValue.getX(),
@@ -317,7 +317,7 @@ namespace slideshow
 
                 virtual bool operator()( double nValue )
                 {
-                    ENSURE_OR_RETURN( mpAttrLayer && mpShape,
+                    ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
                                        "PathAnimation::operator(): Invalid ShapeAttributeLayer" );
 
                     ::basegfx::B2DPoint rOutPos = ::basegfx::tools::getPositionRelative( maPathPoly,
@@ -537,7 +537,7 @@ namespace slideshow
                  */
                 bool operator()( const ValueT& x )
                 {
-                    ENSURE_OR_RETURN( mpAttrLayer && mpShape,
+                    ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
                                        "GenericAnimation::operator(): Invalid ShapeAttributeLayer" );
 
                     ((*mpAttrLayer).*mpSetValueFunc)( maSetterModifier( x ) );
@@ -552,7 +552,7 @@ namespace slideshow
                  */
                 bool operator()( ValueT x )
                 {
-                    ENSURE_OR_RETURN( mpAttrLayer && mpShape,
+                    ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
                                        "GenericAnimation::operator(): Invalid ShapeAttributeLayer" );
 
                     ((*mpAttrLayer).*mpSetValueFunc)( maSetterModifier( x ) );
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index e99a246f6bb6..584737807c33 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -201,7 +201,7 @@ bool implCreateIteratedNodes(
     // ==================================
 
     // TODO(E1): I'm not too sure what to expect here...
-    ENSURE_OR_RETURN(
+    ENSURE_OR_RETURN_FALSE(
         xIterNode->getTarget().hasValue(),
         "implCreateIteratedNodes(): no target on ITERATE node" );
 
@@ -216,14 +216,14 @@ bool implCreateIteratedNodes(
     {
         // no shape provided. Maybe a ParagraphTarget?
         if( !(xIterNode->getTarget() >>= aTarget) )
-            ENSURE_OR_RETURN(
+            ENSURE_OR_RETURN_FALSE(
                 false,
                 "implCreateIteratedNodes(): could not extract any "
                 "target information" );
 
         xTargetShape = aTarget.Shape;
 
-        ENSURE_OR_RETURN(
+        ENSURE_OR_RETURN_FALSE(
             xTargetShape.is(),
             "implCreateIteratedNodes(): invalid shape in ParagraphTarget" );
 
@@ -254,7 +254,7 @@ bool implCreateIteratedNodes(
     // paragraph)
     if( bParagraphTarget )
     {
-        ENSURE_OR_RETURN(
+        ENSURE_OR_RETURN_FALSE(
             aTarget.Paragraph >= 0 &&
             rTreeNodeSupplier.getNumberOfTreeNodes(
                 DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH ) > aTarget.Paragraph,
@@ -325,7 +325,7 @@ bool implCreateIteratedNodes(
         if( !::anim::for_each_childNode( xNode,
                                          aCreator ) )
         {
-            ENSURE_OR_RETURN(
+            ENSURE_OR_RETURN_FALSE(
                 false,
                 "implCreateIteratedNodes(): iterated child node creation failed" );
         }
@@ -448,7 +448,7 @@ bool implCreateIteratedNodes(
                 if( !::anim::for_each_childNode( xNode,
                                                  aCreator ) )
                 {
-                    ENSURE_OR_RETURN(
+                    ENSURE_OR_RETURN_FALSE(
                         false, "implCreateIteratedNodes(): "
                         "iterated child node creation failed" );
                 }
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 6ad15e43462f..ffc7c32f7298 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -674,7 +674,7 @@ bool BaseNode::registerDeactivatingListener(
     if (! checkValidNode())
         return false;
 
-    ENSURE_OR_RETURN(
+    ENSURE_OR_RETURN_FALSE(
         rNotifee,
         "BaseNode::registerDeactivatingListener(): invalid notifee" );
     maDeactivatingListeners.push_back( rNotifee );
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 0d3579f7be48..d2f6694c0aea 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -615,7 +615,7 @@ bool EventMultiplexerImpl::notifyMouseHandlers(
     uno::Reference<presentation::XSlideShowView> xView(
         e.Source, uno::UNO_QUERY );
 
-    ENSURE_OR_RETURN( xView.is(), "EventMultiplexer::notifyHandlers(): "
+    ENSURE_OR_RETURN_FALSE( xView.is(), "EventMultiplexer::notifyHandlers(): "
                        "event source is not an XSlideShowView" );
 
     // find corresponding view (to map mouse position into user
@@ -630,7 +630,7 @@ bool EventMultiplexerImpl::notifyMouseHandlers(
                           boost::cref( xView ),
                           boost::bind( &UnoView::getUnoView, _1 ) ) ) ) == aEnd)
     {
-        ENSURE_OR_RETURN(
+        ENSURE_OR_RETURN_FALSE(
             false, "EventMultiplexer::notifyHandlers(): "
             "event source not found under registered views" );
     }
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 44e1cad2f45e..9b09fb7d60f9 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -112,7 +112,7 @@ namespace slideshow
                 rEvent.get(),
                 rEvent->getActivationTime(0.0));
 #endif
-            ENSURE_OR_RETURN( rEvent,
+            ENSURE_OR_RETURN_FALSE( rEvent,
                                "EventQueue::addEvent: event ptr NULL" );
 
             // prepare entry
@@ -141,7 +141,7 @@ namespace slideshow
                 rEvent->getActivationTime(0.0));
 #endif
 
-            ENSURE_OR_RETURN( rEvent.get() != NULL,
+            ENSURE_OR_RETURN_FALSE( rEvent.get() != NULL,
                                "EventQueue::addEvent: event ptr NULL" );
             maNextEvents.push_back(
                 EventEntry( rEvent, rEvent->getActivationTime(
@@ -161,7 +161,7 @@ namespace slideshow
                 rpEvent->getActivationTime(0.0));
 #endif
 
-            ENSURE_OR_RETURN(
+            ENSURE_OR_RETURN_FALSE(
                 rpEvent.get() != NULL,
                     "EventQueue::addEvent: event ptr NULL");
 
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx
index 294503a71b77..07566c09d05e 100644
--- a/slideshow/source/engine/shapeattributelayer.cxx
+++ b/slideshow/source/engine/shapeattributelayer.cxx
@@ -214,7 +214,7 @@ namespace slideshow
 
         bool ShapeAttributeLayer::revokeChildLayer( const ShapeAttributeLayerSharedPtr& rChildLayer )
         {
-            ENSURE_OR_RETURN( rChildLayer,
+            ENSURE_OR_RETURN_FALSE( rChildLayer,
                                "ShapeAttributeLayer::revokeChildLayer(): Will not remove NULL child" );
 
             if( !haveChild() )
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 3f1f6109e3f4..d25be17d002d 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -703,7 +703,7 @@ bool ActivityImpl::perform()
     if( !isActive() )
         return false;
 
-    ENSURE_OR_RETURN(
+    ENSURE_OR_RETURN_FALSE(
         mpDrawShape,
         "ActivityImpl::perform(): still active, but NULL draw shape" );
 
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 899804fe1896..09c79e01ad02 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -330,7 +330,7 @@ namespace slideshow
             mbForceUpdate = false;
             mbAttributeLayerRevoked = false;
 
-            ENSURE_OR_RETURN( !maViewShapes.empty(),
+            ENSURE_OR_RETURN_FALSE( !maViewShapes.empty(),
                                "DrawShape::implRender(): render called on DrawShape without views" );
 
             if( maBounds.isEmpty() )
@@ -1062,7 +1062,7 @@ namespace slideshow
 
         bool DrawShape::setIntrinsicAnimationFrame( ::std::size_t nCurrFrame )
         {
-            ENSURE_OR_RETURN( nCurrFrame < maAnimationFrames.size(),
+            ENSURE_OR_RETURN_FALSE( nCurrFrame < maAnimationFrames.size(),
                                "DrawShape::setIntrinsicAnimationFrame(): frame index out of bounds" );
 
             if( mnCurrFrame != nCurrFrame )
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 4817a131cddc..6c8acb6d552e 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -189,7 +189,7 @@ bool getMetaFile( const uno::Reference< lang::XComponent >&       xSource,
                   int                                             mtfLoadFlags,
                   const uno::Reference< uno::XComponentContext >& rxContext )
 {
-    ENSURE_OR_RETURN( rxContext.is(),
+    ENSURE_OR_RETURN_FALSE( rxContext.is(),
                        "getMetaFile(): Invalid context" );
 
     // create dummy XGraphicRenderer, which receives the
@@ -389,7 +389,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
             break;
 
         default:
-            ENSURE_OR_RETURN(false,
+            ENSURE_OR_RETURN_FALSE(false,
                               "getAnimationFromGraphic(): Unexpected case" );
             break;
     }
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 0889fd7654ed..876b22973225 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -141,7 +141,7 @@ namespace slideshow
 
         bool ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds )
         {
-            ENSURE_OR_RETURN( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(),
+            ENSURE_OR_RETURN_FALSE( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(),
                                "ViewAppletShape::startApplet(): Invalid or disposed view" );
             try
             {
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index 5826f752cbec..2c96d32e938c 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -71,7 +71,7 @@ namespace slideshow
                                             const GDIMetaFileSharedPtr&         rMtf ) const
         {
             RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::prefetch()" );
-            ENSURE_OR_RETURN( rMtf,
+            ENSURE_OR_RETURN_FALSE( rMtf,
                                "ViewBackgroundShape::prefetch(): no valid metafile!" );
 
             const ::basegfx::B2DHomMatrix& rCanvasTransform(
@@ -131,7 +131,7 @@ namespace slideshow
                         *rMtf.get(),
                         ::cppcanvas::Renderer::Parameters() ) );
 
-                ENSURE_OR_RETURN( pRenderer,
+                ENSURE_OR_RETURN_FALSE( pRenderer,
                                    "ViewBackgroundShape::prefetch(): Could not create Renderer" );
 
                 pRenderer->setTransformation( aShapeTransform );
@@ -172,7 +172,7 @@ namespace slideshow
             if( !prefetch( rDestinationCanvas, rMtf ) )
                 return false;
 
-            ENSURE_OR_RETURN( mxBitmap.is(),
+            ENSURE_OR_RETURN_FALSE( mxBitmap.is(),
                                "ViewBackgroundShape::draw(): Invalid background bitmap" );
 
             ::basegfx::B2DHomMatrix aTransform( mpViewLayer->getTransformation() );
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 03fdff737e7c..089e8aaf9708 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -275,7 +275,7 @@ namespace slideshow
         {
             if( !mxPlayer.is() && mxShape.is() )
             {
-                ENSURE_OR_RETURN( mpViewLayer->getCanvas(),
+                ENSURE_OR_RETURN_FALSE( mpViewLayer->getCanvas(),
                                    "ViewMediaShape::update(): Invalid layer canvas" );
 
                 uno::Reference< rendering::XCanvas > xCanvas( mpViewLayer->getCanvas()->getUNOCanvas() );
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 4e9c255c86ea..c73c2ec85b5e 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -81,7 +81,7 @@ namespace slideshow
                                   const ShapeAttributeLayerSharedPtr&   rAttr ) const
         {
             RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewShape::prefetch()" );
-            ENSURE_OR_RETURN( rMtf,
+            ENSURE_OR_RETURN_FALSE( rMtf,
                                "ViewShape::prefetch(): no valid metafile!" );
 
             if( rMtf != io_rCacheEntry.mpMtf ||
@@ -207,7 +207,7 @@ namespace slideshow
             ::cppcanvas::RendererSharedPtr pRenderer(
                 getRenderer( rDestinationCanvas, rMtf, rAttr ) );
 
-            ENSURE_OR_RETURN( pRenderer, "ViewShape::draw(): Invalid renderer" );
+            ENSURE_OR_RETURN_FALSE( pRenderer, "ViewShape::draw(): Invalid renderer" );
 
             pRenderer->setTransformation( rTransform );
 #if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
@@ -399,7 +399,7 @@ namespace slideshow
                 mpSprite->resize( rSpriteSizePixel );
             }
 
-            ENSURE_OR_RETURN( mpSprite, "ViewShape::renderSprite(): No sprite" );
+            ENSURE_OR_RETURN_FALSE( mpSprite, "ViewShape::renderSprite(): No sprite" );
 
             VERBOSE_TRACE( "ViewShape::renderSprite(): Rendering sprite 0x%X",
                            mpSprite.get() );
@@ -873,7 +873,7 @@ namespace slideshow
                                 bool                        bIsVisible ) const
         {
             RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewShape::update()" );
-            ENSURE_OR_RETURN( mpViewLayer->getCanvas(), "ViewShape::update(): Invalid layer canvas" );
+            ENSURE_OR_RETURN_FALSE( mpViewLayer->getCanvas(), "ViewShape::update(): Invalid layer canvas" );
 
             // Shall we render to a sprite, or to a plain canvas?
             if( isBackgroundDetached() )
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index b08241bf8fbb..7f009f5d2c44 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -342,7 +342,7 @@ bool ShapeManagerImpl::listenerAdded(
     if( (aIter = mrGlobalListenersMap.find( xShape )) ==
         mrGlobalListenersMap.end() )
     {
-        ENSURE_OR_RETURN(false,
+        ENSURE_OR_RETURN_FALSE(false,
                           "ShapeManagerImpl::listenerAdded(): global "
                           "shape listener map inconsistency!");
     }
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index b036c9373fc7..3a8356234d33 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -825,9 +825,9 @@ bool SlideImpl::implPrefetchShow()
     if( mbShowLoaded )
         return true;
 
-    ENSURE_OR_RETURN( mxDrawPage.is(),
+    ENSURE_OR_RETURN_FALSE( mxDrawPage.is(),
                        "SlideImpl::implPrefetchShow(): Invalid draw page" );
-    ENSURE_OR_RETURN( mpLayerManager,
+    ENSURE_OR_RETURN_FALSE( mpLayerManager,
                        "SlideImpl::implPrefetchShow(): Invalid layer manager" );
 
     // fetch desired page content
@@ -971,7 +971,7 @@ bool SlideImpl::applyInitialShapeAttributes(
 
     try
     {
-        ENSURE_OR_RETURN( maContext.mxComponentContext.is(),
+        ENSURE_OR_RETURN_FALSE( maContext.mxComponentContext.is(),
                            "SlideImpl::applyInitialShapeAttributes(): Invalid component context" );
 
         uno::Reference<lang::XMultiComponentFactory> xFac(
@@ -999,7 +999,7 @@ bool SlideImpl::applyInitialShapeAttributes(
         // could not determine initial shape attributes - this
         // is an error, as some effects might then be plainly
         // invisible
-        ENSURE_OR_RETURN( false,
+        ENSURE_OR_RETURN_FALSE( false,
                            "SlideImpl::applyInitialShapeAttributes(): "
                            "couldn't create TargetPropertiesCreator." );
     }
@@ -1104,9 +1104,9 @@ bool SlideImpl::loadShapes()
     if( mbShapesLoaded )
         return true;
 
-    ENSURE_OR_RETURN( mxDrawPage.is(),
+    ENSURE_OR_RETURN_FALSE( mxDrawPage.is(),
                        "SlideImpl::loadShapes(): Invalid draw page" );
-    ENSURE_OR_RETURN( mpLayerManager,
+    ENSURE_OR_RETURN_FALSE( mpLayerManager,
                        "SlideImpl::loadShapes(): Invalid layer manager" );
 
     // fetch desired page content
diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx
index c06cc0786865..9c7c14f581bc 100644
--- a/slideshow/source/engine/slidebitmap.cxx
+++ b/slideshow/source/engine/slidebitmap.cxx
@@ -68,7 +68,7 @@ namespace slideshow
 
         bool SlideBitmap::draw( const ::cppcanvas::CanvasSharedPtr& rCanvas ) const
         {
-            ENSURE_OR_RETURN( rCanvas && rCanvas->getUNOCanvas().is(),
+            ENSURE_OR_RETURN_FALSE( rCanvas && rCanvas->getUNOCanvas().is(),
                                "SlideBitmap::draw(): Invalid canvas" );
 
             // selectively only copy the transformation from current viewstate,
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 0491b25a8a56..ca3130c6d583 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1405,8 +1405,8 @@ sal_Bool SlideShowImpl::addView(
     DBG_TESTSOLARMUTEX();
 
     // first of all, check if view has a valid canvas
-    ENSURE_OR_RETURN( xView.is(), "addView(): Invalid view" );
-    ENSURE_OR_RETURN( xView->getCanvas().is(),
+    ENSURE_OR_RETURN_FALSE( xView.is(), "addView(): Invalid view" );
+    ENSURE_OR_RETURN_FALSE( xView->getCanvas().is(),
                        "addView(): View does not provide a valid canvas" );
 
     UnoViewSharedPtr const pView( createSlideView(
@@ -1449,7 +1449,7 @@ sal_Bool SlideShowImpl::removeView(
     // precondition: must only be called from the main thread!
     DBG_TESTSOLARMUTEX();
 
-    ENSURE_OR_RETURN( xView.is(), "removeView(): Invalid view" );
+    ENSURE_OR_RETURN_FALSE( xView.is(), "removeView(): Invalid view" );
 
     UnoViewSharedPtr const pView( maViewContainer.removeView( xView ) );
     if( !pView )
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index dcca4a51b4d7..ef1a8f98b6b2 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -855,7 +855,7 @@ bool SlideView::updateScreen() const
 {
     osl::MutexGuard aGuard( m_aMutex );
 
-    ENSURE_OR_RETURN( mpCanvas.get(),
+    ENSURE_OR_RETURN_FALSE( mpCanvas.get(),
                        "SlideView::updateScreen(): Disposed" );
 
     return mpCanvas->updateScreen( false );
@@ -865,7 +865,7 @@ bool SlideView::paintScreen() const
 {
     osl::MutexGuard aGuard( m_aMutex );
 
-    ENSURE_OR_RETURN( mpCanvas.get(),
+    ENSURE_OR_RETURN_FALSE( mpCanvas.get(),
                        "SlideView::paintScreen(): Disposed" );
 
     return mpCanvas->updateScreen( true );
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 43111f821a44..84c3ece93e46 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -185,7 +185,7 @@ void ClippingAnimation::end_()
 
 bool ClippingAnimation::operator()( double nValue )
 {
-    ENSURE_OR_RETURN(
+    ENSURE_OR_RETURN_FALSE(
         mpAttrLayer && mpShape,
         "ClippingAnimation::operator(): Invalid ShapeAttributeLayer" );
 
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 4415599f84d8..c5d2f29cc578 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -181,7 +181,7 @@ public:
 
     virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode )
     {
-        ENSURE_OR_RETURN(
+        ENSURE_OR_RETURN_FALSE(
             rNode,
             "AllAnimationEventHandler::handleAnimationEvent(): Invalid node" );