strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#95867# check for macro warning also in LoadXML

Browse source
This commit is contained in:
Niklas Nebel 2001-12-12 20:04:18 +00:00
parent 790891908f
commit 948b0ec2f8
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sc/source/ui/docshell/docsh.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: docsh.cxx,v $
*
* $Revision: 1.47 $
* $Revision: 1.48 $
*
* last change: $Author: mba $ $Date: 2001-12-12 18:59:28 $
* last change: $Author: nn $ $Date: 2001-12-12 21:04:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -520,6 +520,11 @@ BOOL ScDocShell::LoadXML( SfxMedium* pMedium, SvStorage* pStor )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::LoadXML" );
// handling of macro warnings as in LoadCalc
BOOL bWarningEnabled = SvtSecurityOptions().IsWarningEnabled() || SvtSecurityOptions().IsConfirmationEnabled();
if (bWarningEnabled)
aDocument.SetMacroCallMode(SC_MACROCALL_ASK); // ask before executing
// prevent unnecessary broadcasts and updates
ScDocShellModificator aModificator( *this );
@ -608,6 +613,22 @@ BOOL ScDocShell::LoadXML( SfxMedium* pMedium, SvStorage* pStor )
//! row heights...
// handling of macro warnings as in LoadCalc
if ( eShellMode == SFX_CREATE_MODE_STANDARD && bRet )
{
if ( bWarningEnabled )
{
// If the document contains macro calls, ask now
// otherwise set to ALLOWED (for entering new formulas).
// (If document is loaded invisibly, ASK state is kept)
if ( aDocument.HasMacroCallsAfterLoad() )
aDocument.CheckMacroWarn();
else
aDocument.SetMacroCallMode(SC_MACROCALL_ALLOWED);
}
}
return bRet;
}