vcl/inc/graphic/GraphicFormatDetector.hxx | 64 +++++++++---------
vcl/source/filter/FilterConfigCache.cxx | 106 +++++++++++++++---------------
vcl/source/filter/FilterConfigCache.hxx | 2
3 files changed, 85 insertions(+), 87 deletions(-)
New commits:
commit 8701b4fd4ea9a006c97207bd542dd072f6a92b41
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 9 11:44:06 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 12 20:26:08 2024 +0200
replace createFromAscii with OUString literals in FilterConfigCache
Change-Id: I31a16e4b709955cb01d6aebaf169d40f71f7ea09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167551
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/vcl/source/filter/FilterConfigCache.cxx
b/vcl/source/filter/FilterConfigCache.cxx
index 85020ec607a4..56541992dc5d 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -192,66 +192,66 @@ void FilterConfigCache::ImplInit()
}
};
-const char* FilterConfigCache::InternalFilterListForSvxLight[] =
-{
- "bmp","1","SVBMP",
- "bmp","2","SVBMP",
- "dxf","1","SVDXF",
- "eps","1","SVIEPS",
- "eps","2","SVEEPS",
- "gif","1","SVIGIF",
- "gif","2","SVEGIF",
- "jpg","1","SVIJPEG",
- "jpg","2","SVEJPEG",
- "mov","1","SVMOV",
- "mov","2","SVMOV",
- "met","1","SVMET",
- "png","1","SVIPNG",
- "png","2","SVEPNG",
- "pct","1","SVPICT",
- "pcd","1","SVPCD",
- "psd","1","SVPSD",
- "pcx","1","SVPCX",
- "pbm","1","SVPBM",
- "pgm","1","SVPBM",
- "ppm","1","SVPBM",
- "ras","1","SVRAS",
- "svm","1","SVMETAFILE",
- "svm","2","SVMETAFILE",
- "tga","1","SVTGA",
- "tif","1","SVTIFF",
- "tif","2","SVTIFF",
- "emf","1","SVEMF",
- "emf","2","SVEMF",
- "wmf","1","SVWMF",
- "wmf","2","SVWMF",
- "xbm","1","SVIXBM",
- "xpm","1","SVIXPM",
- "svg","1","SVISVG",
- "svg","2","SVESVG",
- "webp","1","SVIWEBP",
- "webp","2","SVEWEBP",
- nullptr
+namespace {
+struct FilterEntry
+{
+ OUString sExtension;
+ sal_Int32 nFlags;
+ OUString sUserData;
+};
+}
+constexpr FilterEntry InternalFilterListForSvxLight[]
+{
+ { u"bmp"_ustr, 1, u"SVBMP"_ustr },
+ { u"bmp"_ustr, 2, u"SVBMP"_ustr },
+ { u"dxf"_ustr, 1, u"SVDXF"_ustr },
+ { u"eps"_ustr, 1, u"SVIEPS"_ustr },
+ { u"eps"_ustr, 2, u"SVEEPS"_ustr },
+ { u"gif"_ustr, 1, u"SVIGIF"_ustr },
+ { u"gif"_ustr, 2, u"SVEGIF"_ustr },
+ { u"jpg"_ustr, 1, u"SVIJPEG"_ustr },
+ { u"jpg"_ustr, 2, u"SVEJPEG"_ustr },
+ { u"mov"_ustr, 1, u"SVMOV"_ustr },
+ { u"mov"_ustr, 2, u"SVMOV"_ustr },
+ { u"met"_ustr, 1, u"SVMET"_ustr },
+ { u"png"_ustr, 1, u"SVIPNG"_ustr },
+ { u"png"_ustr, 2, u"SVEPNG"_ustr },
+ { u"pct"_ustr, 1, u"SVPICT"_ustr },
+ { u"pcd"_ustr, 1, u"SVPCD"_ustr },
+ { u"psd"_ustr, 1, u"SVPSD"_ustr },
+ { u"pcx"_ustr, 1, u"SVPCX"_ustr },
+ { u"pbm"_ustr, 1, u"SVPBM"_ustr },
+ { u"pgm"_ustr, 1, u"SVPBM"_ustr },
+ { u"ppm"_ustr, 1, u"SVPBM"_ustr },
+ { u"ras"_ustr, 1, u"SVRAS"_ustr },
+ { u"svm"_ustr, 1, u"SVMETAFILE"_ustr },
+ { u"svm"_ustr, 2, u"SVMETAFILE"_ustr },
+ { u"tga"_ustr, 1, u"SVTGA"_ustr },
+ { u"tif"_ustr, 1, u"SVTIFF"_ustr },
+ { u"tif"_ustr, 2, u"SVTIFF"_ustr },
+ { u"emf"_ustr, 1, u"SVEMF"_ustr },
+ { u"emf"_ustr, 2, u"SVEMF"_ustr },
+ { u"wmf"_ustr, 1, u"SVWMF"_ustr },
+ { u"wmf"_ustr, 2, u"SVWMF"_ustr },
+ { u"xbm"_ustr, 1, u"SVIXBM"_ustr },
+ { u"xpm"_ustr, 1, u"SVIXPM"_ustr },
+ { u"svg"_ustr, 1, u"SVISVG"_ustr },
+ { u"svg"_ustr, 2, u"SVESVG"_ustr },
+ { u"webp"_ustr, 1, u"SVIWEBP"_ustr },
+ { u"webp"_ustr, 2, u"SVEWEBP"_ustr },
};
void FilterConfigCache::ImplInitSmart()
{
- const char** pPtr;
- for ( pPtr = InternalFilterListForSvxLight; *pPtr; pPtr++ )
+ for ( const FilterEntry& rEntry : InternalFilterListForSvxLight )
{
FilterConfigCacheEntry aEntry;
- OUString sExtension( OUString::createFromAscii( *pPtr++ ) );
-
- aEntry.lExtensionList.push_back(sExtension);
-
- aEntry.sType = sExtension;
- aEntry.sUIName = sExtension;
-
- aEntry.nFlags = o3tl::toInt32(std::string_view(*pPtr++));
-
- OUString sUserData( OUString::createFromAscii( *pPtr ) );
- aEntry.CreateFilterName( sUserData );
+ aEntry.lExtensionList.push_back(rEntry.sExtension);
+ aEntry.sType = rEntry.sExtension;
+ aEntry.sUIName = rEntry.sExtension;
+ aEntry.nFlags = rEntry.nFlags;
+ aEntry.CreateFilterName( rEntry.sUserData );
if ( aEntry.nFlags & 1 )
aImport.push_back( aEntry );
diff --git a/vcl/source/filter/FilterConfigCache.hxx
b/vcl/source/filter/FilterConfigCache.hxx
index 95e52d80ecaf..84830283b11d 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -51,8 +51,6 @@ class FilterConfigCache
std::vector< FilterConfigCacheEntry > aImport;
std::vector< FilterConfigCacheEntry > aExport;
- static const char* InternalFilterListForSvxLight[];
-
void ImplInit();
void ImplInitSmart();
commit a25333429d2800cd42db866346afbdbed9741c12
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 9 11:35:41 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 12 20:25:54 2024 +0200
replace createFromAscii with OUString literals in getImportFormatShortName
Change-Id: I3f62ea563af8e2c9aa5ed558370b49f05804c632
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167550
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx
b/vcl/inc/graphic/GraphicFormatDetector.hxx
index f2c859d5ab10..5940f3e8ea78 100644
--- a/vcl/inc/graphic/GraphicFormatDetector.hxx
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -27,105 +27,105 @@ namespace vcl
{
static inline OUString getImportFormatShortName(GraphicFileFormat nFormat)
{
- const char* pKeyName = nullptr;
+ OUString aKeyName;
switch (nFormat)
{
case GraphicFileFormat::BMP:
- pKeyName = "BMP";
+ aKeyName = u"BMP"_ustr;
break;
case GraphicFileFormat::GIF:
- pKeyName = "GIF";
+ aKeyName = u"GIF"_ustr;
break;
case GraphicFileFormat::JPG:
- pKeyName = "JPG";
+ aKeyName = u"JPG"_ustr;
break;
case GraphicFileFormat::PCD:
- pKeyName = "PCD";
+ aKeyName = u"PCD"_ustr;
break;
case GraphicFileFormat::PCX:
- pKeyName = "PCX";
+ aKeyName = u"PCX"_ustr;
break;
case GraphicFileFormat::PNG:
- pKeyName = "PNG";
+ aKeyName = u"PNG"_ustr;
break;
case GraphicFileFormat::APNG:
- pKeyName = "APNG";
+ aKeyName = u"APNG"_ustr;
break;
case GraphicFileFormat::XBM:
- pKeyName = "XBM";
+ aKeyName = u"XBM"_ustr;
break;
case GraphicFileFormat::XPM:
- pKeyName = "XPM";
+ aKeyName = u"XPM"_ustr;
break;
case GraphicFileFormat::PBM:
- pKeyName = "PBM";
+ aKeyName = u"PBM"_ustr;
break;
case GraphicFileFormat::PGM:
- pKeyName = "PGM";
+ aKeyName = u"PGM"_ustr;
break;
case GraphicFileFormat::PPM:
- pKeyName = "PPM";
+ aKeyName = u"PPM"_ustr;
break;
case GraphicFileFormat::RAS:
- pKeyName = "RAS";
+ aKeyName = u"RAS"_ustr;
break;
case GraphicFileFormat::TGA:
- pKeyName = "TGA";
+ aKeyName = u"TGA"_ustr;
break;
case GraphicFileFormat::PSD:
- pKeyName = "PSD";
+ aKeyName = u"PSD"_ustr;
break;
case GraphicFileFormat::EPS:
- pKeyName = "EPS";
+ aKeyName = u"EPS"_ustr;
break;
case GraphicFileFormat::TIF:
- pKeyName = "TIF";
+ aKeyName = u"TIF"_ustr;
break;
case GraphicFileFormat::DXF:
- pKeyName = "DXF";
+ aKeyName = u"DXF"_ustr;
break;
case GraphicFileFormat::MET:
- pKeyName = "MET";
+ aKeyName = u"MET"_ustr;
break;
case GraphicFileFormat::PCT:
- pKeyName = "PCT";
+ aKeyName = u"PCT"_ustr;
break;
case GraphicFileFormat::SVM:
- pKeyName = "SVM";
+ aKeyName = u"SVM"_ustr;
break;
case GraphicFileFormat::WMF:
- pKeyName = "WMF";
+ aKeyName = u"WMF"_ustr;
break;
case GraphicFileFormat::EMF:
- pKeyName = "EMF";
+ aKeyName = u"EMF"_ustr;
break;
case GraphicFileFormat::SVG:
- pKeyName = "SVG";
+ aKeyName = u"SVG"_ustr;
break;
case GraphicFileFormat::WMZ:
- pKeyName = "WMZ";
+ aKeyName = u"WMZ"_ustr;
break;
case GraphicFileFormat::EMZ:
- pKeyName = "EMZ";
+ aKeyName = u"EMZ"_ustr;
break;
case GraphicFileFormat::SVGZ:
- pKeyName = "SVGZ";
+ aKeyName = u"SVGZ"_ustr;
break;
case GraphicFileFormat::WEBP:
- pKeyName = "WEBP";
+ aKeyName = u"WEBP"_ustr;
break;
case GraphicFileFormat::MOV:
- pKeyName = "MOV";
+ aKeyName = u"MOV"_ustr;
break;
case GraphicFileFormat::PDF:
- pKeyName = "PDF";
+ aKeyName = u"PDF"_ustr;
break;
default:
assert(false);
}
- return OUString::createFromAscii(pKeyName);
+ return aKeyName;
}
/***
* This function is has two modes:
