Tag: cws_src680_dba24 User: oj Date: 05/02/21 22:35:49 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx, ModelImpl.hxx
Log: merge conflicts resolved 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.1.2.2&r2=1.1.2.3 Delta lines: +3 -3 ------------------- --- ModelImpl.cxx 21 Feb 2005 11:03:49 -0000 1.1.2.2 +++ ModelImpl.cxx 22 Feb 2005 06:35:46 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2005/02/21 11:03:49 $ + * last change: $Author: oj $ $Date: 2005/02/22 06:35:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -721,7 +721,7 @@ return m_refCount; } // ----------------------------------------------------------------------------- - oid ODatabaseModelImpl::commitStorages() +void ODatabaseModelImpl::commitStorages() { try { File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +7 -3 ------------------- --- ModelImpl.hxx 18 Feb 2005 12:26:45 -0000 1.1.2.1 +++ ModelImpl.hxx 22 Feb 2005 06:35:46 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2005/02/18 12:26:45 $ + * last change: $Author: oj $ $Date: 2005/02/22 06:35:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -277,6 +277,10 @@ @return <TRUE/> if the storage could be commited, otherwise <FALSE/> */ sal_Bool commitEmbeddedStorage(); + + /** commits all storages + */ + void commitStorages(); /** dispose all frames for registered controllers */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
