summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorDaniel Rentz <dr@openoffice.org>2010-05-21 10:11:51 +0200
committerDaniel Rentz <dr@openoffice.org>2010-05-21 10:11:51 +0200
commitd9842bcef5aef58ae7a573ba15076bea34b6f7f2 (patch)
treee1396988a670a95607e1a712d98d6e90be8f58ae /basctl
parent6ddef091efca9cd67d93a806c2ec6303f47adc28 (diff)
parent8a7f8ca1a440b8ccc9c5aa241560bbb1ca963969 (diff)
npower13_objectmodules: rebase and merge with DEV300_m78
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/basdoc.cxx7
-rw-r--r--basctl/source/basicide/basdoc.hxx2
-rw-r--r--basctl/source/basicide/baside4.cxx31
-rw-r--r--basctl/source/basicide/basides1.cxx6
-rw-r--r--basctl/source/basicide/basidesh.cxx2
-rw-r--r--basctl/source/basicide/localizationmgr.cxx2
-rw-r--r--basctl/source/basicide/makefile.mk6
-rwxr-xr-xbasctl/util/basctl.map2
8 files changed, 12 insertions, 46 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index e56dcda81a9f..cdf4c58015ba 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -35,6 +35,7 @@
#define GLOBALOVERFLOW2
#include <sfx2/docfac.hxx>
+#include <sfx2/sfxmodelfactory.hxx>
#include <vcl/status.hxx>
#include <svx/xmlsecctrl.hxx>
@@ -57,12 +58,12 @@ 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) );
+ SetBaseModel( new SIDEModel(this) );
}
__EXPORT BasicDocShell::~BasicDocShell()
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index e1832a27521a..1ef5991cfab4 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -56,7 +56,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/baside4.cxx b/basctl/source/basicide/baside4.cxx
deleted file mode 100644
index c080427ee013..000000000000
--- a/basctl/source/basicide/baside4.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_basctl.hxx"
-
-
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 40c78f7a4e81..351186325b09 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -298,10 +298,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();
@@ -1172,7 +1172,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 e170c4c7d0fa..2f9303756e09 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -172,7 +172,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 996a4e772be1..95c27c65acdb 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -77,7 +77,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 70681b50f35a..62c4755112d1 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -66,6 +66,7 @@ EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj \
$(SLO)$/moduldl2.obj \
$(SLO)$/unomodel.obj \
$(SLO)$/register.obj \
+ $(SLO)$/basdoc.obj \
$(SLO)$/tbxctl.obj \
$(SLO)$/basidectrlr.obj \
$(SLO)$/localizationmgr.obj \
@@ -74,7 +75,6 @@ EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj \
$(SLO)$/documentenumeration.obj
SLOFILES = $(EXCEPTIONSFILES) \
- $(SLO)$/basdoc.obj \
$(SLO)$/basicbox.obj \
$(SLO)$/baside2b.obj \
$(SLO)$/brkdlg.obj \
@@ -90,11 +90,7 @@ $(INCCOM)$/dllname.hxx: makefile.mk
$(RM) $@
echo \#define DLL_NAME \"libbasctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
-.IF "$(USE_SHELL)"!="4nt"
echo \#define DLL_NAME \"basctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE # "$(USE_SHELL)"!="4nt"
- echo #define DLL_NAME "basctl$(DLLPOSTFIX)$(DLLPOST)" >$@
-.ENDIF # "$(USE_SHELL)"!="4nt"
.ENDIF
$(SLO)$/basiclib.obj : $(INCCOM)$/dllname.hxx
diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map
index 6b132e93cc3d..80359606ccc8 100755
--- a/basctl/util/basctl.map
+++ b/basctl/util/basctl.map
@@ -1,4 +1,4 @@
-BASCTL_1.0 {
+UDK_3_0_0 {
global:
basicide_choose_macro;
basicide_macro_organizer;