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 /sfx2 | |
| parent | 48d3f2505e0dfbd487a1041747f16f761e9c455e (diff) | |
convert InsertOperation to scoped enum
and drop unused LINK enumerator
Change-Id: I6c42424ae5a7503b3e14e5f04fcf7a49b595b416
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/printhelper.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 01da9338ec34..8b90a7a6595d 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2062,12 +2062,12 @@ void SfxMedium::Transfer_Impl() try { OUString aMimeType = pImpl->getFilterMimeType(); - ::ucbhelper::InsertOperation eOperation = ::ucbhelper::InsertOperation_COPY; + ::ucbhelper::InsertOperation eOperation = ::ucbhelper::InsertOperation::Copy; bool bMajor = false; OUString sComment; if ( IsInCheckIn( ) ) { - eOperation = ::ucbhelper::InsertOperation_CHECKIN; + eOperation = ::ucbhelper::InsertOperation::Checkin; const SfxBoolItem* pMajor = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_DOCINFO_MAJOR, false); bMajor = pMajor && pMajor->GetValue( ); const SfxStringItem* pComments = SfxItemSet::GetItem<SfxStringItem>(GetItemSet(), SID_DOCINFO_COMMENTS, false); @@ -2088,7 +2088,7 @@ void SfxMedium::Transfer_Impl() { if ( GetURLObject().isAnyKnownWebDAVScheme() && isTransferOK && - eOperation == ::ucbhelper::InsertOperation_COPY ) + eOperation == ::ucbhelper::InsertOperation::Copy ) { // tdf#95272 try to re-issue a lock command when a new file is created. // This may be needed because some WebDAV servers fail to implement the @@ -2171,7 +2171,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont { OUString sMimeType = pImpl->getFilterMimeType(); if( aBackupCont.transferContent( aOriginalContent, - ::ucbhelper::InsertOperation_COPY, + ::ucbhelper::InsertOperation::Copy, aBackupName, NameClash::OVERWRITE, sMimeType ) ) @@ -2260,7 +2260,7 @@ void SfxMedium::DoBackup_Impl() // do the transfer ( copy source file to backup dir ) OUString sMimeType = pImpl->getFilterMimeType(); bSuccess = aContent.transferContent( aSourceContent, - ::ucbhelper::InsertOperation_COPY, + ::ucbhelper::InsertOperation::Copy, aFileName, NameClash::OVERWRITE, sMimeType ); @@ -3407,7 +3407,7 @@ void SfxMedium::CreateTempFile( bool bReplace ) { ::ucbhelper::Content aTargetContent( aTmpURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), xComEnv, comphelper::getProcessComponentContext() ); OUString sMimeType = pImpl->getFilterMimeType(); - if ( aTargetContent.transferContent( pImpl->aContent, ::ucbhelper::InsertOperation_COPY, aFileName, NameClash::OVERWRITE, sMimeType ) ) + if ( aTargetContent.transferContent( pImpl->aContent, ::ucbhelper::InsertOperation::Copy, aFileName, NameClash::OVERWRITE, sMimeType ) ) { SetWritableForUserOnly( aTmpURL ); bTransferSuccess = true; @@ -3698,7 +3698,7 @@ OUString SfxMedium::CreateTempCopyWithExt( const OUString& aURL ) ::ucbhelper::Content aTargetContent( aDest.GetMainURL( INetURLObject::DecodeMechanism::NONE ), xComEnv, comphelper::getProcessComponentContext() ); ::ucbhelper::Content aSourceContent( aSource.GetMainURL( INetURLObject::DecodeMechanism::NONE ), xComEnv, comphelper::getProcessComponentContext() ); if ( aTargetContent.transferContent( aSourceContent, - ::ucbhelper::InsertOperation_COPY, + ::ucbhelper::InsertOperation::Copy, aFileName, NameClash::OVERWRITE ) ) { diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index ffe67b47f6df..0dfd449e4727 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1340,7 +1340,7 @@ bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUs Content aTargetContent( aUserPath, maCmdEnv, comphelper::getProcessComponentContext() ); Content aSourceContent( aTempURL, maCmdEnv, comphelper::getProcessComponentContext() ); aTargetContent.transferContent( aSourceContent, - InsertOperation_COPY, + InsertOperation::Copy, "groupuinames.xml", ucb::NameClash::OVERWRITE, "text/xml" ); @@ -1980,7 +1980,7 @@ bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, try { if( ! aTargetGroup.transferContent( aSourceContent, - InsertOperation_COPY, + InsertOperation::Copy, aNewTemplateTargetName, NameClash::OVERWRITE, aType ) ) diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index c9dbf27e957a..f217aa73d642 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -550,7 +550,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread aTarget.transferContent( aSource, - ::ucbhelper::InsertOperation_COPY, + ::ucbhelper::InsertOperation::Copy, OUString(sFileName), css::ucb::NameClash::OVERWRITE); } |