autorecovery: merge after rebase to m69

6 files changed, 10 insertions, 9 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 4dd0dbd2aeca..ac7af7de25a4 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -38,6 +38,7 @@
 #define GLOBALOVERFLOW2
 
 #include <sfx2/docfac.hxx>
+#include <sfx2/sfxmodelfactory.hxx>
 #include <vcl/status.hxx>
 
 #include <svx/xmlsecctrl.hxx>
@@ -60,11 +61,11 @@ SFX_IMPL_INTERFACE( BasicDocShell, SfxObjectShell, IDEResId( 0 ) )
     SFX_STATUSBAR_REGISTRATION( IDEResId( SID_BASICIDE_STATUSBAR ) );
 }
 
-BasicDocShell::BasicDocShell( SfxObjectCreateMode eMode ) : SfxObjectShell( eMode )
+BasicDocShell::BasicDocShell()
+    :SfxObjectShell( SFXMODEL_DISABLE_EMBEDDED_SCRIPTS | SFXMODEL_DISABLE_DOCUMENT_RECOVERY )
 {
     pPrinter = 0;
     SetPool( &SFX_APP()->GetPool() );
-    SetHasNoBasic();
     SetModel( new SIDEModel(this) );
 }
 
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index a589ef700b33..120c083cfb46 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -59,7 +59,7 @@ public:
                         using SotObject::GetInterface;
                         SFX_DECL_OBJECTFACTORY();
                         SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH )
-                        BasicDocShell( SfxObjectCreateMode eMode = SFX_CREATE_MODE_STANDARD );
+                        BasicDocShell();
                         ~BasicDocShell();
 
     SfxPrinter*         GetPrinter( BOOL bCreate );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 044c61d5cc21..e8be577da00f 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -302,10 +302,10 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
                     {
                         // get statusindicator
                         SfxViewFrame *pFrame_ = GetFrame();
-                        if ( pFrame_ && pFrame_->GetFrame() )
+                        if ( pFrame_ )
                         {
                             uno::Reference< task::XStatusIndicatorFactory > xStatFactory(
-                                                                        pFrame_->GetFrame()->GetFrameInterface(),
+                                                                        pFrame_->GetFrame().GetFrameInterface(),
                                                                         uno::UNO_QUERY );
                             if( xStatFactory.is() )
                                 xStatusIndicator = xStatFactory->createStatusIndicator();
@@ -1156,7 +1156,7 @@ void BasicIDEShell::ManageToolbars()
         return;
 
     Reference< beans::XPropertySet > xFrameProps
-        ( GetViewFrame()->GetFrame()->GetFrameInterface(), uno::UNO_QUERY );
+        ( GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
     if ( xFrameProps.is() )
     {
         Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 2d2e0f6a5693..61d3b4a7696a 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -107,7 +107,7 @@ SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 
 
 
-#define IDE_VIEWSHELL_FLAGS     SFX_VIEW_MAXIMIZE_FIRST|SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW
+#define IDE_VIEWSHELL_FLAGS     SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW
 
 
 // Hack for #101048
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index fead4ae0aa4c..01b427ed8606 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -80,7 +80,7 @@ void LocalizationMgr::handleTranslationbar( void )
         ::rtl::OUString::createFromAscii( "private:resource/toolbar/translationbar" );
 
     Reference< beans::XPropertySet > xFrameProps
-        ( m_pIDEShell->GetViewFrame()->GetFrame()->GetFrameInterface(), uno::UNO_QUERY );
+        ( m_pIDEShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
     if ( xFrameProps.is() )
     {
         Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index 8766473d8157..0487da0ea2c3 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -69,6 +69,7 @@ EXCEPTIONSFILES=$(SLO)$/scriptdocument.obj  \
                 $(SLO)$/moduldl2.obj	\
                 $(SLO)$/unomodel.obj	\
                 $(SLO)$/register.obj	\
+                $(SLO)$/basdoc.obj	    \
                 $(SLO)$/tbxctl.obj		\
                 $(SLO)$/basidectrlr.obj	\
                 $(SLO)$/localizationmgr.obj \
@@ -77,7 +78,6 @@ EXCEPTIONSFILES=$(SLO)$/scriptdocument.obj  \
                 $(SLO)$/documentenumeration.obj
 
 SLOFILES =  $(EXCEPTIONSFILES) \
-            $(SLO)$/basdoc.obj	\
             $(SLO)$/basicbox.obj	\
             $(SLO)$/baside2b.obj	\
             $(SLO)$/brkdlg.obj	\