diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-06 03:01:51 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-10 01:34:54 +0200 |
commit | 493ae7a6bb0c3ad50615db0090e7ae8d391bc327 (patch) | |
tree | 9f60f522f1ff9dde6a8131d155654f4d47b37fd0 /sfx2/source/appl | |
parent | 005f5db47b8e1bbd7ebddee92009be072e835fd5 (diff) |
replace usage of blacklist with denylist
.. and a few cases of instead doing blacklist->excludelist where that
made more sense.
Background and motivation:
https://tools.ietf.org/html/draft-knodel-terminology-02
[API CHANGE] officecfg::Office::Canvas::DeviceBlacklist -> DeviceDenylist
[API CHANGE] officecfg::Office::Canvas::BlacklistCurrentDevice -> DenylistCurrentDevice
[API CHANGE] officecfg::Office::Common::Misc::OpenCLBlackList -> OpenCLDenyList
Change-Id: Ia35e25496bf0cc0692d5de4cb66bfc232d3a869e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98180
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r-- | sfx2/source/appl/appopen.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/appl/appuno.cxx | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 4ecc4cf8814b..073f25121a1b 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -637,17 +637,17 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( pStandardDirItem ) sStandardDir = pStandardDirItem->GetValue(); - css::uno::Sequence< OUString > aBlackList; + css::uno::Sequence< OUString > aDenyList; - const SfxStringListItem* pBlackListItem = rReq.GetArg<SfxStringListItem>(SID_BLACK_LIST); - if ( pBlackListItem ) - pBlackListItem->GetStringList( aBlackList ); + const SfxStringListItem* pDenyListItem = rReq.GetArg<SfxStringListItem>(SID_DENY_LIST); + if ( pDenyListItem ) + pDenyListItem->GetStringList( aDenyList ); vcl::Window* pTopWindow = GetTopWindow(); ErrCode nErr = sfx2::FileOpenDialog_Impl(pTopWindow ? pTopWindow->GetFrameWeld() : nullptr, nDialogType, eDialogFlags, aURLList, - aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList); + aFilter, pSet, &aPath, nDialog, sStandardDir, aDenyList); if ( nErr == ERRCODE_ABORT ) { diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 7ac8358696be..7f0617a66c67 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -139,7 +139,7 @@ char const sNoAutoSave[] = "NoAutoSave"; char const sFolderName[] = "FolderName"; char const sUseSystemDialog[] = "UseSystemDialog"; char const sStandardDir[] = "StandardDir"; -char const sBlackList[] = "BlackList"; +char const sDenyList[] = "DenyList"; char const sModifyPasswordInfo[] = "ModifyPasswordInfo"; char const sSuggestedSaveAsDir[] = "SuggestedSaveAsDir"; char const sSuggestedSaveAsName[] = "SuggestedSaveAsName"; @@ -622,14 +622,14 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert if (bOK) rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) ); } - else if ( aName == sBlackList ) + else if ( aName == sDenyList ) { uno::Sequence<OUString> xVal; bool bOK = (rProp.Value >>= xVal); - DBG_ASSERT( bOK, "invalid type or value for BlackList" ); + DBG_ASSERT( bOK, "invalid type or value for DenyList" ); if (bOK) { - SfxStringListItem stringList(SID_BLACK_LIST); + SfxStringListItem stringList(SID_DENY_LIST); stringList.SetStringList( xVal ); rSet.Put( stringList ); } @@ -994,7 +994,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b nAdditional++; if ( rSet.GetItemState( SID_STANDARD_DIR ) == SfxItemState::SET ) nAdditional++; - if ( rSet.GetItemState( SID_BLACK_LIST ) == SfxItemState::SET ) + if ( rSet.GetItemState( SID_DENY_LIST ) == SfxItemState::SET ) nAdditional++; if ( rSet.GetItemState( SID_CONTENT ) == SfxItemState::SET ) nAdditional++; @@ -1207,7 +1207,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b continue; if ( nId == SID_STANDARD_DIR ) continue; - if ( nId == SID_BLACK_LIST ) + if ( nId == SID_DENY_LIST ) continue; if ( nId == SID_CONTENTTYPE ) continue; @@ -1539,9 +1539,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b pValue[nActProp].Name = sStandardDir; pValue[nActProp++].Value <<= static_cast<const SfxStringItem*>(pItem)->GetValue(); } - if ( rSet.GetItemState( SID_BLACK_LIST, false, &pItem ) == SfxItemState::SET ) + if ( rSet.GetItemState( SID_DENY_LIST, false, &pItem ) == SfxItemState::SET ) { - pValue[nActProp].Name = sBlackList; + pValue[nActProp].Name = sDenyList; css::uno::Sequence< OUString > aList; static_cast<const SfxStringListItem*>(pItem)->GetStringList( aList ); |