diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:10:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:10:41 +0000 |
| commit | 900012fda0784078d3de0a52239296769f3e5607 (patch) | |
| tree | 121fc0e5e84188a9d31d4e3a7f04228a9209b374 /desktop/source/deployment | |
| parent | df081b254c75249216722a81b111b501f1cfa1cb (diff) | |
INTEGRATION: CWS jl102 (1.28.8); FILE MERGED
2008/06/18 08:45:11 jl 1.28.8.2: RESYNC: (1.28-1.31); FILE MERGED
2008/06/06 12:07:50 jl 1.28.8.1: #i86077# fix cancelling of adding and removing an extension
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index dbed86af1e..8bdcc16346 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dp_package.cxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.33 $ * * This file is part of OpenOffice.org. * @@ -780,6 +780,7 @@ void BackendImpl::PackageImpl::processPackage_( const sal_Int32 len = bundle.getLength(); for ( sal_Int32 pos = 0; pos < len; ++pos ) { + checkAborted(abortChannel); Reference<deployment::XPackage> const & xPackage = bundle[ pos ]; Reference<task::XAbortChannel> xSubAbortChannel( xPackage->createAbortChannel() ); @@ -860,6 +861,7 @@ void BackendImpl::PackageImpl::processPackage_( // revoke in reverse order: for ( sal_Int32 pos = bundle.getLength(); pos--; ) { + checkAborted(abortChannel); Reference<deployment::XPackage> const & xPackage = bundle[ pos ]; Reference<task::XAbortChannel> xSubAbortChannel( xPackage->createAbortChannel() ); |