diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2023-01-23 09:33:13 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2023-01-26 19:49:09 +0000 |
| commit | e8335bac5690b6beccb5ca9b36281c89fb2f28f5 (patch) | |
| tree | 568665ba85b151d5590d5898555474d52cbccfe3 /include/oox | |
| parent | 7b0b6e5232585c3756c94ae15ae695eaa1f4fbe1 (diff) | |
tdf#153107 OOXML export: fix scale of tile of shape background
Relative scale values were exported as absolute values,
resulting broken shape background.
Change-Id: Ia38e125862e7f8ceff5d41754340723c3a9eb028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145996
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index c131632aea8d..3613eb49cdd0 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -248,16 +248,18 @@ public: void WriteGrabBagGradientFill( const css::uno::Sequence< css::beans::PropertyValue >& aGradientStops, css::awt::Gradient rGradient); - void WriteBlipOrNormalFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, - const OUString& rURLPropName ); - void WriteBlipFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, - const OUString& sURLPropName ); - void WriteBlipFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, - const OUString& sURLPropName, sal_Int32 nXmlNamespace ); + void WriteBlipOrNormalFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, + const OUString& rURLPropName, const css::awt::Size& rSize = {}); + void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, + const OUString& sURLPropName, const css::awt::Size& rSize = {}); + void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, + const css::awt::Size& rSize, const OUString& sURLPropName, + sal_Int32 nXmlNamespace); void WriteXGraphicBlipFill(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet, css::uno::Reference<css::graphic::XGraphic> const & rxGraphic, - sal_Int32 nXmlNamespace, bool bWriteMode, bool bRelPathToMedia = false); + sal_Int32 nXmlNamespace, bool bWriteMode, + bool bRelPathToMedia = false, css::awt::Size const& rSize = {}); void WritePattFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WritePattFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, @@ -276,7 +278,8 @@ public: css::uno::Reference<css::graphic::XGraphic> const & rxGraphic); void WriteXGraphicTile(css::uno::Reference<css::beans::XPropertySet> const& rXPropSet, - css::uno::Reference<css::graphic::XGraphic> const& rxGraphic); + css::uno::Reference<css::graphic::XGraphic> const& rxGraphic, + css::awt::Size const& rSize); void WriteLinespacing(const css::style::LineSpacing& rLineSpacing, float fFirstCharHeight); @@ -286,8 +289,9 @@ public: void WriteImageBrightnessContrastTransparence(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet); - void WriteXGraphicBlipMode(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet, - css::uno::Reference<css::graphic::XGraphic> const & rxGraphic); + void WriteXGraphicBlipMode(css::uno::Reference<css::beans::XPropertySet> const& rXPropSet, + css::uno::Reference<css::graphic::XGraphic> const& rxGraphic, + css::awt::Size const& rSize); void WriteShapeTransformation(const css::uno::Reference< css::drawing::XShape >& rXShape, sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false, bool bSuppressFlipping = false, bool bFlippedBeforeRotation = false); @@ -327,7 +331,8 @@ public: void WriteEmptyCustomGeometry(); void WritePolyPolygon(const css::uno::Reference<css::drawing::XShape>& rXShape, const bool bClosed); - void WriteFill( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ); + void WriteFill(const css::uno::Reference<css::beans::XPropertySet>& xPropSet, + const css::awt::Size& rSize = {}); void WriteShapeStyle( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WriteShapeEffect( std::u16string_view sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps ); |