[Libreoffice-commits] core.git: svx/source

[Tomaž Vajngerl]

 svx/source/unodraw/tableshape.cxx |    2 +-
 svx/source/unodraw/unoprov.cxx    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 008686d760ca735210e856c68b852425c8059bb7
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu May 17 12:33:59 2018 +0900

    use OWN_ATTR_REPLACEMENT_GRAPHIC for "ReplacementGraphic"
    
    For table shape we used OWN_ATTR_BITMAP as the identifier for the
    "RepalcementGraphic" property, but that is not really correct.
    More correct would be to use OWN_ATTR_REPLACEMENT_GRAPHIC, which
    name reflects exactly what the property is for and doesn't conflict
    with OWN_ATTR_BITMAP which is used for the "Bitmap" property.
    
    Change-Id: Ic76318addf8f53391f41251fe9d99dba57308165
    Reviewed-on: https://gerrit.libreoffice.org/54466
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 281dfa288ea9..ce25d445f781 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -120,7 +120,7 @@ bool SvxTableShape::getPropertyValueImpl(
         }
         return true;
     }
-    case OWN_ATTR_BITMAP:
+    case OWN_ATTR_REPLACEMENT_GRAPHIC:
     {
         if( HasSdrObject() )
         {
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 9cbb7796fdd8..8bbeceaaa980 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -759,7 +759,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
         { OUString("UseLastColumnStyle"),           OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0},
         { OUString("UseBandingRowStyle"),           OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0},
         { OUString("UseBandingColumnStyle"),        OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType<bool>::get(),0, 0},
-        { OUString("ReplacementGraphic"),           OWN_ATTR_BITMAP, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { OUString("ReplacementGraphic"),           OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };