vcl/win/dtrans/ftransl.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
New commits: commit 613686774b2a6f10bbcf8ecd5636ef62a0668d52 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Nov 8 16:54:56 2025 +0200 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Nov 8 17:42:26 2025 +0100 Use std::array instead of std::vector Change-Id: I6f9d69df328c83135a7adb491fc2c7418a75a2e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193632 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/vcl/win/dtrans/ftransl.cxx b/vcl/win/dtrans/ftransl.cxx index 72636244e5e9..062ca45adbac 100644 --- a/vcl/win/dtrans/ftransl.cxx +++ b/vcl/win/dtrans/ftransl.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <array> #include <string_view> #include <o3tl/string_view.hxx> @@ -93,7 +94,7 @@ FormatEntry::FormatEntry( // format number we can stop if we find the first // CF_INVALID -const std::vector< FormatEntry > g_TranslTable { +const std::array g_TranslTable { //SotClipboardFormatId::DIF FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT), // SotClipboardFormatId::BITMAP @@ -362,7 +363,7 @@ void findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& standard clipboard format id appear before the other entries with CF_INVALID */ - std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + auto citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aStandardFormatId](const FormatEntry& rEntry) { return rEntry.aStandardFormatId == aStandardFormatId || rEntry.aStandardFormatId == CF_INVALID; @@ -373,7 +374,7 @@ void findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& void findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, DataFlavor& aDataFlavor ) { - std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + auto citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aNativeFormatName](const FormatEntry& rEntry) { return aNativeFormatName.equalsIgnoreAsciiCase(rEntry.aNativeFormatName); }); if (citer != g_TranslTable.end()) @@ -394,7 +395,7 @@ void findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny ) void setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, Any& aAny ) { - std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + auto citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aNativeFormatName](const FormatEntry& rEntry) { return aNativeFormatName.equalsIgnoreAsciiCase(rEntry.aNativeFormatName) && (CF_INVALID != rEntry.aStandardFormatId); @@ -408,7 +409,7 @@ void findStdFormatIdOrNativeFormatNameForFullMediaType( const OUString& aFullMediaType, Any& aAny ) { - std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + auto citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aRefXMimeFactory, &aFullMediaType](const FormatEntry& rEntry) { Reference<XMimeContentType> refXMime( aRefXMimeFactory->createMimeContentType(rEntry.aDataFlavor.MimeType) ); return aFullMediaType.equalsIgnoreAsciiCase(refXMime->getFullMediaType());
