From 2764c334c3b9cf428e4e7ab0c28ce6a34036fa77 Mon Sep 17 00:00:00 2001 From: Noel Date: Mon, 2 Nov 2020 11:25:12 +0200 Subject: drop the SvXMLExport::Characters method.. in favour of just using the characters() method Change-Id: Iecb2773d488fcf4fa3c2202d0e889015a288fe2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105174 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmloff/inc/DomBuilderContext.hxx | 2 +- xmloff/inc/XMLEmbeddedObjectImportContext.hxx | 2 +- xmloff/inc/txtfldi.hxx | 2 +- xmloff/source/chart/SchXMLPlotAreaContext.cxx | 2 +- xmloff/source/chart/SchXMLPlotAreaContext.hxx | 2 +- xmloff/source/core/DomBuilderContext.cxx | 2 +- .../source/core/XMLEmbeddedObjectImportContext.cxx | 6 +++--- xmloff/source/core/xmlictxt.cxx | 7 +------ xmloff/source/draw/descriptionimp.cxx | 2 +- xmloff/source/draw/descriptionimp.hxx | 2 +- xmloff/source/draw/ximpshap.cxx | 4 ++-- xmloff/source/draw/ximpshap.hxx | 2 +- xmloff/source/forms/propertyimport.cxx | 4 ++-- xmloff/source/forms/propertyimport.hxx | 4 ++-- xmloff/source/text/XMLIndexSpanEntryContext.cxx | 2 +- xmloff/source/text/XMLIndexSpanEntryContext.hxx | 2 +- .../source/text/XMLIndexTitleTemplateContext.cxx | 2 +- .../source/text/XMLIndexTitleTemplateContext.hxx | 2 +- xmloff/source/text/XMLTextFrameContext.cxx | 8 ++++---- xmloff/source/text/txtfldi.cxx | 2 +- xmloff/source/text/txtparai.cxx | 22 +++++++++++----------- xmloff/source/text/txtparai.hxx | 2 +- xmloff/source/xforms/TokenContext.cxx | 2 +- xmloff/source/xforms/TokenContext.hxx | 2 +- 24 files changed, 42 insertions(+), 47 deletions(-) (limited to 'xmloff') diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index 81fe98942160..4df66e7ec5e3 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -79,7 +79,7 @@ public: virtual void StartElement( const css::uno::Reference& xAttrList ) override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; #endif diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index 029dfd45815e..042605f4bf8f 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -52,7 +52,7 @@ public: virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; void SetComponent( css::uno::Reference< css::lang::XComponent > const & rComp ); diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 2e8f9562c40a..ecdace2b1578 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -131,7 +131,7 @@ public: const OUString& rLocalName); /// element name w/o prefix /// process character data: will be collected in member sContentBuffer - virtual void Characters( const OUString& sContent ) override; + virtual void SAL_CALL characters( const OUString& sContent ) override; /// parses attributes and calls ProcessAttribute virtual void StartElement( diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 6507fc757ea0..47e3ba67e2cf 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -589,7 +589,7 @@ SchXMLDataLabelSpanContext::SchXMLDataLabelSpanContext( SvXMLImport& rImport, co { } -void SchXMLDataLabelSpanContext::Characters(const OUString& rChars) +void SchXMLDataLabelSpanContext::characters(const OUString& rChars) { maCharBuffer.append(rChars); } diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 8434630cfc08..7ab9c82a9bdd 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -146,7 +146,7 @@ private: OUStringBuffer maCharBuffer; public: SchXMLDataLabelSpanContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::vector& rLabels); - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index 0deacd18fb4b..dea7993d963d 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -154,7 +154,7 @@ void DomBuilderContext::StartElement( } } -void DomBuilderContext::Characters( const OUString& rCharacters ) +void DomBuilderContext::characters( const OUString& rCharacters ) { SAL_WARN_IF( !mxNode.is(), "xmloff", "empty XNode not allowed" ); diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index c238bbf9de4b..0d4849dd2575 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -63,7 +63,7 @@ public: virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; } @@ -102,7 +102,7 @@ void XMLEmbeddedObjectImportContext_Impl::EndElement() GetPrefix(), GetLocalName() ) ); } -void XMLEmbeddedObjectImportContext_Impl::Characters( const OUString& rChars ) +void XMLEmbeddedObjectImportContext_Impl::characters( const OUString& rChars ) { xHandler->characters( rChars ); } @@ -293,7 +293,7 @@ void XMLEmbeddedObjectImportContext::EndElement() } } -void XMLEmbeddedObjectImportContext::Characters( const OUString& rChars ) +void XMLEmbeddedObjectImportContext::characters( const OUString& rChars ) { if( xHandler.is() ) xHandler->characters( rChars ); diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index 7a32f8455be3..d74b28b5fec4 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -64,10 +64,6 @@ void SvXMLImportContext::EndElement() { } -void SvXMLImportContext::Characters( const OUString& ) -{ -} - // css::xml::sax::XFastContextHandler: void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) { @@ -129,9 +125,8 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SvXMLImportContext::cre return nullptr; } -void SAL_CALL SvXMLImportContext::characters(const OUString &rChars) +void SAL_CALL SvXMLImportContext::characters(const OUString &/*rChars*/) { - Characters(rChars); } // XInterface diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index c4ca932aff99..26b006d8164b 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -69,7 +69,7 @@ void SdXMLDescriptionContext::EndElement() // This method is called for all characters that are contained in the // current element. The default is to ignore them. -void SdXMLDescriptionContext::Characters( const OUString& rChars ) +void SdXMLDescriptionContext::characters( const OUString& rChars ) { msText += rChars; } diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index 0a57ca70fcf1..f45feb775f15 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -43,7 +43,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_DESCRIPTIONIMP_HXX diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index e0e467b31501..2f84f80d09dc 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2586,10 +2586,10 @@ void SdXMLChartShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -void SdXMLChartShapeContext::Characters( const OUString& rChars ) +void SdXMLChartShapeContext::characters( const OUString& rChars ) { if( mxChartContext.is() ) - mxChartContext->Characters( rChars ); + mxChartContext->characters( rChars ); } SvXMLImportContextRef SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 35566e597a2c..d93356369e85 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -411,7 +411,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index e7a3e7914ec0..8090b56342e6 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -300,7 +300,7 @@ bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) cons return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); } -void OPropertyImport::Characters(const OUString& _rChars ) +void OPropertyImport::characters(const OUString& _rChars ) { // ignore them (should be whitespace only) OSL_ENSURE(_rChars.trim().isEmpty(), "OPropertyImport::Characters: non-whitespace characters!"); @@ -366,7 +366,7 @@ SvXMLImportContextRef OPropertyElementsContext::CreateChildContext(sal_uInt16 _n OSL_ENSURE(0 == _rxAttrList->getLength(), "OPropertyElementsContext::StartElement: the form:properties element should not have attributes!"); } - void OPropertyElementsContext::Characters(const OUString& _rChars) + void OPropertyElementsContext::characters(const OUString& _rChars) { OSL_ENSURE(_rChars.trim().isEmpty(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); } diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 46163107b52b..c2e6d09d1225 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -99,7 +99,7 @@ namespace xmloff virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; - virtual void Characters(const OUString& _rChars) override; + virtual void SAL_CALL characters(const OUString& _rChars) override; protected: /** handle one single attribute. @@ -168,7 +168,7 @@ namespace xmloff #if OSL_DEBUG_LEVEL > 0 virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; - virtual void Characters(const OUString& _rChars) override; + virtual void SAL_CALL characters(const OUString& _rChars) override; #endif }; diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx index b205b49d19ab..a135d0e292fe 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx @@ -43,7 +43,7 @@ XMLIndexSpanEntryContext::~XMLIndexSpanEntryContext() { } -void XMLIndexSpanEntryContext::Characters(const OUString& sString) +void XMLIndexSpanEntryContext::characters(const OUString& sString) { sContent.append(sString); } diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx index 9fa2be5c8f93..a1cd11713c63 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx @@ -50,7 +50,7 @@ public: protected: /// Collect element contents - virtual void Characters(const OUString& sString) override; + virtual void SAL_CALL characters(const OUString& sString) override; /// add Text PropertyValue virtual void FillPropertyValues( diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index b8f3fd2da78d..b85714f6f0f6 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -92,7 +92,7 @@ void XMLIndexTitleTemplateContext::EndElement() } } -void XMLIndexTitleTemplateContext::Characters( +void XMLIndexTitleTemplateContext::characters( const OUString& sString) { sContent.append(sString); diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 348030ca15c3..1ad37fd50d86 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -68,7 +68,7 @@ protected: virtual void EndElement() override; /** pick up title characters */ - virtual void Characters(const OUString& sString) override; + virtual void SAL_CALL characters(const OUString& sString) override; }; #endif diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 7ab210dbd938..5452027a31f4 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -129,7 +129,7 @@ public: const OUString& rLName, OUString& rTitleOrDesc ); - virtual void Characters( const OUString& rText ) override; + virtual void SAL_CALL characters( const OUString& rText ) override; }; } @@ -144,7 +144,7 @@ XMLTextFrameTitleOrDescContext_Impl::XMLTextFrameTitleOrDescContext_Impl( { } -void XMLTextFrameTitleOrDescContext_Impl::Characters( const OUString& rText ) +void XMLTextFrameTitleOrDescContext_Impl::characters( const OUString& rText ) { mrTitleOrDesc += rText; } @@ -407,7 +407,7 @@ public: virtual void EndElement() override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -1249,7 +1249,7 @@ SvXMLImportContextRef XMLTextFrameContext_Impl::CreateChildContext( return pContext; } -void XMLTextFrameContext_Impl::Characters( const OUString& rChars ) +void XMLTextFrameContext_Impl::characters( const OUString& rChars ) { maUrlBuffer.append(rChars); } diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 71172b5d977c..a6e95478e7bd 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -189,7 +189,7 @@ void XMLTextFieldImportContext::EndElement() rTextImportHelper.InsertString(GetContent()); } -void XMLTextFieldImportContext::Characters(const OUString& rContent) +void XMLTextFieldImportContext::characters(const OUString& rContent) { sContentBuffer.append(rContent); } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index e5428059c198..614040d81af7 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -388,7 +388,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; class XMLImpHyperlinkContext_Impl : public SvXMLImportContext @@ -415,7 +415,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; } @@ -520,7 +520,7 @@ SvXMLImportContextRef XMLImpHyperlinkContext_Impl::CreateChildContext( } } -void XMLImpHyperlinkContext_Impl::Characters( const OUString& rChars ) +void XMLImpHyperlinkContext_Impl::characters( const OUString& rChars ) { GetImport().GetTextImport()->InsertString( rChars, mrbIgnoreLeadingSpace ); } @@ -548,7 +548,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; } @@ -579,7 +579,7 @@ SvXMLImportContextRef XMLImpRubyBaseContext_Impl::CreateChildContext( nToken, m_rHints, rIgnoreLeadingSpace ); } -void XMLImpRubyBaseContext_Impl::Characters( const OUString& rChars ) +void XMLImpRubyBaseContext_Impl::characters( const OUString& rChars ) { GetImport().GetTextImport()->InsertString( rChars, rIgnoreLeadingSpace ); } @@ -632,7 +632,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, XMLImpRubyContext_Impl & rParent ); - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; } @@ -665,7 +665,7 @@ XMLImpRubyTextContext_Impl::XMLImpRubyTextContext_Impl( } } -void XMLImpRubyTextContext_Impl::Characters( const OUString& rChars ) +void XMLImpRubyTextContext_Impl::characters( const OUString& rChars ) { m_rRubyContext.AppendText( rChars ); } @@ -776,7 +776,7 @@ public: sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const Reference< xml::sax::XAttributeList > & i_xAttrList) override; - virtual void Characters( const OUString& i_rChars ) override; + virtual void SAL_CALL characters( const OUString& i_rChars ) override; virtual void ProcessAttribute(sal_uInt16 const i_nPrefix, OUString const & i_rLocalName, OUString const & i_rValue); @@ -846,7 +846,7 @@ SvXMLImportContextRef XMLMetaImportContextBase::CreateChildContext( i_rLocalName, i_xAttrList, nToken, m_rHints, m_rIgnoreLeadingSpace ); } -void XMLMetaImportContextBase::Characters( const OUString& i_rChars ) +void XMLMetaImportContextBase::characters( const OUString& i_rChars ) { GetImport().GetTextImport()->InsertString(i_rChars, m_rIgnoreLeadingSpace); } @@ -1824,7 +1824,7 @@ SvXMLImportContextRef XMLImpSpanContext_Impl::CreateChildContext( ); } -void XMLImpSpanContext_Impl::Characters( const OUString& rChars ) +void XMLImpSpanContext_Impl::characters( const OUString& rChars ) { OUString sStyleName; if( pHint ) @@ -2243,7 +2243,7 @@ SvXMLImportContextRef XMLParaContext::CreateChildContext( nStarFontsConvFlags); } -void XMLParaContext::Characters( const OUString& rChars ) +void XMLParaContext::characters( const OUString& rChars ) { OUString sChars = GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName, diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index e047a63e82d0..feaa5bbb45eb 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -71,7 +71,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; }; diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index bed97df43ac3..5dd2aeda0450 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -119,7 +119,7 @@ static bool lcl_IsWhiteSpace( sal_Unicode c ) || c == u'\x000D'; } -void TokenContext::Characters( const OUString& rCharacters ) +void TokenContext::characters( const OUString& rCharacters ) { // get iterators for string data const sal_Unicode* pBegin = rCharacters.getStr(); diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index f52fb362db1d..05c5b7372a7a 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -69,7 +69,7 @@ public: * content. Classes that wish to deal with character content have * to override this method anyway, and will thus get rid of the * warnings. */ - virtual void Characters( const OUString& rChars ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; protected: /** will be called for each attribute */ -- cgit