diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-11-17 13:58:05 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-11-17 13:58:05 +0000 |
commit | 8a533dc533e527481532184d8b3defe4b290bb9c (patch) | |
tree | 935b18f7dc298f127ec3ba8e32fb457cde882114 /framework/source | |
parent | b5cfacdfe97ea08d9aa65f43b66c29dd51ca7bfc (diff) |
INTEGRATION: CWS dba18 (1.2.24); FILE MERGED
2004/10/26 05:47:46 oj 1.2.24.4: merge conflict
2004/10/25 11:45:23 oj 1.2.24.3: merge conflict
2004/10/20 08:33:33 cd 1.2.24.2: #i35848# Updated accelerator implementation to solve crash
2004/10/13 13:03:28 oj 1.2.24.1: #i30188# catch exception for module and global config files misses
Diffstat (limited to 'framework/source')
-rw-r--r-- | framework/source/accelerators/moduleacceleratorconfiguration.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 03a1b7147d0e..8fd7e54b53f0 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -2,9 +2,9 @@ * * $RCSfile: moduleacceleratorconfiguration.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: as $ $Date: 2004-10-14 09:26:22 $ + * last change: $Author: obo $ $Date: 2004-11-17 14:58:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -220,3 +220,4 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache() } } // namespace framework + |