summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/fontinstance.hxx2
-rw-r--r--vcl/inc/listbox.hxx2
-rw-r--r--vcl/inc/outdev.h2
-rw-r--r--vcl/inc/ppdparser.hxx4
-rw-r--r--vcl/source/control/combobox.cxx2
-rw-r--r--vcl/source/control/imp_listbox.cxx2
-rw-r--r--vcl/source/control/listbox.cxx4
-rw-r--r--vcl/source/filter/graphicfilter.cxx2
-rw-r--r--vcl/source/font/fontinstance.cxx2
-rw-r--r--vcl/source/outdev/font.cxx2
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx4
-rw-r--r--vcl/workben/vcldemo.cxx4
12 files changed, 16 insertions, 16 deletions
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 7dc78ac05533..4918d612c5cf 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -63,7 +63,7 @@ public: // TODO: make data members private
void AddFallbackForUnicode( sal_UCS4, FontWeight eWeight, const OUString& rFontName );
bool GetFallbackForUnicode( sal_UCS4, FontWeight eWeight, OUString* pFontName ) const;
- void IgnoreFallbackForUnicode( sal_UCS4, FontWeight eWeight, const OUString& rFontName );
+ void IgnoreFallbackForUnicode( sal_UCS4, FontWeight eWeight, std::u16string_view rFontName );
inline hb_font_t* GetHbFont();
bool IsGraphiteFont();
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index f18233574e7f..816e7ff50c56 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -115,7 +115,7 @@ public:
void Clear();
sal_Int32 FindMatchingEntry( const OUString& rStr, sal_Int32 nStart, bool bLazy ) const;
- sal_Int32 FindEntry( const OUString& rStr, bool bSearchMRUArea = false ) const;
+ sal_Int32 FindEntry( std::u16string_view rStr, bool bSearchMRUArea = false ) const;
/// helper: add up heights up to index nEndIndex.
/// GetAddedHeight( 0 ) @return 0
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 27f8dc5481db..df4c2f205182 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -100,7 +100,7 @@ public:
void AddFontSubstitute( const OUString& rFontName, const OUString& rSubstName, AddFontSubstituteFlags nFlags );
void RemoveFontsSubstitute();
- bool FindFontSubstitute( OUString& rSubstName, const OUString& rFontName ) const;
+ bool FindFontSubstitute( OUString& rSubstName, std::u16string_view rFontName ) const;
};
// PreMatchFontSubstitution
diff --git a/vcl/inc/ppdparser.hxx b/vcl/inc/ppdparser.hxx
index b5bf309ed917..fdcc0a68c186 100644
--- a/vcl/inc/ppdparser.hxx
+++ b/vcl/inc/ppdparser.hxx
@@ -193,7 +193,7 @@ public:
OUString getDefaultPaperDimension() const;
void getDefaultPaperDimension( int& rWidth, int& rHeight ) const
{ getPaperDimension( getDefaultPaperDimension(), rWidth, rHeight ); }
- bool getPaperDimension( const OUString& rPaperName,
+ bool getPaperDimension( std::u16string_view rPaperName,
int& rWidth, int& rHeight ) const;
// width and height in pt
// returns false if paper not found
@@ -201,7 +201,7 @@ public:
// match the best paper for width and height
OUString matchPaper( int nWidth, int nHeight ) const;
- bool getMargins( const OUString& rPaperName,
+ bool getMargins( std::u16string_view rPaperName,
int &rLeft, int& rRight,
int &rUpper, int& rLower ) const;
// values in pt
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 188df87a4d9c..666feb9e3216 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -941,7 +941,7 @@ Image ComboBox::GetEntryImage( sal_Int32 nPos ) const
return Image();
}
-sal_Int32 ComboBox::GetEntryPos( const OUString& rStr ) const
+sal_Int32 ComboBox::GetEntryPos( std::u16string_view rStr ) const
{
sal_Int32 nPos = m_pImpl->m_pImplLB->GetEntryList()->FindEntry( rStr );
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 2125e0780afa..ddff67bae584 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -234,7 +234,7 @@ void ImplEntryList::RemoveEntry( sal_Int32 nPos )
}
}
-sal_Int32 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUArea ) const
+sal_Int32 ImplEntryList::FindEntry( std::u16string_view rString, bool bSearchMRUArea ) const
{
const sal_Int32 nEntries = static_cast<sal_Int32>(maEntries.size());
for ( sal_Int32 n = bSearchMRUArea ? 0 : GetMRUCount(); n < nEntries; n++ )
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index bf4b71412514..4782807892fc 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -963,7 +963,7 @@ Image ListBox::GetEntryImage( sal_Int32 nPos ) const
return Image();
}
-sal_Int32 ListBox::GetEntryPos( const OUString& rStr ) const
+sal_Int32 ListBox::GetEntryPos( std::u16string_view rStr ) const
{
if (!mpImplLB)
return LISTBOX_ENTRY_NOTFOUND;
@@ -1019,7 +1019,7 @@ bool ListBox::IsEntryPosSelected( sal_Int32 nPos ) const
return mpImplLB->GetEntryList()->IsEntryPosSelected( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
}
-void ListBox::SelectEntry( const OUString& rStr, bool bSelect )
+void ListBox::SelectEntry( std::u16string_view rStr, bool bSelect )
{
SelectEntryPos( GetEntryPos( rStr ), bSelect );
}
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 6d983008544f..ad3dabd4494e 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -613,7 +613,7 @@ struct ImpFilterLibCacheEntry
PFilterCall mpfnImport;
ImpFilterLibCacheEntry(const OUString& rPathname, const OUString& rFiltername, const OUString& rFormatName);
- bool operator==( const OUString& rFiltername ) const { return maFiltername == rFiltername; }
+ bool operator==( std::u16string_view rFiltername ) const { return maFiltername == rFiltername; }
PFilterCall GetImportFunction();
};
diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx
index 40e334bd6d5c..f56333f6cf8a 100644
--- a/vcl/source/font/fontinstance.cxx
+++ b/vcl/source/font/fontinstance.cxx
@@ -136,7 +136,7 @@ bool LogicalFontInstance::GetFallbackForUnicode( sal_UCS4 cChar, FontWeight eWei
return true;
}
-void LogicalFontInstance::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight, const OUString& rFontName )
+void LogicalFontInstance::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight, std::u16string_view rFontName )
{
UnicodeFallbackList::iterator it = mpUnicodeFallbackList->find( std::pair< sal_UCS4,FontWeight >(cChar,eWeight) );
if( it == mpUnicodeFallbackList->end() )
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 71dc5e861fcf..6963fd77c3e1 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -628,7 +628,7 @@ void ImplDirectFontSubstitution::RemoveFontsSubstitute()
}
bool ImplDirectFontSubstitution::FindFontSubstitute( OUString& rSubstName,
- const OUString& rSearchName ) const
+ std::u16string_view rSearchName ) const
{
// TODO: get rid of O(N) searches
std::vector<ImplFontSubstEntry>::const_iterator it = std::find_if (
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 06ed7fecdb9e..2dbd268ae57e 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1403,7 +1403,7 @@ OUString PPDParser::getDefaultPaperDimension() const
}
bool PPDParser::getMargins(
- const OUString& rPaperName,
+ std::u16string_view rPaperName,
int& rLeft, int& rRight,
int& rUpper, int& rLower ) const
{
@@ -1439,7 +1439,7 @@ bool PPDParser::getMargins(
}
bool PPDParser::getPaperDimension(
- const OUString& rPaperName,
+ std::u16string_view rPaperName,
int& rWidth, int& rHeight ) const
{
if( ! m_pPaperDimensions )
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 09b1f47608e0..68a04d1384a9 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -167,7 +167,7 @@ public:
OUString getRendererList();
double getAndResetBenchmark(RenderStyle style);
- void selectRenderer(const OUString &rName);
+ void selectRenderer(std::u16string_view rName);
int selectNextRenderer();
void setIterCount(sal_Int32 iterCount);
sal_Int32 getIterCount() const;
@@ -1691,7 +1691,7 @@ void DemoRenderer::addTime(int i, double t)
maRenderers[i]->countTime++;
}
-void DemoRenderer::selectRenderer(const OUString &rName )
+void DemoRenderer::selectRenderer(std::u16string_view rName )
{
for (size_t i = 0; i < maRenderers.size(); i++)
{