diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx index 2de9987..99dd4ca 100644 --- a/include/xmloff/txtprmap.hxx +++ b/include/xmloff/txtprmap.hxx @@ -205,6 +205,7 @@ #define CTF_SW_FILLHATCHNAME (XML_TEXT_CTF_START + 173) #define CTF_SW_FILLBITMAPNAME (XML_TEXT_CTF_START + 174) #define CTF_SW_FILLTRANSNAME (XML_TEXT_CTF_START + 175) +#define CTF_SW_FILLTRANSPARENCE (XML_TEXT_CTF_START + 176) #define TEXT_PROP_MAP_TEXT 0 #define TEXT_PROP_MAP_PARA 1 diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 7ac8db5..1bf2a63 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -390,6 +390,7 @@ void XMLTextImportPropertyMapper::finished( XMLPropertyState* pVertOrient = 0; XMLPropertyState* pVertOrientRelAsChar = 0; XMLPropertyState* pBackTransparency = NULL; // transparency in % + XMLPropertyState* pFillTransparence = NULL; XMLPropertyState* pBackTransparent = NULL; // transparency as boolean XMLPropertyState* pAllParaMargin = 0; XMLPropertyState* pParaMargins[4] = { 0, 0, 0, 0 }; @@ -482,6 +483,7 @@ void XMLTextImportPropertyMapper::finished( case CTF_FRAMEWIDTH_ABS: case CTF_FRAMEWIDTH_REL: bHasAnyWidth = true; break; + case CTF_SW_FILLTRANSPARENCE: pFillTransparence = property; break; case CTF_BACKGROUND_TRANSPARENCY: pBackTransparency = property; break; case CTF_BACKGROUND_TRANSPARENT: pBackTransparent = property; break; case CTF_PARAMARGINALL: @@ -655,6 +657,12 @@ void XMLTextImportPropertyMapper::finished( pBackTransparent->mnIndex = -1; } + if (pBackTransparency != NULL && pFillTransparence != NULL) + { + SAL_DEBUG("hm, both back transparency and fill transparence is there"); + pFillTransparence->mnIndex = -1; + } + // insert newly created properties. This invalidates all iterators! // Most of the pXXX variables in this method are iterators and will be diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index dba9a4f..f3ebecb 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -699,7 +699,7 @@ XMLPropertyMapEntry aXMLFramePropMap[] = GMAP( "FillHatchName", XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_SW_FILLHATCHNAME ), GMAP( "FillBackground", XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID, XML_TYPE_BOOL, 0 ), GMAP( "FillBitmapName", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_SW_FILLBITMAPNAME ), - GMAP( "FillTransparence", XML_NAMESPACE_DRAW, XML_OPACITY, XML_TYPE_NEG_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0 ), // exists in SW, too + GMAP( "FillTransparence", XML_NAMESPACE_DRAW, XML_OPACITY, XML_TYPE_NEG_PERCENT16|MID_FLAG_MULTI_PROPERTY, CTF_SW_FILLTRANSPARENCE ), // exists in SW, too GMAP( "FillTransparenceGradientName", XML_NAMESPACE_DRAW, XML_OPACITY_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_SW_FILLTRANSNAME ), GMAP( "FillBitmapSizeX", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SW_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 ), GMAP( "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SW_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 ),