oox: rename FillBitmapUrl to FillBitmap, remove obsolete methods

Change-Id: I597aaa280ef12e46cf2d060cef1b042413d838d4
Reviewed-on: https://gerrit.libreoffice.org/50851
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

2 files changed, 8 insertions, 13 deletions

diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index 8ba077ea3d27..2fb237cd496f 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -64,7 +64,7 @@ enum class ShapeProperty
     FillTransparency,
     GradientTransparency,
     FillGradient,                 /// Explicit fill gradient or name of a fill gradient stored in a global container.
-    FillBitmapUrl,                /// Explicit fill bitmap URL or name of a fill bitmap URL stored in a global container.
+    FillBitmap,                   /// Explicit fill bitmap or name of a fill bitmap stored in a global container.
     FillBitmapMode,
     FillBitmapSizeX,
     FillBitmapSizeY,
@@ -73,7 +73,7 @@ enum class ShapeProperty
     FillBitmapRectanglePoint,
     FillHatch,
     ShadowXDistance,
-    FillBitmapNameFromUrl,
+    FillBitmapName,
     FillBackground,
     LAST = FillBackground
 };
@@ -86,13 +86,13 @@ struct OOX_DLLPUBLIC ShapePropertyInfo
     bool mbNamedLineMarker;      /// True = use named line marker instead of explicit line marker.
     bool mbNamedLineDash;        /// True = use named line dash instead of explicit line dash.
     bool mbNamedFillGradient;    /// True = use named fill gradient instead of explicit fill gradient.
-    bool mbNamedFillBitmapUrl;   /// True = use named fill bitmap URL instead of explicit fill bitmap URL.
+    bool mbNamedFillBitmap;      /// True = use named fill bitmap instead of explicit fill bitmap.
 
     static ShapePropertyInfo DEFAULT;           /// Default property info (used as default parameter of other methods).
 
     explicit ShapePropertyInfo(const ShapePropertyIds& rnPropertyIds,
                                bool bNamedLineMarker, bool bNamedLineDash,
-                               bool bNamedFillGradient, bool bNamedFillBitmapUrl);
+                               bool bNamedFillGradient, bool bNamedFillBitmap);
 
     bool has(ShapeProperty ePropId) const
     {
@@ -143,10 +143,10 @@ private:
     bool setFillGradient( sal_Int32 nPropId, const css::uno::Any& rValue );
     /** Creates a named transparency gradient. */
     bool setGradientTrans( sal_Int32 nPropId, const css::uno::Any& rValue );
-    /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. */
-    bool setFillBitmapUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
-    /** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName */
-    bool setFillBitmapNameFromUrl( const css::uno::Any& rValue );
+    /** Sets an explicit fill bitmap, or creates a named fill bitmap. */
+    bool setFillBitmap( sal_Int32 nPropId, const css::uno::Any& rValue );
+    /** Sets an explicit fill bitmap and pushes the name to FillBitmapName */
+    bool setFillBitmapName( const css::uno::Any& rValue );
 
     // not implemented, to prevent implicit conversion from enum to int
     css::uno::Any& operator[]( ShapeProperty ePropId ) = delete;
diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx
index 694bdf13ddb7..eb9c7ba97228 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -105,15 +105,10 @@ public:
 
     OUString     insertTransGrandient( const css::awt::Gradient& rGradient );
 
-    /** Inserts a new named fill bitmap URL, returns the bitmap name, based on
-        an internal constant name with a new unused index appended. */
-    OUString     insertFillBitmapUrl( const OUString& rGraphicUrl );
-
     /** Inserts a new named fill graphic, returns the bitmap name, based on
         an internal constant name with a new unused index appended. */
     OUString insertFillBitmapXGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic);
 
-    OUString     getFillBitmapUrl( const OUString& rGraphicName );
     css::uno::Reference<css::awt::XBitmap> getFillBitmap(OUString const & rGraphicName);
 
 private: