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 /fpicker | |
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 'fpicker')
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 12 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.hxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 12 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 6 | ||||
-rw-r--r-- | fpicker/source/office/asyncfilepicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/asyncfilepicker.hxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/contentenumeration.cxx | 12 | ||||
-rw-r--r-- | fpicker/source/office/contentenumeration.hxx | 6 | ||||
-rw-r--r-- | fpicker/source/office/fileview.cxx | 20 | ||||
-rw-r--r-- | fpicker/source/office/fileview.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/foldertree.cxx | 6 | ||||
-rw-r--r-- | fpicker/source/office/foldertree.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/fpdialogbase.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 10 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.hxx | 6 |
16 files changed, 57 insertions, 57 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 2c813d64c013..f9e4d74d2839 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -443,7 +443,7 @@ std::shared_ptr<SvtFileDialog_Base> SvtFilePicker::implCreateDialog( weld::Windo { OUString sStandardDir = m_aStandardDir; dialog->SetStandardDir( sStandardDir ); - dialog->SetBlackList( m_aBlackList ); + dialog->SetDenyList( m_aDenyList ); } return dialog; @@ -983,9 +983,9 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) m_aStandardDir = sStandardDir; } } - else if ( namedValue.Name == "BlackList" ) + else if ( namedValue.Name == "DenyList" ) { - namedValue.Value >>= m_aBlackList; + namedValue.Value >>= m_aDenyList; } } } @@ -1010,9 +1010,9 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co return true; } - if ( _rName == "BlackList" ) + if ( _rName == "DenyList" ) { - OSL_VERIFY( _rValue >>= m_aBlackList ); + OSL_VERIFY( _rValue >>= m_aDenyList ); return true; } @@ -1079,7 +1079,7 @@ std::shared_ptr<SvtFileDialog_Base> SvtRemoteFilePicker::implCreateDialog(weld:: { OUString sStandardDir = m_aStandardDir; dialog->SetStandardDir( sStandardDir ); - dialog->SetBlackList( m_aBlackList ); + dialog->SetDenyList( m_aDenyList ); } return dialog; diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 7e9dc4f70520..3863bf1d5168 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -75,7 +75,7 @@ protected: OUString m_aStandardDir; css::uno::Sequence< OUString > - m_aBlackList; + m_aDenyList; css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index fcbd203b536b..ea151bb9b8ff 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -362,7 +362,7 @@ void RemoteFilesDialog::OpenURL( OUString const & sURL ) m_pCurrentAsyncAction = new AsyncPickerAction( this, m_xFileView.get(), AsyncPickerAction::Action::eOpenURL ); // -1 timeout - sync - m_pCurrentAsyncAction->execute( sURL, sFilter, -1, -1, GetBlackList() ); + m_pCurrentAsyncAction->execute( sURL, sFilter, -1, -1, GetDenyList() ); if( m_eMode != REMOTEDLG_MODE_SAVE ) m_xName_ed->set_text( "" ); @@ -929,15 +929,15 @@ void RemoteFilesDialog::SetHasFilename( bool ) { } -void RemoteFilesDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) +void RemoteFilesDialog::SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) { - m_aBlackList = rBlackList; - m_xTreeView->SetBlackList( rBlackList ); + m_aDenyList = rDenyList; + m_xTreeView->SetDenyList( rDenyList ); } -const css::uno::Sequence< OUString >& RemoteFilesDialog::GetBlackList() const +const css::uno::Sequence< OUString >& RemoteFilesDialog::GetDenyList() const { - return m_aBlackList; + return m_aDenyList; } void RemoteFilesDialog::SetStandardDir( const OUString& rStdDir ) diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 6a80bc849f70..64ae56412b5f 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -61,8 +61,8 @@ public: virtual SvtFileView* GetView() override; virtual void SetHasFilename( bool ) override; - virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override; - virtual const css::uno::Sequence< OUString >& GetBlackList() const override; + virtual void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) override; + virtual const css::uno::Sequence< OUString >& GetDenyList() const override; virtual void SetStandardDir( const OUString& rStdDir ) override; virtual const OUString& GetStandardDir() const override; virtual void SetPath( const OUString& rNewURL ) override; @@ -121,7 +121,7 @@ private: ::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction; - css::uno::Sequence< OUString > m_aBlackList; + css::uno::Sequence< OUString > m_aDenyList; std::unique_ptr<weld::Button> m_xOk_btn; std::unique_ptr<weld::Button> m_xCancel_btn; diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx index 4dc64af3d4eb..349d586b8979 100644 --- a/fpicker/source/office/asyncfilepicker.cxx +++ b/fpicker/source/office/asyncfilepicker.cxx @@ -61,7 +61,7 @@ namespace svt const OUString& _rFilter, sal_Int32 _nMinTimeout, sal_Int32 _nMaxTimeout, - const css::uno::Sequence< OUString >& rBlackList ) + const css::uno::Sequence< OUString >& rDenyList ) { DBG_TESTSOLARMUTEX(); // if this asserts, we'd need to have an own mutex per instance @@ -95,7 +95,7 @@ namespace svt break; case eOpenURL: - eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get(), rBlackList ); + eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get(), rDenyList ); break; case eExecuteFilter: diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index 830577f626d5..d644f88946e9 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -72,7 +72,7 @@ namespace svt const OUString& _rFilter, sal_Int32 _nMinTimeout, sal_Int32 _nMaxTimeout, - const css::uno::Sequence< OUString >& rBlackList ); + const css::uno::Sequence< OUString >& rDenyList ); /// cancels the running action void cancel(); diff --git a/fpicker/source/office/contentenumeration.cxx b/fpicker/source/office/contentenumeration.cxx index 2ca057036a64..090d19a47988 100644 --- a/fpicker/source/office/contentenumeration.cxx +++ b/fpicker/source/office/contentenumeration.cxx @@ -82,7 +82,7 @@ namespace svt ,m_xCommandEnv ( _rxCommandEnv ) ,m_pResultHandler ( nullptr ) ,m_bCancelled ( false ) - ,m_rBlackList ( css::uno::Sequence< OUString >() ) + ,m_rDenyList ( css::uno::Sequence< OUString >() ) { } @@ -104,13 +104,13 @@ namespace svt EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync( const FolderDescriptor& _rFolder, - const css::uno::Sequence< OUString >& rBlackList ) + const css::uno::Sequence< OUString >& rDenyList ) { { ::osl::MutexGuard aGuard( m_aMutex ); m_aFolder = _rFolder; m_pResultHandler = nullptr; - m_rBlackList = rBlackList; + m_rDenyList = rDenyList; } return enumerateFolderContent(); } @@ -220,7 +220,7 @@ namespace svt // check for restrictions { ::osl::MutexGuard aGuard( m_aMutex ); - if ( /* m_rBlackList.hasElements() && */ URLOnBlackList ( sRealURL ) ) + if ( /* m_rDenyList.hasElements() && */ URLOnDenyList ( sRealURL ) ) continue; } @@ -310,11 +310,11 @@ namespace svt } - bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL ) + bool FileViewContentEnumerator::URLOnDenyList ( const OUString& sRealURL ) { OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 ); - return comphelper::findValue(m_rBlackList, entryName) != -1; + return comphelper::findValue(m_rDenyList, entryName) != -1; } diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx index 920a6d8f2b08..f6a48c5c3360 100644 --- a/fpicker/source/office/contentenumeration.hxx +++ b/fpicker/source/office/contentenumeration.hxx @@ -167,9 +167,9 @@ namespace svt IEnumerationResultHandler* m_pResultHandler; bool m_bCancelled; - css::uno::Sequence< OUString > m_rBlackList; + css::uno::Sequence< OUString > m_rDenyList; - bool URLOnBlackList ( const OUString& sRealURL ); + bool URLOnDenyList ( const OUString& sRealURL ); public: /** constructs an enumerator instance @@ -205,7 +205,7 @@ namespace svt */ EnumerationResult enumerateFolderContentSync( const FolderDescriptor& _rFolder, - const css::uno::Sequence< OUString >& rBlackList + const css::uno::Sequence< OUString >& rDenyList ); /** cancels the running operation. diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index 57269cc72011..0003305fccc8 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -288,12 +288,12 @@ public: FileViewResult GetFolderContent_Impl( const OUString& rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const css::uno::Sequence< OUString >& rBlackList ); + const css::uno::Sequence< OUString >& rDenyList ); FileViewResult GetFolderContent_Impl( const FolderDescriptor& _rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const css::uno::Sequence< OUString >& rBlackList ); + const css::uno::Sequence< OUString >& rDenyList ); void FilterFolderContent_Impl( const OUString &rFilter ); void CancelRunningAsyncAction(); @@ -879,7 +879,7 @@ FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDesc OUString sParentURL; if ( GetParentURL( sParentURL ) ) - eResult = Initialize( sParentURL, mpImpl->maCurrentFilter, pAsyncDescriptor, maBlackList ); + eResult = Initialize( sParentURL, mpImpl->maCurrentFilter, pAsyncDescriptor, maDenyList ); return eResult; } @@ -931,10 +931,10 @@ FileViewResult SvtFileView::Initialize( const OUString& rURL, const OUString& rFilter, const FileViewAsyncAction* pAsyncDescriptor, - const css::uno::Sequence< OUString >& rBlackList ) + const css::uno::Sequence< OUString >& rDenyList ) { weld::WaitObject aWaitCursor(mpImpl->m_pTopLevel); - maBlackList = rBlackList; + maDenyList = rDenyList; OUString sPushURL( mpImpl->maViewURL ); @@ -963,7 +963,7 @@ FileViewResult SvtFileView::ExecuteFilter( const OUString& rFilter, const FileVi mpImpl->maCurrentFilter = rFilter.toAsciiLowerCase(); mpImpl->Clear(); - FileViewResult eResult = mpImpl->GetFolderContent_Impl(mpImpl->maViewURL, pAsyncDescriptor, maBlackList); + FileViewResult eResult = mpImpl->GetFolderContent_Impl(mpImpl->maViewURL, pAsyncDescriptor, maDenyList); OSL_ENSURE( ( eResult != eStillRunning ) || pAsyncDescriptor, "SvtFileView::ExecuteFilter: we told it to read synchronously!" ); return eResult; } @@ -1167,7 +1167,7 @@ void SvtFileView_Impl::Clear() FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const OUString& rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const css::uno::Sequence< OUString >& rBlackList ) + const css::uno::Sequence< OUString >& rDenyList ) { ::osl::ClearableMutexGuard aGuard( maMutex ); INetURLObject aFolderObj( rFolder ); @@ -1176,13 +1176,13 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( FolderDescriptor aFolder( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); aGuard.clear(); - return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rBlackList ); + return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rDenyList ); } FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const FolderDescriptor& _rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const css::uno::Sequence< OUString >& rBlackList ) + const css::uno::Sequence< OUString >& rDenyList ) { DBG_TESTSOLARMUTEX(); ::osl::ClearableMutexGuard aGuard( maMutex ); @@ -1194,7 +1194,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( if ( !pAsyncDescriptor ) { - ::svt::EnumerationResult eResult = m_xContentEnumerator->enumerateFolderContentSync( _rFolder, rBlackList ); + ::svt::EnumerationResult eResult = m_xContentEnumerator->enumerateFolderContentSync( _rFolder, rDenyList ); if ( ::svt::EnumerationResult::SUCCESS == eResult ) { implEnumerationSuccess(); diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx index 9bf4dca06e0f..19c22391e7fb 100644 --- a/fpicker/source/office/fileview.hxx +++ b/fpicker/source/office/fileview.hxx @@ -63,7 +63,7 @@ class SvtFileView { private: std::unique_ptr<SvtFileView_Impl> mpImpl; - css::uno::Sequence<OUString> maBlackList; + css::uno::Sequence<OUString> maDenyList; DECL_LINK(HeaderSelect_Impl, int, void); @@ -107,7 +107,7 @@ public: const OUString& rFolderURL, const OUString& rFilter, const FileViewAsyncAction* pAsyncDescriptor, - const css::uno::Sequence< OUString >& rBlackList + const css::uno::Sequence< OUString >& rDenyList ); /** reads the current content of the current folder again, and applies the given filter to it diff --git a/fpicker/source/office/foldertree.cxx b/fpicker/source/office/foldertree.cxx index 9e618bd9d0b9..49007c982b3d 100644 --- a/fpicker/source/office/foldertree.cxx +++ b/fpicker/source/office/foldertree.cxx @@ -74,7 +74,7 @@ void FolderTree::FillTreeEntry(const weld::TreeIter& rEntry) FolderDescriptor aFolder(sURL); EnumerationResult eResult = - xContentEnumerator->enumerateFolderContentSync( aFolder, m_aBlackList ); + xContentEnumerator->enumerateFolderContentSync( aFolder, m_aDenyList ); if (EnumerationResult::SUCCESS == eResult) { @@ -169,9 +169,9 @@ void FolderTree::SetTreePath( OUString const & sUrl ) } } -void FolderTree::SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) +void FolderTree::SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) { - m_aBlackList = rBlackList; + m_aDenyList = rDenyList; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/foldertree.hxx b/fpicker/source/office/foldertree.hxx index aaa79bbf2635..da888e332308 100644 --- a/fpicker/source/office/foldertree.hxx +++ b/fpicker/source/office/foldertree.hxx @@ -27,7 +27,7 @@ private: weld::Window* m_pTopLevel; Reference< XCommandEnvironment > m_xEnv; ::osl::Mutex m_aMutex; - Sequence< OUString > m_aBlackList; + Sequence< OUString > m_aDenyList; OUString m_sLastUpdatedDir; @@ -44,7 +44,7 @@ public: void FillTreeEntry(const weld::TreeIter& rEntry); void FillTreeEntry(const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders); void SetTreePath(OUString const & sUrl); - void SetBlackList(const css::uno::Sequence< OUString >& rBlackList); + void SetDenyList(const css::uno::Sequence< OUString >& rDenyList); }; #endif diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx index 5176e626c861..21a8302549d0 100644 --- a/fpicker/source/office/fpdialogbase.hxx +++ b/fpicker/source/office/fpdialogbase.hxx @@ -70,8 +70,8 @@ public: virtual SvtFileView* GetView() = 0; virtual void SetHasFilename( bool bHasFilename ) = 0; - virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) = 0; - virtual const css::uno::Sequence< OUString >& GetBlackList() const = 0; + virtual void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) = 0; + virtual const css::uno::Sequence< OUString >& GetDenyList() const = 0; virtual void SetStandardDir( const OUString& rStdDir ) = 0; virtual const OUString& GetStandardDir() const = 0; virtual void SetPath( const OUString& rNewURL ) = 0; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index d2dcef40a313..bfec874b9326 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1630,7 +1630,7 @@ void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action eAction, m_aConfiguration.getNodeValue( OUString( "Timeout/Max" ) ) >>= nMaxTimeout; m_bInExecuteAsync = true; - m_pCurrentAsyncAction->execute(rURL, rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout, GetBlackList()); + m_pCurrentAsyncAction->execute(rURL, rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout, GetDenyList()); m_bInExecuteAsync = false; } @@ -1662,15 +1662,15 @@ void SvtFileDialog::SetStandardDir( const OUString& rStdDir ) m_xImpl->SetStandardDir( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); } -void SvtFileDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) +void SvtFileDialog::SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) { - m_xImpl->SetBlackList( rBlackList ); + m_xImpl->SetDenyList( rDenyList ); } -const css::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const +const css::uno::Sequence< OUString >& SvtFileDialog::GetDenyList() const { - return m_xImpl->GetBlackList(); + return m_xImpl->GetDenyList(); } diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index fbca0a7711af..12f1d1bd7ca2 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -160,8 +160,8 @@ public: void FileSelect(); void FilterSelect() override; - void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override; - const css::uno::Sequence< OUString >& GetBlackList() const override; + void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) override; + const css::uno::Sequence< OUString >& GetDenyList() const override; void SetStandardDir( const OUString& rStdDir ) override; const OUString& GetStandardDir() const override; std::vector<OUString> GetPathList() const override; // for MultiSelection diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 5546e4dd47d4..0d074f1f610b 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -107,7 +107,7 @@ private: const SvtFileDialogFilter_Impl* m_pCurFilter; OUString m_sCurrentFilterDisplayName; // may differ from m_pCurFilter->GetName in case it is a cached entry - css::uno::Sequence< OUString > m_aBlackList; + css::uno::Sequence< OUString > m_aDenyList; public: SvtFileDialogFilterList_Impl m_aFilter; @@ -156,8 +156,8 @@ public: explicit SvtExpFileDlg_Impl(); ~SvtExpFileDlg_Impl(); - void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { m_aBlackList = rBlackList; } - const css::uno::Sequence< OUString >& GetBlackList() const { return m_aBlackList; } + void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) { m_aDenyList = rDenyList; } + const css::uno::Sequence< OUString >& GetDenyList() const { return m_aDenyList; } void SetStandardDir( const OUString& rDir ); const OUString& GetStandardDir() const { return m_aStdDir; } |