User: rt      
Date: 2008-06-06 14:01:24+0000
Modified:
   dba/dbaccess/source/core/dataaccess/ModelImpl.hxx

Log:
 INTEGRATION: CWS dba30c (1.21.6); FILE MERGED
 2008/05/09 08:23:58 oj 1.21.6.2: RESYNC: (1.21-1.22); FILE MERGED
 2008/05/08 13:09:40 fs 1.21.6.1: #i87741# checkMacrosOnLoading returning a 
bool now (the current allowance)

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: ModelImpl.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.22&r2=1.23
Delta lines:  +1 -1
-------------------
--- ModelImpl.hxx       2008-05-05 15:49:46+0000        1.22
+++ ModelImpl.hxx       2008-06-06 14:01:21+0000        1.23
@@ -386,7 +386,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]

Reply via email to