Tag: cws_ooh680_dba241d User: fs Date: 2008-05-05 13:07:10+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: #i87741# adjustMacroMode_AutoReject not needed anymore / checkMacrosOnLoading returning the boolean flag for the current execution mode File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.21.18.4&r2=1.21.18.4.10.1 Delta lines: +5 -11 -------------------- --- ModelImpl.cxx 2008-03-12 08:37:48+0000 1.21.18.4 +++ ModelImpl.cxx 2008-05-05 13:06:58+0000 1.21.18.4.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.21.18.4 $ + * $Revision: 1.21.18.4.10.1 $ * - * last change: $Author: obo $ $Date: 2008/03/12 08:37:48 $ + * last change: $Author: fs $ $Date: 2008/05/05 13:06:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1047,18 +1047,12 @@ } // ----------------------------------------------------------------------------- -bool ODatabaseModelImpl::adjustMacroMode_AutoReject() -{ - return m_aMacroMode.adjustMacroMode( NULL ); -} - -// ----------------------------------------------------------------------------- -void ODatabaseModelImpl::checkMacrosOnLoading() +bool ODatabaseModelImpl::checkMacrosOnLoading() { ::comphelper::NamedValueCollection aArgs( m_aArgs ); Reference< XInteractionHandler > xInteraction; xInteraction = aArgs.getOrDefault( "InteractionHandler", xInteraction ); - m_aMacroMode.checkMacrosOnLoading( xInteraction ); + return m_aMacroMode.checkMacrosOnLoading( xInteraction ); } // ----------------------------------------------------------------------------- File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.16.18.4&r2=1.16.18.4.10.1 Delta lines: +4 -15 -------------------- --- ModelImpl.hxx 2008-03-12 08:38:02+0000 1.16.18.4 +++ ModelImpl.hxx 2008-05-05 13:06:58+0000 1.16.18.4.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.16.18.4 $ + * $Revision: 1.16.18.4.10.1 $ * - * last change: $Author: obo $ $Date: 2008/03/12 08:38:02 $ + * last change: $Author: fs $ $Date: 2008/05/05 13:06:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -367,18 +367,7 @@ /** checks our document's macro execution mode, using the interaction handler as supplied with our load arguments */ - void checkMacrosOnLoading(); - - /** adjusts our document's macro execution mode, without using any UI, assuming the user - would reject execution of macros, if she would have been asked. - - If checkMacrosOnLoading has been called before (and thus the macro execution mode - is already adjusted), then the current execution mode is simply returned. - - @return - whether or not macro execution is allowed - */ - bool adjustMacroMode_AutoReject(); + bool checkMacrosOnLoading(); /** resets our macro execute mode, so next time the checkMacrosOnLoading is called, it will behave as if it has never been called before --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
