Tag: cws_dev300_dba30c User: fs Date: 2008-05-08 13:09:43+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: #i87741# checkMacrosOnLoading returning a bool now (the current allowance) 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.26&r2=1.26.4.1 Delta lines: +11 -11 --------------------- --- ModelImpl.cxx 2008-04-10 12:39:03+0000 1.26 +++ ModelImpl.cxx 2008-05-08 13:09:40+0000 1.26.4.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModelImpl.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.26.4.1 $ * * This file is part of OpenOffice.org. * @@ -1064,25 +1064,25 @@ } // ----------------------------------------------------------------------------- -bool ODatabaseModelImpl::adjustMacroMode_AutoReject() -{ - return m_aMacroMode.adjustMacroMode( NULL ); -} - -// ----------------------------------------------------------------------------- void ODatabaseModelImpl::revokeDataSource() const { if ( m_pDBContext && m_sDocumentURL.getLength() ) m_pDBContext->deregisterPrivate( m_sDocumentURL ); } -// ----------------------------------------------------------------------------- -void ODatabaseModelImpl::checkMacrosOnLoading() +// -----------------------------------------------------------------------------// ----------------------------------------------------------------------------- +bool ODatabaseModelImpl::adjustMacroMode_AutoReject() +{ + return m_aMacroMode.adjustMacroMode( NULL ); +} + +// -----------------------------------------------------------------------------// ----------------------------------------------------------------------------- +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.21&r2=1.21.6.1 Delta lines: +3 -3 ------------------- --- ModelImpl.hxx 2008-04-10 12:39:56+0000 1.21 +++ ModelImpl.hxx 2008-05-08 13:09:40+0000 1.21.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModelImpl.hxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.6.1 $ * * This file is part of OpenOffice.org. * @@ -385,7 +385,7 @@ /** checks our document's macro execution mode, using the interaction handler as supplied with our load arguments */ - void checkMacrosOnLoading(); + bool 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. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
