From e030fbbf67a2490c4e734583d9f987c27506179e Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Tue, 6 Mar 2018 18:29:40 +0900
Subject: oox: remove property FillBitmapURL, BackGraphicURL and GraphicURL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1f75b1775fec4b47ad78a32724785333a90d3baf
Reviewed-on: https://gerrit.libreoffice.org/50809
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 oox/source/drawingml/shapepropertymap.cxx |  2 +-
 oox/source/export/drawingml.cxx           | 28 +++++++---------------------
 oox/source/token/properties.txt           |  3 ---
 3 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'oox')

diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx
index c0704381b19c..6d487f51c2ed 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -43,7 +43,7 @@ static const ShapePropertyIds spnDefaultShapeIds =
     PROP_LineStyle, PROP_LineWidth, PROP_LineColor, PROP_LineTransparence, PROP_LineDash, PROP_LineJoint,
     PROP_LineStartName, PROP_LineStartWidth, PROP_LineStartCenter, PROP_LineEndName, PROP_LineEndWidth, PROP_LineEndCenter,
     PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_FillTransparenceGradientName, PROP_FillGradient,
-    PROP_FillBitmapURL, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY,
+    PROP_FillBitmap, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY,
     PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint,
     PROP_FillHatch,
     PROP_ShadowXDistance,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index d3ccf3d81223..ca7c303acd6e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1220,39 +1220,25 @@ void DrawingML::WriteBlipFill( const Reference< XPropertySet >& rXPropSet, const
 {
     if ( GetProperty( rXPropSet, sURLPropName ) )
     {
+        uno::Reference<graphic::XGraphic> xGraphic;
         if (mAny.has<uno::Reference<awt::XBitmap>>())
         {
             uno::Reference<awt::XBitmap> xBitmap;
             xBitmap = mAny.get<uno::Reference<awt::XBitmap>>();
-            uno::Reference<graphic::XGraphic> xGraphic(xBitmap, uno::UNO_QUERY);
-            if (xBitmap.is() && xGraphic.is())
-            {
-                bool bWriteMode = false;
-                if (sURLPropName == "FillBitmap" || sURLPropName == "BackGraphic")
-                    bWriteMode = true;
-                WriteXGraphicBlipFill(rXPropSet, xGraphic, nXmlNamespace, bWriteMode);
-            }
+            if (xBitmap.is())
+                xGraphic.set(xBitmap, uno::UNO_QUERY);
         }
         else if (mAny.has<uno::Reference<graphic::XGraphic>>())
         {
-            uno::Reference<graphic::XGraphic> xGraphic;
             xGraphic = mAny.get<uno::Reference<graphic::XGraphic>>();
-            if (xGraphic.is())
-            {
-                bool bWriteMode = false;
-                if (sURLPropName == "FillBitmap" || sURLPropName == "BackGraphic")
-                    bWriteMode = true;
-                WriteXGraphicBlipFill(rXPropSet, xGraphic, nXmlNamespace, bWriteMode);
-            }
         }
-        else
+
+        if (xGraphic.is())
         {
-            OUString aURL;
-            mAny >>= aURL;
             bool bWriteMode = false;
-            if( sURLPropName == "FillBitmapURL" || sURLPropName == "BackGraphicURL")
+            if (sURLPropName == "FillBitmap" || sURLPropName == "BackGraphic")
                 bWriteMode = true;
-            WriteBlipFill( rXPropSet, aURL, nXmlNamespace, bWriteMode );
+            WriteXGraphicBlipFill(rXPropSet, xGraphic, nXmlNamespace, bWriteMode);
         }
     }
 }
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 6754ee58558c..86dd843d12b7 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -22,7 +22,6 @@ BackColor
 BackColorTransparency
 BackGraphicLocation
 BackGraphic
-BackGraphicURL
 Background
 BackgroundColor
 BasicLibraries
@@ -167,7 +166,6 @@ FillBitmapPositionOffsetY
 FillBitmapRectanglePoint
 FillBitmapSizeX
 FillBitmapSizeY
-FillBitmapURL
 FillBitmap
 FillColor
 FillGradient
@@ -209,7 +207,6 @@ GraphicBitmap
 GraphicColorMode
 GraphicCrop
 GraphicSize
-GraphicURL
 GridColor
 GroupInfo
 GroupName
-- 
cgit