diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 14:47:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-10 08:08:45 +0200 |
| commit | d198a8221d4a1a08bb78ad083ff28136e3f65728 (patch) | |
| tree | 8773aa83dae9b568409221eae6e985fc138074d3 /desktop | |
| parent | convert LocationType to scoped enum (diff) | |
| download | core-d198a8221d4a1a08bb78ad083ff28136e3f65728.tar.gz core-d198a8221d4a1a08bb78ad083ff28136e3f65728.zip | |
convert InsertOperation to scoped enum
and drop unused LINK enumerator
Change-Id: I6c42424ae5a7503b3e14e5f04fcf7a49b595b416
Diffstat (limited to 'desktop')
5 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 35b6aa40ccf8..0254152a927a 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -604,7 +604,7 @@ bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update const OUString sTitle( StrTitle::getTitle( sourceContent ) ); if (destFolderContent.transferContent( - sourceContent, ::ucbhelper::InsertOperation_COPY, + sourceContent, ::ucbhelper::InsertOperation::Copy, sTitle, css::ucb::NameClash::OVERWRITE )) { //the user may have cancelled the dialog because downloading took to long diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 09ba8fe81dd0..8b9d18479847 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -636,7 +636,7 @@ OUString PackageManagerImpl::insertToActivationLayer( buf.makeStringAndClear(), xCmdEnv, m_xComponentContext ); } if (! destFolderContent.transferContent( - sourceContent, ::ucbhelper::InsertOperation_COPY, + sourceContent, ::ucbhelper::InsertOperation::Copy, title, NameClash::OVERWRITE )) throw RuntimeException( "UCB transferContent() failed!", nullptr ); @@ -747,7 +747,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( create_folder( &docFolderContent, m_context, xCmdEnv ); // copy into document, first: if (! docFolderContent.transferContent( - sourceContent, ::ucbhelper::InsertOperation_COPY, + sourceContent, ::ucbhelper::InsertOperation::Copy, OUString(), NameClash::ASK /* xxx todo: ASK not needed? */)) throw RuntimeException("UCB transferContent() failed!", nullptr ); diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index bc0f75170d5f..f2c1708f9478 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -430,7 +430,7 @@ void BackendImpl::initServiceRdbFiles() if (oldRDB.get().is()) { if (! cacheDir.transferContent( - oldRDB, ::ucbhelper::InsertOperation_COPY, + oldRDB, ::ucbhelper::InsertOperation::Copy, m_commonRDB, NameClash::OVERWRITE )) { @@ -451,7 +451,7 @@ void BackendImpl::initServiceRdbFiles() if (oldRDB.get().is()) { if (! cacheDir.transferContent( - oldRDB, ::ucbhelper::InsertOperation_COPY, + oldRDB, ::ucbhelper::InsertOperation::Copy, m_nativeRDB, NameClash::OVERWRITE )) throw RuntimeException( "UCB transferContent() failed!", nullptr ); } diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 2ef737c75ea1..0ce14491b972 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -545,7 +545,7 @@ void Package::exportTo( try { bOk = destFolder.transferContent( - sourceContent, ::ucbhelper::InsertOperation_COPY, + sourceContent, ::ucbhelper::InsertOperation::Copy, newTitle, nameClashAction); } catch (const css::ucb::ContentCreationException&) diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index e01901c1f17b..a487ec95e6b4 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1033,7 +1033,7 @@ void BackendImpl::PackageImpl::exportTo( xResultSet, UNO_QUERY_THROW )->queryContent(), xCmdEnv, getMyBackend()->getComponentContext() ); if (! destFolderContent.transferContent( - subContent, ::ucbhelper::InsertOperation_COPY, + subContent, ::ucbhelper::InsertOperation::Copy, OUString(), ucb::NameClash::OVERWRITE )) throw RuntimeException( "UCB transferContent() failed!", static_cast<OWeakObject *>(this) ); @@ -1141,7 +1141,7 @@ void BackendImpl::PackageImpl::exportTo( } if (metainfFolderContent.transferContent( - manifestContent, ::ucbhelper::InsertOperation_COPY, + manifestContent, ::ucbhelper::InsertOperation::Copy, OUString(), ucb::NameClash::OVERWRITE )) { bSuccess = true; |