diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-02-14 02:15:54 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-02-15 13:15:32 +0100 |
| commit | 5fba3d6ddef478b12bd15906682474400845a02b (patch) | |
| tree | 157e33b5a67a8df5d2f937078474bc74a60f645e /oox/inc | |
| parent | aff321ae3c872ad881252979c9f10ab1a01c0ea0 (diff) | |
tdf#51340: Line spacing is imported incorrectly from PPTX
Move the line spacing member to the TextParagraphProperties class
which is used to do the inheritance from master / layout slides.
Reviewed-on: https://gerrit.libreoffice.org/49692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 53551d49d3be2301985f2cf2d8bb23ff374ecfd1)
Change-Id: I0bf92420963163eae78e06ebc7fdfa1f2c72fdf8
Reviewed-on: https://gerrit.libreoffice.org/49745
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/textparagraphproperties.hxx | 4 | ||||
| -rw-r--r-- | oox/inc/drawingml/textparagraphpropertiescontext.hxx | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx index cac6d64f0447..2710dcb484b2 100644 --- a/oox/inc/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -97,6 +97,9 @@ public: boost::optional< css::style::ParagraphAdjust >& getParaAdjust() { return moParaAdjust; } void setParaAdjust( css::style::ParagraphAdjust nParaAdjust ) { moParaAdjust = nParaAdjust; } + TextSpacing& getLineSpacing() { return maLineSpacing; } + void setLineSpacing( const TextSpacing& rLineSpacing ) { maLineSpacing = rLineSpacing; } + void apply( const TextParagraphProperties& rSourceProps ); void pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, const css::uno::Reference < css::beans::XPropertySet > & xPropSet, @@ -126,6 +129,7 @@ protected: boost::optional< sal_Int32 > moFirstLineIndentation; boost::optional< css::style::ParagraphAdjust > moParaAdjust; sal_Int16 mnLevel; + TextSpacing maLineSpacing; }; } } diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx index 2de92b5b05ab..3cd2d0d375b4 100644 --- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx +++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx @@ -42,7 +42,6 @@ public: private: TextParagraphProperties& mrTextParagraphProperties; - TextSpacing maLineSpacing; BulletList& mrBulletList; std::vector< css::style::TabStop > maTabList; std::shared_ptr< BlipFillProperties > mxBlipProps; |