diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 16:07:53 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 16:07:53 -0500 |
| commit | 8f63d98ef94647792a230360e05a85bce194219a (patch) | |
| tree | 7b8b3d7f473a01b7e32e9be6cc7d385e530801df /desktop/source/deployment/registry/component/dp_component.cxx | |
| parent | 3d386e3e3ef221cc7f88c61ac3ce4cdac9cf0d00 (diff) | |
fix mis-merge in desktop
Diffstat (limited to 'desktop/source/deployment/registry/component/dp_component.cxx')
| -rwxr-xr-x | desktop/source/deployment/registry/component/dp_component.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index b163a99d3432..ca23d0ec0520 100755 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -1885,7 +1885,7 @@ BackendImpl::OtherPlatformPackageImpl::processPackage_( if (xServicesRDB.is()) xServicesRDB->close(); - getMyBackend()->deleteDataFromDb(aURL); + getMyBackend()->revokeEntryFromDb(aURL); } BackendImpl * BackendImpl::ComponentsPackageImpl::getMyBackend() const @@ -1978,7 +1978,6 @@ BackendImpl::ComponentsPackageImpl::ComponentsPackageImpl( : Package( myBackend, url, name, name /* display-name */, xPackageType, bRemoved, identifier) {} ->>>>>>> ooo/DEV300_m101 } // anon namespace |