summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/txtflde.hxx8
-rw-r--r--xmloff/inc/txtlists.hxx3
-rw-r--r--xmloff/source/style/numehelp.cxx4
-rw-r--r--xmloff/source/text/txtflde.cxx30
-rw-r--r--xmloff/source/text/txtlists.cxx2
5 files changed, 24 insertions, 23 deletions
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 91d27690bd74..9ea45f66f24c 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -33,7 +33,7 @@
#include <map>
#include <set>
#include <memory>
-
+#include <string_view>
class SvXMLExport;
struct XMLPropertyState;
@@ -274,14 +274,14 @@ private:
void ProcessString(
enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text)
const OUString& sValue, /// attribute value
- const OUString& sDefault); /// default value; omit if equal
+ std::u16string_view sDefault); /// default value; omit if equal
/// export a string attribute, omit if default
void ProcessString(
enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text)
sal_uInt16 nValuePrefix,
const OUString& sValue, /// attribute value
- const OUString& sDefault); /// default value; omit if equal
+ std::u16string_view sDefault); /// default value; omit if equal
/// export a string attribute
void ProcessString(
@@ -313,7 +313,7 @@ private:
bool bIsString, /// do we process a string or a number?
sal_Int32 nFormatKey, /// format key for NumberFormatter; possibly -1
const OUString& sContent, /// string content; possibly invalid
- const OUString& sDefault, /// default string
+ std::u16string_view sDefault, /// default string
double fValue, /// float content; possibly invalid
bool bExportValue, /// export value attribute?
bool bExportValueType, /// export value-type attribute?
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index 0e77d60f2ec4..282c87c586a8 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -24,6 +24,7 @@
#include <map>
#include <memory>
#include <stack>
+#include <string_view>
#include <tuple>
#include <vector>
#include <com/sun/star/container/XIndexReplace.hpp>
@@ -115,7 +116,7 @@ class XMLTextListsHelper
static css::uno::Reference< css::container::XIndexReplace> MakeNumRule(
SvXMLImport & i_rImport,
const css::uno::Reference< css::container::XIndexReplace>& i_xNumRule,
- const OUString& i_ParentStyleName,
+ std::u16string_view i_ParentStyleName,
const OUString& i_StyleName,
sal_Int16 & io_rLevel,
bool* o_pRestartNumbering = nullptr,
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 3d46adcb575e..43dbc73ef85c 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -284,7 +284,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor
}
void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExport& rXMLExport,
- const OUString& rValue, const OUString& rCharacters,
+ const OUString& rValue, std::u16string_view rCharacters,
bool bExportValue, bool bExportTypeAttribute)
{
if (bExportTypeAttribute)
@@ -494,7 +494,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
}
void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
- const OUString& rValue, const OUString& rCharacters,
+ const OUString& rValue, std::u16string_view rCharacters,
bool bExportValue,
sal_uInt16 nNamespace)
{
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index effacfd668df..dc767767f3a6 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1128,7 +1128,7 @@ void XMLTextFieldExport::ExportFieldHelper(
// show style, unless name will be shown
ProcessValueAndType(IsStringField(nToken, rPropSet),
GetIntProperty(gsPropertyNumberFormat, rPropSet),
- "", "", 0.0, // values not used
+ "", u"", 0.0, // values not used
false,
false,
!bCmd,
@@ -1169,7 +1169,7 @@ void XMLTextFieldExport::ExportFieldHelper(
bCmd);
ProcessValueAndType(IsStringField(nToken, rPropSet),
GetIntProperty(gsPropertyNumberFormat, rPropSet),
- "", "", 0.0, // values not used
+ "", u"", 0.0, // values not used
false, false, !bCmd,
! GetOptionalBoolProperty(
gsPropertyIsFixedLanguage,
@@ -1252,7 +1252,7 @@ void XMLTextFieldExport::ExportFieldHelper(
{
ProcessValueAndType(false,
GetIntProperty(gsPropertyNumberFormat,rPropSet),
- "", "", 0.0, // not used
+ "", u"", 0.0, // not used
false, false, true,
! GetOptionalBoolProperty(
gsPropertyIsFixedLanguage,
@@ -1294,7 +1294,7 @@ void XMLTextFieldExport::ExportFieldHelper(
{
ProcessValueAndType(false,
GetIntProperty(gsPropertyNumberFormat,rPropSet),
- "", "", 0.0, // not used
+ "", u"", 0.0, // not used
false, false, true,
! GetOptionalBoolProperty(
gsPropertyIsFixedLanguage,
@@ -1426,7 +1426,7 @@ void XMLTextFieldExport::ExportFieldHelper(
{
ProcessValueAndType(false, // doesn't happen for text
GetIntProperty(gsPropertyNumberFormat,rPropSet),
- "", "", 0.0, // not used
+ "", u"", 0.0, // not used
false, false, true, false);
}
ProcessDisplay(GetBoolProperty(gsPropertyIsVisible, rPropSet),
@@ -1451,7 +1451,7 @@ void XMLTextFieldExport::ExportFieldHelper(
case FIELD_ID_DOCINFO_PRINT_DATE:
ProcessValueAndType(false,
GetIntProperty(gsPropertyNumberFormat, rPropSet),
- "", "", 0.0,
+ "", u"", 0.0,
false, false, true,
! GetOptionalBoolProperty(
gsPropertyIsFixedLanguage,
@@ -1482,7 +1482,7 @@ void XMLTextFieldExport::ExportFieldHelper(
{
ProcessValueAndType(false, // doesn't happen for text
GetIntProperty(gsPropertyNumberFormat,rPropSet),
- "", "", 0.0, // not used
+ "", u"", 0.0, // not used
false, false, true,
! GetOptionalBoolProperty(
gsPropertyIsFixedLanguage,
@@ -1854,7 +1854,7 @@ void XMLTextFieldExport::ExportFieldHelper(
GetBoolProperty(gsPropertyIsShowFormula, rPropSet) );
ProcessValueAndType( false,
GetIntProperty(gsPropertyNumberFormat, rPropSet),
- "", "", 0.0f,
+ "", u"", 0.0f,
false, false, true,
false );
ExportElement( XML_TABLE_FORMULA, sPresentation );
@@ -2049,7 +2049,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
ProcessValueAndType(
bIsString,
GetIntProperty(gsPropertyNumberFormat, xFieldPropSet),
- "", "", 0.0,
+ "", u"", 0.0,
false, true, false, false);
}
else
@@ -2062,7 +2062,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
// from NumberFormats
ProcessValueAndType(
bIsString,
- 0, "", "", 0.0,
+ 0, "", u"", 0.0,
false, true, false, false);
}
@@ -2135,7 +2135,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
// expression:
ProcessValueAndType(
false,
- 0, "", "",
+ 0, "", u"",
GetDoubleProperty(gsPropertyValue, xPropSet),
true,
true,
@@ -2334,7 +2334,7 @@ void XMLTextFieldExport::ExportMetaField(
// style:data-style-name
ProcessValueAndType(false,
GetIntProperty(gsPropertyNumberFormat, i_xMeta),
- "", "", 0.0, false, false, true,
+ "", u"", 0.0, false, false, true,
false );
// text:meta-field without xml:id is invalid
@@ -2357,7 +2357,7 @@ void XMLTextFieldExport::ProcessValueAndType(
bool bIsString, /// do we process a string or a number?
sal_Int32 nFormatKey, /// format key for NumberFormatter; inv. if string
const OUString& sContent, /// string content; possibly invalid
- const OUString& sDefault, /// default string
+ std::u16string_view sDefault, /// default string
double fValue, /// float content; possibly invalid
bool bExportValue, /// export value attribute?
bool bExportValueType, /// export value-type attribute?
@@ -2487,7 +2487,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName,
/// export a string attribute
void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName,
const OUString& sValue,
- const OUString& sDefault)
+ std::u16string_view sDefault)
{
if (sValue != sDefault)
{
@@ -2499,7 +2499,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName,
void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName,
sal_uInt16 nValuePrefix,
const OUString& sValue,
- const OUString& sDefault)
+ std::u16string_view sDefault)
{
if (sValue != sDefault)
{
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index b00852ce44be..11d31e025e75 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -402,7 +402,7 @@ uno::Reference<container::XIndexReplace>
XMLTextListsHelper::MakeNumRule(
SvXMLImport & i_rImport,
const uno::Reference<container::XIndexReplace>& i_rNumRule,
- const OUString& i_ParentStyleName,
+ std::u16string_view i_ParentStyleName,
const OUString& i_StyleName,
sal_Int16 & io_rLevel,
bool* o_pRestartNumbering,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 02:34:34 +0000