xmloff/source/chart/SchXMLParagraphContext.cxx | 39 ------------------------- xmloff/source/chart/SchXMLParagraphContext.hxx | 4 -- 2 files changed, 1 insertion(+), 42 deletions(-)
New commits: commit 869fff459cbee6a2edadd5c24f2b65c199712de6 Author: Balazs Varga <[email protected]> AuthorDate: Fri Nov 22 12:11:07 2024 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Fri Nov 22 21:58:13 2024 +0100 Related: tdf#160517 - chart odf: import/export formatted chart titles No need to check chart title paragraph style name and ID, since its never exists. follow-up of: d7214aba95bbdcbd40e87ef50fc66f2e2ec4f5ff 6fdad723729a458eaff7ca509cb202ad355832be Change-Id: Ieffe3026adc848cfbf3a847b4f876b5aa2e2a026 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177011 Reviewed-by: Noel Grandin <[email protected]> Reviewed-by: Balazs Varga <[email protected]> Tested-by: Jenkins diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index c585946e217a..c3d8608a9c52 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -104,50 +104,13 @@ void SchXMLParagraphContext::characters( const OUString& rChars ) SchXMLTitleParaContext::SchXMLTitleParaContext( SvXMLImport& rImport, std::vector<std::pair<OUString, OUString>>& rParaText) : SvXMLImportContext( rImport ), - mrParaText( rParaText ), - mpId( nullptr ) + mrParaText( rParaText ) { } SchXMLTitleParaContext::~SchXMLTitleParaContext() {} -void SchXMLTitleParaContext::startFastElement( - sal_Int32 /*nElement*/, - const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) -{ - // remember the id. It is used for storing the original cell range string in - // a local table (cached data) - if( !mpId ) - return; - - bool bHaveXmlId( false ); - - for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) ) - { - switch(aIter.getToken()) - { - case XML_ELEMENT(TEXT, XML_STYLE_NAME): - maStyleName = aIter.toString(); - break; - case XML_ELEMENT(XML, XML_ID): - (*mpId) = aIter.toString(); - bHaveXmlId = true; - break; - case XML_ELEMENT(TEXT, XML_ID): - { // text:id shall be ignored if xml:id exists - if (!bHaveXmlId) - { - (*mpId) = aIter.toString(); - } - break; - } - default: - XMLOFF_WARN_UNKNOWN("xmloff", aIter); - } - } -} - void SchXMLTitleParaContext::endFastElement(sal_Int32 ) { if (!maBuffer.isEmpty()) diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index 4f344e5793f8..f0e06893b8ce 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -54,7 +54,6 @@ class SchXMLTitleParaContext : public SvXMLImportContext { private: std::vector<std::pair<OUString, OUString>>& mrParaText; - OUString* mpId; OUStringBuffer maBuffer; OUString maStyleName; @@ -63,9 +62,6 @@ public: std::vector<std::pair<OUString, OUString>>& rParaText); virtual ~SchXMLTitleParaContext() override; - virtual void SAL_CALL startFastElement( - sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual void SAL_CALL characters( const OUString& rChars ) override;
