diff options
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/lib/init.cxx | 4 | ||||
-rw-r--r-- | desktop/source/lib/lokclipboard.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index ddbdeaa4e5ba..416b42f3ce04 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1100,7 +1100,7 @@ void CallbackFlushHandler::queue(const int type, const char* data) { // if we have to invalidate all of the window, ignore // any part invalidation message - const auto& pos = std::find_if(m_queue.rbegin(), m_queue.rend(), + auto invAllExist = std::any_of(m_queue.rbegin(), m_queue.rend(), [&nLOKWindowId] (const queue_type::value_type& elem) { if (elem.first != LOK_CALLBACK_WINDOW) @@ -1120,7 +1120,7 @@ void CallbackFlushHandler::queue(const int type, const char* data) }); // we found a invalidate-all window callback - if (pos != m_queue.rend()) + if (invAllExist) { SAL_INFO("lok.dialog", "Skipping queue [" << type << "]: [" << payload << "] since whole window needs to be invalidated."); return; diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index 592bd29af608..091bd47d35db 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -74,10 +74,10 @@ uno::Sequence<datatransfer::DataFlavor> SAL_CALL LOKTransferable::getTransferDat sal_Bool SAL_CALL LOKTransferable::isDataFlavorSupported(const datatransfer::DataFlavor& rFlavor) { const std::vector<datatransfer::DataFlavor> aFlavors = getTransferDataFlavorsAsVector(); - return std::find_if(aFlavors.begin(), aFlavors.end(), [&rFlavor](const datatransfer::DataFlavor& i) + return std::any_of(aFlavors.begin(), aFlavors.end(), [&rFlavor](const datatransfer::DataFlavor& i) { return i.MimeType == rFlavor.MimeType && i.DataType == rFlavor.DataType; - }) != aFlavors.end(); + }); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |