summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter
diff options
context:
space:
mode:
authorNoel <noel.grandin@collabora.co.uk>2020-12-17 16:23:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-12-18 07:56:54 +0100
commitd9b8670548561f7f53a546b8fe53212c6b1ce26e (patch)
treef81854d5bf867dfc4eb7da2f31632656c745969c /reportdesign/source/filter
parent8c9a4ff511a3b1d84a7a6d08a1b153c07f164abb (diff)
use more string_view in convertEnum
Change-Id: I859de4b908672722e1873c5b41cb456b42258ddd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107885 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source/filter')
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlSection.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx6
5 files changed, 10 insertions, 10 deletions
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 938ec7f3238e..e4b6c4d23bd1 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -39,7 +39,7 @@ namespace rptxml
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::xml::sax;
- static sal_Int16 lcl_getKeepTogetherOption(std::u16string_view _sValue)
+ static sal_Int16 lcl_getKeepTogetherOption(std::string_view _sValue)
{
sal_Int16 nRet = report::KeepTogether::NO;
const SvXMLEnumMapEntry<sal_Int16>* aXML_EnumMap = OXMLHelper::GetKeepTogetherOptions();
@@ -154,7 +154,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
}
break;
case XML_ELEMENT(REPORT, XML_KEEP_TOGETHER):
- m_xGroup->setKeepTogether(lcl_getKeepTogetherOption(aIter.toString()));
+ m_xGroup->setKeepTogether(lcl_getKeepTogetherOption(aIter.toView()));
break;
default:
XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index d8736f5ca032..c9e1aeea5e8f 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -72,7 +72,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
else
{
const SvXMLEnumMapEntry<sal_Int16>* aXML_EnumMap = OXMLHelper::GetImageScaleOptions();
- bool bConvertOk = SvXMLUnitConverter::convertEnum( nRet, aIter.toString(), aXML_EnumMap );
+ bool bConvertOk = SvXMLUnitConverter::convertEnum( nRet, aIter.toView(), aXML_EnumMap );
SAL_WARN_IF(!bConvertOk, "reportdesign", "convertEnum failed");
}
_xComponent->setScaleMode( nRet );
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 01a0a2a76765..86347b1ef2b9 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -59,7 +59,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
{
sal_Int32 nRet = sdb::CommandType::COMMAND;
const SvXMLEnumMapEntry<sal_Int32>* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions();
- bool bConvertOk = SvXMLUnitConverter::convertEnum( nRet, aIter.toString(), aXML_EnumMap );
+ bool bConvertOk = SvXMLUnitConverter::convertEnum( nRet, aIter.toView(), aXML_EnumMap );
SAL_WARN_IF(!bConvertOk, "reportdesign", "convertEnum failed");
m_xReportDefinition->setCommandType(nRet);
}
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 2d5a20ea1927..0b0834eac1e3 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -36,7 +36,7 @@ namespace rptxml
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
- static sal_Int16 lcl_getReportPrintOption(std::u16string_view _sValue)
+ static sal_Int16 lcl_getReportPrintOption(std::string_view _sValue)
{
sal_Int16 nRet = report::ReportPrintOption::ALL_PAGES;
const SvXMLEnumMapEntry<sal_Int16>* aXML_EnumMap = OXMLHelper::GetReportPrintOptions();
@@ -63,9 +63,9 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
{
case XML_ELEMENT(REPORT, XML_PAGE_PRINT_OPTION):
if ( _bPageHeader )
- m_xSection->getReportDefinition()->setPageHeaderOption(lcl_getReportPrintOption(aIter.toString()));
+ m_xSection->getReportDefinition()->setPageHeaderOption(lcl_getReportPrintOption(aIter.toView()));
else
- m_xSection->getReportDefinition()->setPageFooterOption(lcl_getReportPrintOption(aIter.toString()));
+ m_xSection->getReportDefinition()->setPageFooterOption(lcl_getReportPrintOption(aIter.toView()));
break;
case XML_ELEMENT(REPORT, XML_REPEAT_SECTION):
m_xSection->setRepeatSection(IsXMLToken(aIter, XML_TRUE));
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 7a6055ace448..719b169f310b 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -50,7 +50,7 @@ namespace rptxml
using ::com::sun::star::uno::Reference;
using namespace ::com::sun::star::xml::sax;
- static sal_Int16 lcl_getForceNewPageOption(std::u16string_view _sValue)
+ static sal_Int16 lcl_getForceNewPageOption(std::string_view _sValue)
{
sal_Int16 nRet = report::ForceNewPage::NONE;
const SvXMLEnumMapEntry<sal_Int16>* aXML_EnumMap = OXMLHelper::GetForceNewPageOptions();
@@ -82,10 +82,10 @@ OXMLTable::OXMLTable( ORptFilter& rImport
m_xSection->setVisible(IsXMLToken(aIter, XML_TRUE));
break;
case XML_ELEMENT(REPORT, XML_FORCE_NEW_PAGE):
- m_xSection->setForceNewPage(lcl_getForceNewPageOption(aIter.toString()));
+ m_xSection->setForceNewPage(lcl_getForceNewPageOption(aIter.toView()));
break;
case XML_ELEMENT(REPORT, XML_FORCE_NEW_COLUMN):
- m_xSection->setNewRowOrCol(lcl_getForceNewPageOption(aIter.toString()));
+ m_xSection->setNewRowOrCol(lcl_getForceNewPageOption(aIter.toView()));
break;
case XML_ELEMENT(REPORT, XML_KEEP_TOGETHER):
m_xSection->setKeepTogether(IsXMLToken(aIter, XML_TRUE));