From 486d340423f28c94348efb807e3364bc94b18105 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Thu, 17 May 2018 18:45:21 +0900
Subject: tdf#117502 fix graphical bullets for OOXML and RTF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change has multiple parts:
- Move "BulletAsImage" test from ODT only to globalfilter and
  run it on ODT, DOC, DOCX, RTF formats and extend checks of
  the XGraphic used for the bullets and the size.
- Check if GIF is animated as we need to know this in unloaded
  graphic or bullets aren't rendered correctly if we assume
  they are animated.
- Use "Graphic" property in writerfilter to get the graphic from
  a XShape and not the "Bitmap" property which returns a Graphic
  as a MetaFile and not the original Graphic.
- Make sure "GraphicBitmap" is filled with XBitmap and not with
  XGraphic.
- Change "testFDO74215" to use the expected bullet size as it
  is in the original document. Looks like the initial bug was
  just asserting the bullet size is set to a value (non-zero).

Change-Id: I6b151c0bf9f426669e07522f0fc699fbb652046b
Reviewed-on: https://gerrit.libreoffice.org/54477
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 writerfilter/source/dmapper/NumberingManager.hxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'writerfilter/source/dmapper/NumberingManager.hxx')

diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index f93269b5b1f9..98e029d2188b 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -29,6 +29,7 @@
 
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/awt/XBitmap.hpp>
 
 namespace writerfilter {
 namespace dmapper {
@@ -47,7 +48,7 @@ class ListLevel : public PropertyMap
     sal_Int16                                     m_nXChFollow;      //LN_IXCHFOLLOW
     OUString                               m_sBulletChar;
     css::awt::Size                         m_aGraphicSize;
-    css::uno::Reference<css::graphic::XGraphic> m_sGraphicBitmap;
+    css::uno::Reference<css::awt::XBitmap> m_xGraphicBitmap;
     sal_Int32                                     m_nTabstop;
     std::shared_ptr< StyleSheetEntry >          m_pParaStyle;
     bool                                          m_outline;
@@ -71,8 +72,8 @@ public:
     void SetBulletChar( const OUString& sValue ) { m_sBulletChar = sValue; };
     void SetGraphicSize( const css::awt::Size& aValue ) { m_aGraphicSize = aValue; };
 
-    void SetGraphicBitmap(css::uno::Reference<css::graphic::XGraphic> const& sValue)
-        { m_sGraphicBitmap = sValue; }
+    void SetGraphicBitmap(css::uno::Reference<css::awt::XBitmap> const& xGraphicBitmap)
+        { m_xGraphicBitmap = xGraphicBitmap; }
     void SetParaStyle( const std::shared_ptr< StyleSheetEntry >& pStyle );
 
     // Getters
-- 
cgit