diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-02-21 20:15:21 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-02-25 08:09:56 +0100 |
| commit | 4256ffa959f994f0964f7391fad70df8a9c884f0 (patch) | |
| tree | bf4bf55fa48f0e6af3093edf43d82c13a7f56615 /oox | |
| parent | 99223fc736c55cc1eb319ae1576b3998771e6b6f (diff) | |
fix import of graphic bullets
When changing to use "GraphicBitmap" property instead of
"ImageURL", the import wasn't adapted and there was no test which
would warn of such an situation. This also changes the difference
between writer and impress where impress used "Graphic" and not
"GraphicBitmap" property.
Also adds missing tests for both writer and impress
Change-Id: Ieed629d2d37f7806d63e729b6ef23cd848593071
Reviewed-on: https://gerrit.libreoffice.org/50140
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textparagraphproperties.cxx | 6 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 8f4e635db48c..807a2deff54f 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -346,9 +346,9 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P } if ( maGraphic.hasValue() ) { - Reference< css::awt::XBitmap > xBitmap( maGraphic, UNO_QUERY ); - if ( xBitmap.is() ) - rPropMap.setProperty( PROP_Graphic, xBitmap); + Reference<css::awt::XBitmap> xBitmap(maGraphic, UNO_QUERY); + if (xBitmap.is()) + rPropMap.setProperty(PROP_GraphicBitmap, xBitmap); } if( mnSize.hasValue() ) rPropMap.setAnyProperty( PROP_BulletRelSize, mnSize); diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index e90bd9c58912..b4da0cb63439 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -203,6 +203,7 @@ GenerateVbaEvents Geometry3D GradientName Graphic +GraphicBitmap GraphicColorMode GraphicCrop GraphicSize @@ -245,7 +246,6 @@ IgnoreBlankCells IgnoreCase IgnoreLeadingSpaces ImagePosition -ImageURL IncludeHiddenCells InputMessage InputTitle |