diff options
author | Joachim Lingner <jl@openoffice.org> | 2011-01-04 15:06:50 +0100 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2011-01-04 15:06:50 +0100 |
commit | b4c21506e335f8d419d85f55b70508d805ee3d8b (patch) | |
tree | ba918ce909c2257e2dff37e9f7fffcfd3274077d /desktop/source/deployment/registry/component | |
parent | 7508b11431ad7e08ab49a8a239a79ee9ae80334d (diff) |
jl160 resolve merge conflicts
Diffstat (limited to 'desktop/source/deployment/registry/component')
-rw-r--r-- | desktop/source/deployment/registry/component/dp_component.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index f094925a45a7..650a7585d929 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -1818,7 +1818,7 @@ void BackendImpl::ComponentsPackageImpl::processPackage_( that->componentLiveRemoval(that->readDataFromDb(url)); } that->releaseObject(url); - that->deleteDataFromDb(url); + that->revokeEntryFromDb(url); } } |