sw/source/core/unocore/unomap.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b7493a65160a55ed3885aaa56ecb99646e615c87
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Apr 20 17:19:02 2015 +0200
tdf#90640: sw: ODF export: fix wrong property types in FILL_PROPERTIES_SW
Wrong type causes draw:opacity not to be exported from FillTransparence.
(regression from 6e61ecd09679a66060f932835622821d39e92f01)
Change-Id: I478fc34dfb614f0433a6e28b0260379528b86680
(cherry picked from commit 822cb231c9aee2b69d0e645d2fddbab1dfbe3d14)
Reviewed-on: https://gerrit.libreoffice.org/15461
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index 540f4b5..c59cf80 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -569,7 +569,7 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
//UUUU
#define FILL_PROPERTIES_SW_BMP \
- { OUString(UNO_NAME_SW_FILLBMP_LOGICAL_SIZE),
XATTR_FILLBMP_SIZELOG, cppu::UnoType<float>::get(), 0, 0}, \
+ { OUString(UNO_NAME_SW_FILLBMP_LOGICAL_SIZE),
XATTR_FILLBMP_SIZELOG, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_SW_FILLBMP_OFFSET_X),
XATTR_FILLBMP_TILEOFFSETX, cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_SW_FILLBMP_OFFSET_Y),
XATTR_FILLBMP_TILEOFFSETY, cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_SW_FILLBMP_POSITION_OFFSET_X),
XATTR_FILLBMP_POSOFFSETX, cppu::UnoType<sal_Int32>::get(), 0, 0}, \
@@ -577,8 +577,8 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ OUString(UNO_NAME_SW_FILLBMP_RECTANGLE_POINT),
XATTR_FILLBMP_POS, cppu::UnoType<css::drawing::RectanglePoint>::get(),
0, 0}, \
{ OUString(UNO_NAME_SW_FILLBMP_SIZE_X),
XATTR_FILLBMP_SIZEX, cppu::UnoType<sal_Int32>::get(), 0,
SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_SW_FILLBMP_SIZE_Y),
XATTR_FILLBMP_SIZEY, cppu::UnoType<sal_Int32>::get(), 0,
SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_SW_FILLBMP_STRETCH),
XATTR_FILLBMP_STRETCH, cppu::UnoType<float>::get(), 0, 0}, \
- { OUString(UNO_NAME_SW_FILLBMP_TILE),
XATTR_FILLBMP_TILE, cppu::UnoType<float>::get(), 0, 0},\
+ { OUString(UNO_NAME_SW_FILLBMP_STRETCH),
XATTR_FILLBMP_STRETCH, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_SW_FILLBMP_TILE),
XATTR_FILLBMP_TILE, cppu::UnoType<bool>::get(), 0, 0},\
{ OUString(UNO_NAME_SW_FILLBMP_MODE),
OWN_ATTR_FILLBMP_MODE, cppu::UnoType<drawing::BitmapMode>::get(), 0, 0}, \
//UUUU
@@ -599,7 +599,7 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ OUString(UNO_NAME_SW_FILLHATCH), XATTR_FILLHATCH,
cppu::UnoType<css::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \
{ OUString(UNO_NAME_SW_FILLHATCHNAME), XATTR_FILLHATCH,
cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
{ OUString(UNO_NAME_SW_FILLSTYLE), XATTR_FILLSTYLE,
cppu::UnoType<css::drawing::FillStyle>::get(), 0, 0}, \
- { OUString(UNO_NAME_SW_FILL_TRANSPARENCE),
XATTR_FILLTRANSPARENCE, cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_SW_FILL_TRANSPARENCE),
XATTR_FILLTRANSPARENCE, cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_SW_FILLTRANSPARENCEGRADIENT),
XATTR_FILLFLOATTRANSPARENCE, cppu::UnoType<css::awt::Gradient>::get(), 0,
MID_FILLGRADIENT}, \
{ OUString(UNO_NAME_SW_FILLTRANSPARENCEGRADIENTNAME),
XATTR_FILLFLOATTRANSPARENCE, cppu::UnoType<OUString>::get(), 0, MID_NAME
}, \
{ OUString(UNO_NAME_SW_FILLCOLOR_2),
XATTR_SECONDARYFILLCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0}, \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
