From 008686d760ca735210e856c68b852425c8059bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Thu, 17 May 2018 12:33:59 +0900 Subject: [PATCH] use OWN_ATTR_REPLACEMENT_GRAPHIC for "ReplacementGraphic" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tomaž Vajngerl --- svx/source/unodraw/tableshape.cxx | 2 +- svx/source/unodraw/unoprov.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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::get(),0, 0}, { OUString("UseBandingRowStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType::get(),0, 0}, { OUString("UseBandingColumnStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType::get(),0, 0}, - { OUString("ReplacementGraphic"), OWN_ATTR_BITMAP, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("ReplacementGraphic"), OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } };