diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 15:38:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-24 18:04:26 +0200 |
| commit | 10277e2be5b132ea52a64ed987c23050ac74d18c (patch) | |
| tree | 6c3233533a1d6264c8ac81bbd9c078e52e9784b1 /sfx2 | |
| parent | c5dcf48789d705d1b842e45d7c22cb38e477307c (diff) | |
use officecfg to retrieve SaveRelInet
Change-Id: Ife062fabdfc95253c71388ca9594b1530bc40783
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119455
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index c540a6059e76..ae9b8c7a86fc 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -257,8 +257,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) case SID_SAVEREL_INET : { bRet = true; - if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::SaveRelInet)) - if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), aSaveOptions.IsSaveRelINet() ))) + if (!officecfg::Office::Common::Save::URL::Internet::isReadOnly()) + if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), + officecfg::Office::Common::Save::URL::Internet::get() ))) bRet = false; } break; @@ -527,7 +528,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_INET), true, &pItem)) { DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr, "BoolItem expected"); - aSaveOptions.SetSaveRelINet(static_cast<const SfxBoolItem *>(pItem)->GetValue()); + officecfg::Office::Common::Save::URL::Internet::set( + static_cast<const SfxBoolItem *>(pItem)->GetValue(), + batch); } // SaveRelFSys diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 9497d3a144b0..c8d1ab4bcc63 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -640,9 +640,8 @@ OUString SfxMedium::GetBaseURL( bool bForSaving ) if ( bForSaving ) { - SvtSaveOptions aOpt; bool bIsRemote = IsRemote(); - if( (bIsRemote && !aOpt.IsSaveRelINet()) + if( (bIsRemote && !officecfg::Office::Common::Save::URL::Internet::get()) || (!pImpl->m_bRemote && !officecfg::Office::Common::Save::URL::FileSystem::get()) ) return OUString(); } |