include/xmloff/xmlexp.hxx | 3 -- svx/source/xml/xmlxtexp.cxx | 14 +++++------ xmloff/source/core/xmlexp.cxx | 14 ----------- xmloff/source/forms/controlelement.cxx | 42 ++++++++++++++++----------------- xmloff/source/forms/controlelement.hxx | 3 +- xmloff/source/forms/elementexport.cxx | 22 ++++++++--------- xmloff/source/forms/elementexport.hxx | 14 +++++------ 7 files changed, 48 insertions(+), 64 deletions(-)
New commits: commit df22951b34010e47074bab24ba9ac27c2773d204 Author: Noel Grandin <[email protected]> AuthorDate: Wed May 1 20:27:36 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu May 2 08:20:23 2024 +0200 use more OUString compile time literals in xmloff Change-Id: Iddf9d40ca63f2f3ce7d48aaf881a3abb10f88bbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166975 Tested-by: Noel Grandin <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index f6a6e8748054..24db3601b3c3 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -648,9 +648,6 @@ public: // The constructor prints a start tag that has the common attributes // of the XMLExport instance attached. - SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, - const char *pName, - bool bIgnWSOutside, bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, const OUString& rName, bool bIgnWSOutside, bool bIgnWSInside ); diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 214d976b7d71..622bbb2d830b 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -339,39 +339,39 @@ bool SvxXMLXTableExportComponent::exportTable() noexcept if( !mxTable.is() ) break; - char const* pEleName; + OUString pEleName; Type aExportType = mxTable->getElementType(); std::unique_ptr<SvxXMLTableEntryExporter> pExporter; if( aExportType == cppu::UnoType<sal_Int32>::get() ) { pExporter.reset(new SvxXMLColorEntryExporter(*this)); - pEleName = "color-table"; + pEleName = u"color-table"_ustr; } else if( aExportType == cppu::UnoType< drawing::PolyPolygonBezierCoords >::get() ) { pExporter.reset(new SvxXMLLineEndEntryExporter(*this)); - pEleName = "marker-table"; + pEleName = u"marker-table"_ustr; } else if( aExportType == cppu::UnoType< drawing::LineDash >::get() ) { pExporter.reset(new SvxXMLDashEntryExporter(*this)); - pEleName = "dash-table"; + pEleName = u"dash-table"_ustr; } else if( aExportType == cppu::UnoType< drawing::Hatch >::get() ) { pExporter.reset(new SvxXMLHatchEntryExporter(*this)); - pEleName = "hatch-table"; + pEleName = u"hatch-table"_ustr; } else if( aExportType == cppu::UnoType< awt::Gradient >::get() ) { pExporter.reset(new SvxXMLGradientEntryExporter(*this)); - pEleName = "gradient-table"; + pEleName = u"gradient-table"_ustr; } else if( aExportType == cppu::UnoType<awt::XBitmap>::get()) { pExporter.reset(new SvxXMLBitmapEntryExporter(*this)); - pEleName = "bitmap-table"; + pEleName = u"bitmap-table"_ustr; } else { diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 140b264f6d41..a07e759d61ee 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2448,20 +2448,6 @@ void SvXMLElementExport::StartElement( mrExport.StartElement(maElementName, bIgnoreWhitespaceOutside); } -SvXMLElementExport::SvXMLElementExport( - SvXMLExport& rExp, - sal_uInt16 nPrefixKey, - const char *pLName, - bool bIWSOutside, - bool bIWSInside ) - : mrExport( rExp ) - , mbIgnoreWhitespaceInside( bIWSInside ) - , mbDoSomething( true ) -{ - const OUString sLName( OUString::createFromAscii( pLName ) ); - StartElement( nPrefixKey, sLName, bIWSOutside ); -} - SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefixKey, diff --git a/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx index af752ae4bdc5..328db17e3580 100644 --- a/xmloff/source/forms/controlelement.cxx +++ b/xmloff/source/forms/controlelement.cxx @@ -26,31 +26,31 @@ namespace xmloff { //= OControlElement - const char* OControlElement::getElementName(ElementType _eType) + OUString OControlElement::getElementName(ElementType _eType) { switch (_eType) { - case TEXT: return "text"; - case TEXT_AREA: return "textarea"; - case PASSWORD: return "password"; - case FILE: return "file"; - case FORMATTED_TEXT: return "formatted-text"; - case FIXED_TEXT: return "fixed-text"; - case COMBOBOX: return "combobox"; - case LISTBOX: return "listbox"; - case BUTTON: return "button"; - case IMAGE: return "image"; - case CHECKBOX: return "checkbox"; - case RADIO: return "radio"; - case FRAME: return "frame"; - case IMAGE_FRAME: return "image-frame"; - case HIDDEN: return "hidden"; - case GRID: return "grid"; - case VALUERANGE: return "value-range"; - case TIME: return "time"; - case DATE: return "date"; + case TEXT: return u"text"_ustr; + case TEXT_AREA: return u"textarea"_ustr; + case PASSWORD: return u"password"_ustr; + case FILE: return u"file"_ustr; + case FORMATTED_TEXT: return u"formatted-text"_ustr; + case FIXED_TEXT: return u"fixed-text"_ustr; + case COMBOBOX: return u"combobox"_ustr; + case LISTBOX: return u"listbox"_ustr; + case BUTTON: return u"button"_ustr; + case IMAGE: return u"image"_ustr; + case CHECKBOX: return u"checkbox"_ustr; + case RADIO: return u"radio"_ustr; + case FRAME: return u"frame"_ustr; + case IMAGE_FRAME: return u"image-frame"_ustr; + case HIDDEN: return u"hidden"_ustr; + case GRID: return u"grid"_ustr; + case VALUERANGE: return u"value-range"_ustr; + case TIME: return u"time"_ustr; + case DATE: return u"date"_ustr; - default: return "generic-control"; + default: return u"generic-control"_ustr; } } diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx index df7f12a4326c..30ba90876494 100644 --- a/xmloff/source/forms/controlelement.hxx +++ b/xmloff/source/forms/controlelement.hxx @@ -20,6 +20,7 @@ #pragma once #include <sal/types.h> +#include <rtl/ustring.hxx> namespace xmloff { @@ -71,7 +72,7 @@ namespace xmloff @param _eType the element type */ - static const char* getElementName(ElementType _eType); + static OUString getElementName(ElementType _eType); /** retrieves the tag name to be used to describe a control of the given type diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 3281dd956d63..a91b19d42d02 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -138,7 +138,7 @@ namespace xmloff exportEvents(); } - void OElementExport::implStartElement(const char* _pName) + void OElementExport::implStartElement(const OUString& _pName) { m_pXMLElement = std::make_unique<SvXMLElementExport>(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, true, true); } @@ -1360,11 +1360,11 @@ namespace xmloff } } - void OControlExport::implStartElement(const char* _pName) + void OControlExport::implStartElement(const OUString& _pName) { // before we let the base class start it's outer element, we add a wrapper element - const char *pOuterElementName = getOuterXMLElementName(); - if (pOuterElementName) + OUString pOuterElementName = getOuterXMLElementName(); + if (!pOuterElementName.isEmpty()) m_pOuterElement = std::make_unique<SvXMLElementExport>( m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, @@ -1387,12 +1387,12 @@ namespace xmloff m_pOuterElement.reset(); } - const char* OControlExport::getOuterXMLElementName() const + OUString OControlExport::getOuterXMLElementName() const { - return nullptr; + return u""_ustr; } - const char* OControlExport::getXMLElementName() const + OUString OControlExport::getXMLElementName() const { return getElementName(m_eType); } @@ -1949,9 +1949,9 @@ namespace xmloff } - const char* OColumnExport::getOuterXMLElementName() const + OUString OColumnExport::getOuterXMLElementName() const { - return "column"; + return u"column"_ustr; } void OColumnExport::exportAttributes() @@ -1998,9 +1998,9 @@ namespace xmloff OSL_ENSURE(m_xProps.is(), "OFormExport::OFormExport: invalid arguments!"); } - const char* OFormExport::getXMLElementName() const + OUString OFormExport::getXMLElementName() const { - return "form"; + return u"form"_ustr; } void OFormExport::exportSubTags() diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 6e2ed1676ac2..3cdcc880e2fa 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -54,7 +54,7 @@ namespace xmloff protected: /// get the name of the XML element - virtual const char* getXMLElementName() const = 0; + virtual OUString getXMLElementName() const = 0; /// examine the element we're exporting virtual void examine(); /// export the attributes @@ -71,7 +71,7 @@ namespace xmloff virtual void exportServiceNameAttribute(); /// start the XML element - virtual void implStartElement(const char* _pName); + virtual void implStartElement(const OUString& _pName); /// ends the XML element virtual void implEndElement(); @@ -121,16 +121,16 @@ namespace xmloff protected: /// start the XML element - virtual void implStartElement(const char* _pName) override; + virtual void implStartElement(const OUString& _pName) override; /// ends the XML element virtual void implEndElement() override; /// get the name of the outer XML element - virtual const char* getOuterXMLElementName() const; + virtual OUString getOuterXMLElementName() const; // get the name of the XML element - virtual const char* getXMLElementName() const override; + virtual OUString getXMLElementName() const override; /** examine the control. Some kind of CtorImpl. */ @@ -273,7 +273,7 @@ namespace xmloff protected: // OControlExport overridables - virtual const char* getOuterXMLElementName() const override; + virtual OUString getOuterXMLElementName() const override; virtual void exportServiceNameAttribute() override; virtual void exportAttributes() override; @@ -301,7 +301,7 @@ namespace xmloff ); protected: - virtual const char* getXMLElementName() const override; + virtual OUString getXMLElementName() const override; virtual void exportSubTags() override; virtual void exportAttributes() override; };
