diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:48:27 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:48:27 +0000 |
| commit | 41a95d3f74e211cbbde19c95c7f14d4ec1e27932 (patch) | |
| tree | c62eca25d43cd31bd1135f98d2aaa384e6cde605 /sfx2 | |
| parent | 668dc3f8dac421cbb82601feda823dfde6ec26b0 (diff) | |
INTEGRATION: CWS dba24c (1.75.4); FILE MERGED
2007/10/16 08:24:36 fs 1.75.4.1: in preparation of #i52527# #i73705#: outsourced the object shell's MacroExecutionMode handling to a dedicated class
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 8a49bb6637d9..a50f472dd6e0 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objxtor.cxx,v $ * - * $Revision: 1.75 $ + * $Revision: 1.76 $ * - * last change: $Author: kz $ $Date: 2007-10-09 15:32:28 $ + * last change: $Author: ihi $ $Date: 2007-11-21 16:48:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,6 +87,7 @@ #endif #include <sfx2/objsh.hxx> +#include <sfx2/signaturestate.hxx> #ifndef _BASIC_SBUNO_HXX #include <basic/sbuno.hxx> @@ -221,12 +222,14 @@ void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::Even TYPEINIT1(SfxObjectShell, SfxShell); //-------------------------------------------------------------------- -SfxObjectShell_Impl::SfxObjectShell_Impl() +SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) :mpObjectContainer(0) ,pAccMgr(0) ,pDocInfo ( 0) ,pCfgMgr( 0) ,pBasicManager( new SfxBasicManagerHolder ) + ,rDocShell( _rDocShell ) + ,aMacroMode( *this ) ,pProgress( 0) ,nTime() ,nVisualDocumentNumber( USHRT_MAX) @@ -290,10 +293,7 @@ SfxObjectShell_Impl::SfxObjectShell_Impl() ,bHiddenLockedByAPI( sal_False ) ,bInCloseEvent( sal_False ) ,nStyleFilter( 0 ) - ,nMacroMode( -1 ) ,bDisposing( sal_False ) - ,bMacroDisabled( sal_False ) - ,bMacroDisabledMessageIsShown( sal_False ) ,m_bEnableSetModified( sal_True ) ,m_bIsModified( sal_False ) ,m_nMapUnit( MAP_100TH_MM ) @@ -342,7 +342,7 @@ SfxObjectShell::SfxObjectShell Konstruktor der Klasse SfxObjectShell. */ -: pImp( new SfxObjectShell_Impl ), +: pImp( new SfxObjectShell_Impl( *this ) ), pMedium(0), pStyleSheetPool(0), eCreateMode(eMode) |