diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-05 12:23:53 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-05 12:23:53 +0000 |
| commit | 354fb896e366df1743ab8aba03a2cc4d701b075d (patch) | |
| tree | c40efac182a03fcf0035969e83ab3b20c3e37373 /configmgr | |
| parent | 89fd8553a2e41b5d76cba6f73dce1927f5578a14 (diff) | |
INTEGRATION: CWS scp2officecfg (1.17.4); FILE MERGED
2004/06/16 14:30:17 jb 1.17.4.2: #116392# Change timestamps for local backend to take into account file size in addition to time, so that different files that happen to have the same modification time (e.g. explicitly set by setup) are recognized as different
2004/06/08 14:31:55 jb 1.17.4.1: #i25937# Reorganize local backends to separate fixed default data from localizations, so that module configuration can be installed
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/localbe/localsinglebackend.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/configmgr/source/localbe/localsinglebackend.cxx b/configmgr/source/localbe/localsinglebackend.cxx index eb022d09cc42..7badb3324bbb 100644 --- a/configmgr/source/localbe/localsinglebackend.cxx +++ b/configmgr/source/localbe/localsinglebackend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: localsinglebackend.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2004-03-30 14:58:30 $ + * last change: $Author: obo $ $Date: 2004-07-05 13:23:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -559,11 +559,12 @@ sal_Bool LocalSingleBackend::isMoreRecent(const rtl::OUString& aFileUrl, rtl::OUString layerUrl ; rtl::OUString subLayerUrl ; - if (!getLayerDirectories(aLayerIndex, layerUrl, subLayerUrl)) - return false; + // if we don't find a layer, but have a non-empty timestamp -> modified + if (!getLayerDirectories(aLayerIndex,layerUrl, subLayerUrl)) + return aTimestamp.getLength() != 0; - return (BasicLocalFileLayer::getTimestamp(layerUrl + aFileUrl).compareTo( - aTimestamp) > 0) ; + return layerUrl.getLength() == 0 || + BasicLocalFileLayer::getTimestamp(layerUrl + aFileUrl).compareTo( aTimestamp) != 0; } //------------------------------------------------------------------------------ @@ -807,7 +808,7 @@ uno::Reference<backend::XUpdatableLayer> LocalSingleBackend::getFileLayer( throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),*this,1); } - return createLocalFileLayer(mFactory, layerPath, aComponent, subLayerPath) ; + return createUpdatableLocalFileLayer(mFactory, layerPath, aComponent, subLayerPath) ; } //------------------------------------------------------------------------------ |