summaryrefslogtreecommitdiff
path: root/vcl/inc/font
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-10-01 09:09:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-10-11 14:22:22 +0200
commit4f5b3e4bd53d6d61df1f65f496f7bc8dc525c8a1 (patch)
treee0ac44b8f22f944f3303bac8e494da41d6c7b164 /vcl/inc/font
parent5f84c44e3d5ff19b800b6358e61228546e318d4f (diff)
In O[U]StringBuffer, make string_view params replacements for OUString ones
...for LIBO_INTERNAL_ONLY, instead of having them as additional overloads. That way, loplugin:bufferadd and loplugin:stringviewparam found many further opportunities for simplification (all addressed here). Some notes: * There is no longer an implicit conversion from O[U]String to O[U]StringBuffer (as that goes via user-defined conversions through string_view now), which was most noticeable in copy initializations like OStringBuffer buf = someStr; that had to be changed to direct initialization, OStringBuffer buf(someStr); But then again, it wasn't too many places that were affected and I think we can live with that. * I made the O[U]StringBuffer ctors taking string_view non-explicit, mainly to get them in line with their counterparts taking O[U]String. * I added an OUStringBuffer::lastIndexOf string_view overload that was missing (relative to OUStringBuffer::indexOf). * loplugin:stringconstant needed some addition to keep the compilerplugins/clang/test/stringconstant.cxx checks related to OStringBuffer::append and OStringBuffer::insert working. * loplugin:stringviewparam no longer needs the special O[U]StringBuffer-related code that had been introduced in 1250aecd71fabde4dba990bfceb61bbe8e06b8ea "loplugin:stringviewparam extend to new.." Change-Id: Ib1bb8c4632d99b744e742605a9fef6eae959fd72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122904 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/inc/font')
-rw-r--r--vcl/inc/font/DirectFontSubstitution.hxx3
-rw-r--r--vcl/inc/font/PhysicalFontCollection.hxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/inc/font/DirectFontSubstitution.hxx b/vcl/inc/font/DirectFontSubstitution.hxx
index 7c2840bb4cad..4abfb8832ea7 100644
--- a/vcl/inc/font/DirectFontSubstitution.hxx
+++ b/vcl/inc/font/DirectFontSubstitution.hxx
@@ -28,13 +28,14 @@
#include <font/fontsubstitution.hxx>
#include <string>
+#include <string_view>
#include <vector>
namespace vcl::font
{
struct FontSubstEntry
{
- FontSubstEntry(OUString const& rFontName, OUString const& rSubstFontName,
+ FontSubstEntry(std::u16string_view rFontName, std::u16string_view rSubstFontName,
AddFontSubstituteFlags nSubstFlags)
: maSearchName(GetEnglishSearchFontName(rFontName))
, maSearchReplaceName(GetEnglishSearchFontName(rSubstFontName))
diff --git a/vcl/inc/font/PhysicalFontCollection.hxx b/vcl/inc/font/PhysicalFontCollection.hxx
index 5cad84ca15f7..c73be7075ca5 100644
--- a/vcl/inc/font/PhysicalFontCollection.hxx
+++ b/vcl/inc/font/PhysicalFontCollection.hxx
@@ -28,6 +28,7 @@
#include "PhysicalFontFamily.hxx"
#include <array>
+#include <string_view>
#define MAX_GLYPHFALLBACK 16
@@ -55,7 +56,7 @@ public:
int Count() const { return maPhysicalFontFamilies.size(); }
// find the device font family
- vcl::font::PhysicalFontFamily* FindFontFamily( const OUString& rFontName ) const;
+ vcl::font::PhysicalFontFamily* FindFontFamily( std::u16string_view rFontName ) const;
vcl::font::PhysicalFontFamily* FindOrCreateFontFamily( const OUString &rFamilyName );
vcl::font::PhysicalFontFamily* FindFontFamily( vcl::font::FontSelectPattern& ) const;
vcl::font::PhysicalFontFamily* FindFontFamilyByTokenNames(const OUString& rTokenStr) const;