summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/xechart.cxx4
-rw-r--r--sc/source/filter/excel/xelink.cxx24
-rw-r--r--sc/source/filter/excel/xepivot.cxx14
-rw-r--r--sc/source/filter/excel/xiname.cxx2
-rw-r--r--sc/source/filter/inc/xechart.hxx4
-rw-r--r--sc/source/filter/inc/xepivot.hxx12
-rw-r--r--sc/source/filter/inc/xiname.hxx2
-rw-r--r--sc/source/filter/inc/xlchart.hxx26
-rw-r--r--sc/source/filter/oox/condformatbuffer.cxx2
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx2
-rw-r--r--sc/source/filter/oox/querytablebuffer.cxx4
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx58
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx2
14 files changed, 79 insertions, 79 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 95ece38d976d..0b1f109f665c 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1953,7 +1953,7 @@ bool XclExpChSeries::ConvertDataSeries(
}
bool XclExpChSeries::ConvertStockSeries( css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries,
- const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol )
+ std::u16string_view rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol )
{
bool bOk = false;
Reference< XDataSource > xDataSource( xDataSeries, UNO_QUERY );
@@ -2569,7 +2569,7 @@ void XclExpChTypeGroup::CreateAllStockSeries(
}
bool XclExpChTypeGroup::CreateStockSeries( Reference< XDataSeries > const & xDataSeries,
- const OUString& rValueRole, bool bCloseSymbol )
+ std::u16string_view rValueRole, bool bCloseSymbol )
{
bool bOk = false;
// let chart create series object with correct series index
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 644c7a57a35f..d8b3a954f278 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -137,7 +137,7 @@ public:
sal_uInt16 InsertEuroTool( const OUString& rName );
/** Inserts a DDE link.
@return The 1-based (Excel-like) list index of the DDE link. */
- sal_uInt16 InsertDde( const OUString& rApplic, const OUString& rTopic, const OUString& rItem );
+ sal_uInt16 InsertDde( std::u16string_view rApplic, std::u16string_view rTopic, const OUString& rItem );
sal_uInt16 InsertExtName( const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray );
@@ -148,7 +148,7 @@ public:
private:
/** Returns the 1-based (Excel-like) list index of the external name or 0, if not found. */
- sal_uInt16 GetIndex( const OUString& rName ) const;
+ sal_uInt16 GetIndex( std::u16string_view rName ) const;
/** Appends the passed newly crested external name.
@return The 1-based (Excel-like) list index of the appended name. */
sal_uInt16 AppendNew( XclExpExtNameBase* pExtName );
@@ -300,9 +300,9 @@ public:
explicit XclExpSupbook( const XclExpRoot& rRoot, const OUString& rApplic, const OUString& rTopic );
/** Returns true, if this SUPBOOK contains the passed URL of an external document. */
- bool IsUrlLink( const OUString& rUrl ) const;
+ bool IsUrlLink( std::u16string_view rUrl ) const;
/** Returns true, if this SUPBOOK contains the passed DDE link. */
- bool IsDdeLink( const OUString& rApplic, const OUString& rTopic ) const;
+ bool IsDdeLink( std::u16string_view rApplic, std::u16string_view rTopic ) const;
/** Fills the passed reference log entry with the URL and sheet names. */
void FillRefLogEntry( XclExpRefLogEntry& rRefLogEntry,
sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) const;
@@ -460,13 +460,13 @@ private:
@param rnIndex (out-param) Returns the list index, if the SUPBOOK exists.
@return True, if the SUPBOOK record exists (out-parameters are valid). */
bool GetSupbookUrl( XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex,
- const OUString& rUrl ) const;
+ std::u16string_view rUrl ) const;
/** Searches for the SUPBOOK record containing the passed DDE link.
@param rxSupbook (out-param) Returns a reference to the SUPBOOK record, or 0.
@param rnIndex (out-param) Returns the list index, if the SUPBOOK exists.
@return True, if the SUPBOOK record exists (out-parameters are valid). */
bool GetSupbookDde( XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex,
- const OUString& rApplic, const OUString& rTopic ) const;
+ std::u16string_view rApplic, std::u16string_view rTopic ) const;
/** Appends a new SUPBOOK to the list.
@return The list index of the SUPBOOK record. */
@@ -1090,7 +1090,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertEuroTool( const OUString& rName )
}
sal_uInt16 XclExpExtNameBuffer::InsertDde(
- const OUString& rApplic, const OUString& rTopic, const OUString& rItem )
+ std::u16string_view rApplic, std::u16string_view rTopic, const OUString& rItem )
{
sal_uInt16 nIndex = GetIndex( rItem );
if( nIndex == 0 )
@@ -1128,7 +1128,7 @@ void XclExpExtNameBuffer::SaveXml(XclExpXmlStream& rStrm)
maNameList.SaveXml(rStrm);
}
-sal_uInt16 XclExpExtNameBuffer::GetIndex( const OUString& rName ) const
+sal_uInt16 XclExpExtNameBuffer::GetIndex( std::u16string_view rName ) const
{
for( size_t nPos = 0, nSize = maNameList.GetSize(); nPos < nSize; ++nPos )
if( maNameList.GetRecord( nPos )->GetName() == rName )
@@ -1562,12 +1562,12 @@ XclExpSupbook::XclExpSupbook( const XclExpRoot& rRoot, const OUString& rApplic,
SetRecSize( 2 + maUrlEncoded.GetSize() );
}
-bool XclExpSupbook::IsUrlLink( const OUString& rUrl ) const
+bool XclExpSupbook::IsUrlLink( std::u16string_view rUrl ) const
{
return (meType == XclSupbookType::Extern || meType == XclSupbookType::Eurotool) && (maUrl == rUrl);
}
-bool XclExpSupbook::IsDdeLink( const OUString& rApplic, const OUString& rTopic ) const
+bool XclExpSupbook::IsDdeLink( std::u16string_view rApplic, std::u16string_view rTopic ) const
{
return (meType == XclSupbookType::Special) && (maUrl == rApplic) && (maDdeTopic == rTopic);
}
@@ -2127,7 +2127,7 @@ bool XclExpSupbookBuffer::HasExternalReferences() const
}
bool XclExpSupbookBuffer::GetSupbookUrl(
- XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex, const OUString& rUrl ) const
+ XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex, std::u16string_view rUrl ) const
{
for( size_t nPos = 0, nSize = maSupbookList.GetSize(); nPos < nSize; ++nPos )
{
@@ -2142,7 +2142,7 @@ bool XclExpSupbookBuffer::GetSupbookUrl(
}
bool XclExpSupbookBuffer::GetSupbookDde( XclExpSupbookRef& rxSupbook,
- sal_uInt16& rnIndex, const OUString& rApplic, const OUString& rTopic ) const
+ sal_uInt16& rnIndex, std::u16string_view rApplic, std::u16string_view rTopic ) const
{
for( size_t nPos = 0, nSize = maSupbookList.GetSize(); nPos < nSize; ++nPos )
{
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 2a962da3e5ea..7f8ace82683f 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -130,9 +130,9 @@ XclExpPCItem::XclExpPCItem( bool bValue, const OUString& rText ) :
SetBool( bValue, rText );
}
-bool XclExpPCItem::EqualsText( const OUString& rText ) const
+bool XclExpPCItem::EqualsText( std::u16string_view rText ) const
{
- return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText));
+ return rText.empty() ? IsEmpty() : (GetText() && (*GetText() == rText));
}
bool XclExpPCItem::EqualsDouble( double fValue ) const
@@ -268,7 +268,7 @@ const XclExpPCItem* XclExpPCField::GetItem( sal_uInt16 nItemIdx ) const
return GetVisItemList().GetRecord( nItemIdx );
}
-sal_uInt16 XclExpPCField::GetItemIndex( const OUString& rItemName ) const
+sal_uInt16 XclExpPCField::GetItemIndex( std::u16string_view rItemName ) const
{
const XclExpPCItemList& rItemList = GetVisItemList();
for( size_t nPos = 0, nSize = rItemList.GetSize(); nPos < nSize; ++nPos )
@@ -961,7 +961,7 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const
return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 );
}
-sal_uInt16 XclExpPTField::GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const
+sal_uInt16 XclExpPTField::GetItemIndex( std::u16string_view rName, sal_uInt16 nDefaultIdx ) const
{
for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos )
if( maItemList.GetRecord( nPos )->GetItemName() == rName )
@@ -1144,7 +1144,7 @@ void XclExpPTField::Save( XclExpStream& rStrm )
// private --------------------------------------------------------------------
-XclExpPTItem* XclExpPTField::GetItemAcc( const OUString& rName )
+XclExpPTItem* XclExpPTField::GetItemAcc( std::u16string_view rName )
{
XclExpPTItem* pItem = nullptr;
for( size_t nPos = 0, nSize = maItemList.GetSize(); !pItem && (nPos < nSize); ++nPos )
@@ -1240,7 +1240,7 @@ const XclExpPTField* XclExpPivotTable::GetField( sal_uInt16 nFieldIdx ) const
return (nFieldIdx == EXC_SXIVD_DATA) ? &maDataOrientField : maFieldList.GetRecord( nFieldIdx );
}
-const XclExpPTField* XclExpPivotTable::GetField( const OUString& rName ) const
+const XclExpPTField* XclExpPivotTable::GetField( std::u16string_view rName ) const
{
return const_cast< XclExpPivotTable* >( this )->GetFieldAcc( rName );
}
@@ -1284,7 +1284,7 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
WriteSxViewEx9( rStrm );
}
-XclExpPTField* XclExpPivotTable::GetFieldAcc( const OUString& rName )
+XclExpPTField* XclExpPivotTable::GetFieldAcc( std::u16string_view rName )
{
XclExpPTField* pField = nullptr;
for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos )
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 50a16a76cb99..11d1d753963a 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -287,7 +287,7 @@ void XclImpNameManager::ReadName( XclImpStream& rStrm )
maNameList.push_back( std::make_unique<XclImpName>( rStrm, static_cast< sal_uInt16 >( nCount + 1 ) ) );
}
-const XclImpName* XclImpNameManager::FindName( const OUString& rXclName, SCTAB nScTab ) const
+const XclImpName* XclImpNameManager::FindName( std::u16string_view rXclName, SCTAB nScTab ) const
{
const XclImpName* pGlobalName = nullptr; // a found global name
const XclImpName* pLocalName = nullptr; // a found local name
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index 5e45b4d07878..dd2b92b30d0c 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -713,7 +713,7 @@ public:
/** Converts the passed data series for stock charts. */
bool ConvertStockSeries(
css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries,
- const OUString& rValueRole,
+ std::u16string_view rValueRole,
sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol );
/** Converts the passed error bar settings (called at trend line child series). */
bool ConvertTrendLine( const XclExpChSeries& rParent,
@@ -919,7 +919,7 @@ private:
css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries );
/** Creates a single data series of a stock chart. */
bool CreateStockSeries( css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries,
- const OUString& rValueRole, bool bCloseSymbol );
+ std::u16string_view rValueRole, bool bCloseSymbol );
virtual void WriteBody( XclExpStream& rStrm ) override;
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index d508e7135c1d..2b6387550ff3 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -45,7 +45,7 @@ public:
sal_uInt16 GetTypeFlag() const { return mnTypeFlag; }
- bool EqualsText( const OUString& rText ) const;
+ bool EqualsText( std::u16string_view rText ) const;
bool EqualsDouble( double fValue ) const;
bool EqualsDateTime( const DateTime& rDateTime ) const;
bool EqualsBool( bool bValue ) const;
@@ -82,7 +82,7 @@ public:
/** Returns the specified pivot cache item (returns visible items in groupings). */
const XclExpPCItem* GetItem( sal_uInt16 nItemIdx ) const;
/** Returns the index of a pivot cache item, or EXC_PC_NOITEM on error. */
- sal_uInt16 GetItemIndex( const OUString& rItemName ) const;
+ sal_uInt16 GetItemIndex( std::u16string_view rItemName ) const;
/** Returns the size an item index needs to write out. */
std::size_t GetIndexSize() const;
@@ -268,7 +268,7 @@ public:
/** Returns the list index of an item by its name.
@param nDefaultIdx This value will be returned, if the item could not be found. */
- sal_uInt16 GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const;
+ sal_uInt16 GetItemIndex( std::u16string_view rName, sal_uInt16 nDefaultIdx ) const;
// fill data --------------------------------------------------------------
@@ -292,7 +292,7 @@ public:
private:
/** Returns an item by its name. */
- XclExpPTItem* GetItemAcc( const OUString& rName );
+ XclExpPTItem* GetItemAcc( std::u16string_view rName );
/** Appends a special item describing a field subtotal entry. */
void AppendSubtotalItem( sal_uInt16 nItemType );
@@ -330,7 +330,7 @@ public:
/** Returns a pivot table field by its name. */
const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const;
/** Returns a pivot table field by its name. */
- const XclExpPTField* GetField( const OUString& rName ) const;
+ const XclExpPTField* GetField( std::u16string_view rName ) const;
/** Returns the data-field-only index of the first data field with the passed name.
@param nDefaultIdx This value will be returned, if the field could not be found. */
@@ -341,7 +341,7 @@ public:
private:
/** Returns a pivot table field by its name. */
- XclExpPTField* GetFieldAcc( const OUString& rName );
+ XclExpPTField* GetFieldAcc( std::u16string_view rName );
/** Returns a pivot table field corresponding to the passed save dimension. */
XclExpPTField* GetFieldAcc( const ScDPSaveDimension& rSaveDim );
diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx
index 658d81e195a3..f26d593c5c88 100644
--- a/sc/source/filter/inc/xiname.hxx
+++ b/sc/source/filter/inc/xiname.hxx
@@ -91,7 +91,7 @@ public:
@param nScTab The sheet index for local names or SCTAB_MAX for global names.
If no local name is found, tries to find a matching global name.
@return Pointer to the defined name or 0 on error. */
- const XclImpName* FindName( const OUString& rXclName, SCTAB nScTab ) const;
+ const XclImpName* FindName( std::u16string_view rXclName, SCTAB nScTab ) const;
/** Returns the defined name specified by its Excel index.
@param nXclNameIdx The index of the internal defined name.
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 10d481913755..8f5508f65fd3 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -133,19 +133,19 @@ class XclRoot;
#define EXC_CHPROP_WHITEDAY "WhiteDay"
// data series roles
-#define EXC_CHPROP_ROLE_CATEG "categories"
-#define EXC_CHPROP_ROLE_ERRORBARS_NEGX "error-bars-x-negative"
-#define EXC_CHPROP_ROLE_ERRORBARS_NEGY "error-bars-y-negative"
-#define EXC_CHPROP_ROLE_ERRORBARS_POSX "error-bars-x-positive"
-#define EXC_CHPROP_ROLE_ERRORBARS_POSY "error-bars-y-positive"
-#define EXC_CHPROP_ROLE_LABEL "label"
-#define EXC_CHPROP_ROLE_XVALUES "values-x"
-#define EXC_CHPROP_ROLE_YVALUES "values-y"
-#define EXC_CHPROP_ROLE_OPENVALUES "values-first"
-#define EXC_CHPROP_ROLE_CLOSEVALUES "values-last"
-#define EXC_CHPROP_ROLE_LOWVALUES "values-min"
-#define EXC_CHPROP_ROLE_HIGHVALUES "values-max"
-#define EXC_CHPROP_ROLE_SIZEVALUES "values-size"
+#define EXC_CHPROP_ROLE_CATEG u"categories"
+#define EXC_CHPROP_ROLE_ERRORBARS_NEGX u"error-bars-x-negative"
+#define EXC_CHPROP_ROLE_ERRORBARS_NEGY u"error-bars-y-negative"
+#define EXC_CHPROP_ROLE_ERRORBARS_POSX u"error-bars-x-positive"
+#define EXC_CHPROP_ROLE_ERRORBARS_POSY u"error-bars-y-positive"
+#define EXC_CHPROP_ROLE_LABEL u"label"
+#define EXC_CHPROP_ROLE_XVALUES u"values-x"
+#define EXC_CHPROP_ROLE_YVALUES u"values-y"
+#define EXC_CHPROP_ROLE_OPENVALUES u"values-first"
+#define EXC_CHPROP_ROLE_CLOSEVALUES u"values-last"
+#define EXC_CHPROP_ROLE_LOWVALUES u"values-min"
+#define EXC_CHPROP_ROLE_HIGHVALUES u"values-max"
+#define EXC_CHPROP_ROLE_SIZEVALUES u"values-size"
// Constants and Enumerations =================================================
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 551cd1585a54..ca28b0ebf818 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -345,7 +345,7 @@ void IconSetRule::importFormula(const OUString& rFormula)
namespace {
-ScIconSetType getType(const OUString& rName)
+ScIconSetType getType(std::u16string_view rName)
{
ScIconSetType eIconSetType = IconSet_3TrafficLights1;
const ScIconSetMap* pIconSetMap = ScIconSetFormat::g_IconSetMap;
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 9d39c831afce..50c3722723f1 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -57,7 +57,7 @@ public:
explicit CachedTokenArray( const ScDocument& rDoc ) :
maCxt(rDoc, formula::FormulaGrammar::GRAM_OOXML) {}
- Item* get( const ScAddress& rPos, const OUString& rFormula )
+ Item* get( const ScAddress& rPos, std::u16string_view rFormula )
{
// Check if a token array is cached for this column.
ColCacheType::iterator it = maCache.find(rPos.Col());
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 883e0cd90041..9ab1c550a14a 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -101,7 +101,7 @@ OUString lclBuildWebQueryTables( const WebPrModel::TablesVector& rTables )
Reference< XAreaLink > lclFindAreaLink(
const Reference< XAreaLinks >& rxAreaLinks, const ScAddress& rDestPos,
- const OUString& rFileUrl, const OUString& rTables, const OUString& rFilterName, const OUString& rFilterOptions )
+ std::u16string_view rFileUrl, std::u16string_view rTables, std::u16string_view rFilterName, std::u16string_view rFilterOptions )
{
try
{
@@ -252,7 +252,7 @@ void QueryTable::finalizeImport()
sal_Int32 nRefreshPeriod = xConnection->getModel().mnInterval * 60;
if( nRefreshPeriod > 0 )
{
- PropertySet aPropSet( lclFindAreaLink( xAreaLinks, aDestRange.aStart, aFileUrl, aTables, aFilterName, /*aFilterOptions*/"" ) );
+ PropertySet aPropSet( lclFindAreaLink( xAreaLinks, aDestRange.aStart, aFileUrl, aTables, aFilterName, /*aFilterOptions*/u"" ) );
aPropSet.setProperty( PROP_RefreshPeriod, nRefreshPeriod );
}
}
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 1f31e5d52c6d..41218fe5c227 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -880,7 +880,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const ScRange& aColumnHe
void ScXMLExport::ExportExternalRefCacheStyles()
{
sal_Int32 nEntryIndex = GetCellStylesPropertySetMapper()->FindEntryIndex(
- "NumberFormat", XML_NAMESPACE_STYLE, "data-style-name");
+ "NumberFormat", XML_NAMESPACE_STYLE, u"data-style-name");
if (nEntryIndex < 0)
// No entry index for the number format is found.
@@ -929,7 +929,7 @@ namespace {
void handleFont(
std::vector<XMLPropertyState>& rPropStates,
- const SfxPoolItem* p, const rtl::Reference<XMLPropertySetMapper>& xMapper, const OUString& rXMLName )
+ const SfxPoolItem* p, const rtl::Reference<XMLPropertySetMapper>& xMapper, std::u16string_view rXMLName )
{
sal_Int32 nEntryCount = xMapper->GetEntryCount();
@@ -977,13 +977,13 @@ const SvxFieldData* toXMLPropertyStates(
switch (p->Which())
{
case EE_CHAR_FONTINFO:
- handleFont(rPropStates, p, xMapper, "font-name");
+ handleFont(rPropStates, p, xMapper, u"font-name");
break;
case EE_CHAR_FONTINFO_CJK:
- handleFont(rPropStates, p, xMapper, "font-name-asian");
+ handleFont(rPropStates, p, xMapper, u"font-name-asian");
break;
case EE_CHAR_FONTINFO_CTL:
- handleFont(rPropStates, p, xMapper, "font-name-complex");
+ handleFont(rPropStates, p, xMapper, u"font-name-complex");
break;
case EE_CHAR_WEIGHT:
case EE_CHAR_WEIGHT_CJK:
@@ -1018,23 +1018,23 @@ const SvxFieldData* toXMLPropertyStates(
case EE_CHAR_UNDERLINE:
{
// Underline attribute needs to export multiple entries.
- sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-underline-style", 0);
+ sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-underline-style", 0);
if (nIndexStyle == -1 || nIndexStyle > nEntryCount)
break;
- sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-underline-width", 0);
+ sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-underline-width", 0);
if (nIndexWidth == -1 || nIndexWidth > nEntryCount)
break;
- sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-underline-type", 0);
+ sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-underline-type", 0);
if (nIndexType == -1 || nIndexType > nEntryCount)
break;
- sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharUnderlineColor", XML_NAMESPACE_STYLE, "text-underline-color");
+ sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharUnderlineColor", XML_NAMESPACE_STYLE, u"text-underline-color");
if (nIndexColor == -1 || nIndexColor > nEntryCount)
break;
- sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharUnderlineHasColor", XML_NAMESPACE_STYLE, "text-underline-color");
+ sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharUnderlineHasColor", XML_NAMESPACE_STYLE, u"text-underline-color");
if (nIndexHasColor == -1 || nIndexHasColor > nEntryCount)
break;
@@ -1054,23 +1054,23 @@ const SvxFieldData* toXMLPropertyStates(
case EE_CHAR_OVERLINE:
{
// Same with overline. Do just as we do with underline attributes.
- sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-overline-style", 0);
+ sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-overline-style", 0);
if (nIndexStyle == -1 || nIndexStyle > nEntryCount)
break;
- sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-overline-width", 0);
+ sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-overline-width", 0);
if (nIndexWidth == -1 || nIndexWidth > nEntryCount)
break;
- sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-overline-type", 0);
+ sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-overline-type", 0);
if (nIndexType == -1 || nIndexType > nEntryCount)
break;
- sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharOverlineColor", XML_NAMESPACE_STYLE, "text-overline-color");
+ sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharOverlineColor", XML_NAMESPACE_STYLE, u"text-overline-color");
if (nIndexColor == -1 || nIndexColor > nEntryCount)
break;
- sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharOverlineHasColor", XML_NAMESPACE_STYLE, "text-overline-color");
+ sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharOverlineHasColor", XML_NAMESPACE_STYLE, u"text-overline-color");
if (nIndexHasColor == -1 || nIndexHasColor > nEntryCount)
break;
@@ -1167,11 +1167,11 @@ const SvxFieldData* toXMLPropertyStates(
break;
case EE_CHAR_ESCAPEMENT:
{
- sal_Int32 nIndexEsc = xMapper->FindEntryIndex("CharEscapement", XML_NAMESPACE_STYLE, "text-position");
+ sal_Int32 nIndexEsc = xMapper->FindEntryIndex("CharEscapement", XML_NAMESPACE_STYLE, u"text-position");
if (nIndexEsc == -1 || nIndexEsc > nEntryCount)
break;
- sal_Int32 nIndexEscHeight = xMapper->FindEntryIndex("CharEscapementHeight", XML_NAMESPACE_STYLE, "text-position");
+ sal_Int32 nIndexEscHeight = xMapper->FindEntryIndex("CharEscapementHeight", XML_NAMESPACE_STYLE, u"text-position");
if (nIndexEscHeight == -1 || nIndexEscHeight > nEntryCount)
break;
@@ -1205,22 +1205,22 @@ const SvxFieldData* toXMLPropertyStates(
switch (p->Which())
{
case EE_CHAR_LANGUAGE:
- nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_FO, "language", 0);
- nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_FO, "country", 0);
- nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_FO, "script", 0);
- nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "rfc-language-tag", 0);
+ nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_FO, u"language", 0);
+ nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_FO, u"country", 0);
+ nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_FO, u"script", 0);
+ nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"rfc-language-tag", 0);
break;
case EE_CHAR_LANGUAGE_CJK:
- nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "language-asian", 0);
- nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "country-asian", 0);
- nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "script-asian", 0);
- nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "rfc-language-tag-asian", 0);
+ nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"language-asian", 0);
+ nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"country-asian", 0);
+ nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"script-asian", 0);
+ nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"rfc-language-tag-asian", 0);
break;
case EE_CHAR_LANGUAGE_CTL:
- nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "language-complex", 0);
- nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "country-complex", 0);
- nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "script-complex", 0);
- nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "rfc-language-tag-complex", 0);
+ nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"language-complex", 0);
+ nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"country-complex", 0);
+ nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"script-complex", 0);
+ nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"rfc-language-tag-complex", 0);
break;
default:
nIndexLanguage = nIndexCountry = nIndexScript = nIndexTag = -1;
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index e29112fab2b1..fb226b7c30ad 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1026,7 +1026,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const OUString& r
return nKey;
}
-bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrentCurrency, const OUString& sBankSymbol)
+bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrentCurrency, std::u16string_view sBankSymbol)
{
uno::Reference <util::XNumberFormatsSupplier> xNumberFormatsSupplier(GetNumberFormatsSupplier());
if (xNumberFormatsSupplier.is())
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 910617027beb..daae1d3a98ed 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -355,7 +355,7 @@ public:
ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper.get(); }
sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency);
- bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol);
+ bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, std::u16string_view sBankSymbol);
void SetType(const css::uno::Reference <css::beans::XPropertySet>& rProperties,
sal_Int32& rNumberFormat,
const sal_Int16 nCellType,
generated by cgit (git 2.34.1) at 2024-07-04 04:14:29 +0000