diff options
| author | sushil_shinde <sushil.shinde@synerzip.com> | 2014-01-02 16:31:26 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-06 11:25:09 +0100 |
| commit | 854d7a1cc77b82ef6b5d72a7889743c1ebe6fe6e (patch) | |
| tree | 87f945dd4bf58bd4d8642c891bf48e8a373cb041 /oox | |
| parent | 6fd47306eb393d3c99c552ffc851f4edf245f8c8 (diff) | |
fdo#73217 : Textbox with picture fill are rendered and saved properly.
- Bitmap url was not stored propertly for textframes.
- Exported background image fill for text box properly.
- Added unit test.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7259
Change-Id: I1fbab24b2a83b22be04fd6950c80ddf274436738
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 6 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index b42e27e579c9..b191762efe29 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -633,6 +633,12 @@ Reference< XShape > Shape::createAndInsert( aShapeProps.setProperty(PROP_BackColorTransparency, aShapeProps[PROP_FillTransparence]); aShapeProps.erase(PROP_FillTransparence); } + // TextFrames have BackGrahicURL, not FillBitmapURL + if (aShapeProps.hasProperty(PROP_FillBitmapURL)) + { + aShapeProps.setProperty(PROP_BackGraphicURL, aShapeProps[PROP_FillBitmapURL]); + aShapeProps.erase(PROP_FillBitmapURL); + } // And no LineColor property; individual borders can have colors if (aShapeProps.hasProperty(PROP_LineColor)) { diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 030beb5fe547..b533d747371b 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -608,7 +608,7 @@ void DrawingML::WriteBlipFill( Reference< XPropertySet > rXPropSet, OUString sUR WriteBlip( rXPropSet, aURL ); - if( sURLPropName == "FillBitmapURL" ) + if( sURLPropName == "FillBitmapURL" || sURLPropName == "BackGraphicURL") WriteBlipMode( rXPropSet ); else if( GetProperty( rXPropSet, "FillBitmapStretch" ) ) { bool bStretch = false; |