oox/inc/drawingml/textbody.hxx | 3 +++ oox/inc/drawingml/textparagraph.hxx | 5 +++++ oox/source/drawingml/textbody.cxx | 10 ++++++++++ oox/source/drawingml/textbodycontext.cxx | 1 + oox/source/drawingml/textparagraph.cxx | 1 + 5 files changed, 20 insertions(+)
New commits: commit b187c36e019f773a71687c819c3cf6a2c3fd2b89 Author: Sarper Akdemir <[email protected]> AuthorDate: Sun May 9 20:47:35 2021 +0300 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Jun 15 09:29:52 2021 +0200 tdf#59323: ooxml import: hasParagraphProperties Introduces hasParagraphProperties to determine whether or not there was a pPr tag in the textbody on import. Change-Id: I3c6815e8405b0087f64520ee4e0e39297b3b4548 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117005 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx index 8d0ce417f6b9..25a6ab194089 100644 --- a/oox/inc/drawingml/textbody.hxx +++ b/oox/inc/drawingml/textbody.hxx @@ -72,6 +72,9 @@ public: */ bool hasVisualRunProperties() const; + /// Returns whether the textbody had a pPr tag in it + bool hasParagraphProperties() const; + void ApplyStyleEmpty( const ::oox::core::XmlFilterBase& rFilterBase, const css::uno::Reference < css::text::XText > & xText, diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx index 4424eadf2cab..021434d6a5fb 100644 --- a/oox/inc/drawingml/textparagraph.hxx +++ b/oox/inc/drawingml/textparagraph.hxx @@ -53,6 +53,10 @@ public: TextParagraphProperties& getProperties() { return maProperties; } const TextParagraphProperties& getProperties() const { return maProperties; } + /// Flags the textparagraph as having a pPr tag in it + void setHasProperties() { mbHasProperties = true; } + /// Returns whether the textparagraph had an pPr tag in it during import + bool hasProperties() const { return mbHasProperties; } TextCharacterProperties& getEndProperties() { return maEndProperties; } const TextCharacterProperties& getEndProperties() const { return maEndProperties; } @@ -87,6 +91,7 @@ public: private: TextParagraphProperties maProperties; + bool mbHasProperties; TextCharacterProperties maEndProperties; TextRunVector maRuns; // temporarily store this here diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx index 9839f755dc39..5924728430a8 100644 --- a/oox/source/drawingml/textbody.cxx +++ b/oox/source/drawingml/textbody.cxx @@ -103,6 +103,16 @@ bool TextBody::hasVisualRunProperties() const return false; } +bool TextBody::hasParagraphProperties() const +{ + for ( auto& pTextParagraph : getParagraphs() ) + { + if ( pTextParagraph->hasProperties() ) + return true; + } + return false; +} + void TextBody::ApplyStyleEmpty( const ::oox::core::XmlFilterBase& rFilterBase, const Reference < XText > & xText, diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx index 49b50309f597..a10ba58a0499 100644 --- a/oox/source/drawingml/textbodycontext.cxx +++ b/oox/source/drawingml/textbodycontext.cxx @@ -89,6 +89,7 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken } case A_TOKEN( pPr ): case W_TOKEN( pPr ): + mrParagraph.setHasProperties(); return new TextParagraphPropertiesContext( *this, rAttribs, mrParagraph.getProperties() ); case A_TOKEN( endParaRPr ): return new TextCharacterPropertiesContext( *this, rAttribs, mrParagraph.getEndProperties() ); diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index b1c57205dc26..9e4f309e9391 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -38,6 +38,7 @@ using namespace ::com::sun::star::beans; namespace oox::drawingml { TextParagraph::TextParagraph() + : mbHasProperties( false ) { } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
