include/editeng/memberids.h | 1 -
sc/source/filter/excel/xlchart.cxx | 2 +-
svx/sdi/xoitems.sdi | 1 -
sw/inc/unoprnms.hxx | 2 --
sw/source/core/unocore/unoframe.cxx | 17 +++--------------
sw/source/core/unocore/unomap1.cxx | 2 --
sw/source/core/unocore/unostyle.cxx | 6 ++----
7 files changed, 6 insertions(+), 25 deletions(-)
New commits:
commit 9900c6bd96c23921757c2db0849bf7bbb8249c89
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Fri Mar 9 16:39:29 2018 +0900
completely remove MID_GRAFURL, replace with MID_BITMAP
Change-Id: I39b055760320abb2575958d525b4db3185a11d4a
Reviewed-on: https://gerrit.libreoffice.org/50990
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h
index 83860f672b2d..71de74d3a859 100644
--- a/include/editeng/memberids.h
+++ b/include/editeng/memberids.h
@@ -35,7 +35,6 @@
//NameOrIndex
#define MID_NAME 16
-#define MID_GRAFURL 32
// SvxPageModelItem
#define MID_AUTO 1
diff --git a/sc/source/filter/excel/xlchart.cxx
b/sc/source/filter/excel/xlchart.cxx
index b583c2df42ff..f1f8b287b5d4 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -1032,7 +1032,7 @@ void XclChPropSetHelper::WriteEscherProperties(
ScfPropertySet& rPropSet,
if( const XFillBitmapItem* pBmpItem =
rEscherFmt.mxItemSet->GetItem<XFillBitmapItem>( XATTR_FILLBITMAP, false ) )
{
uno::Any aBitmapAny;
- if( pBmpItem->QueryValue( aBitmapAny, MID_GRAFURL ) )
+ if (pBmpItem->QueryValue(aBitmapAny, MID_BITMAP))
{
OUString aBmpName = rBitmapTable.InsertObject(
aBitmapAny );
if( !aBmpName.isEmpty() )
diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi
index fdab81d817f3..015ead6e0d72 100644
--- a/svx/sdi/xoitems.sdi
+++ b/svx/sdi/xoitems.sdi
@@ -20,7 +20,6 @@
struct XFillBitmap
{
String Name MID_NAME;
- String GraphicsURL MID_GRAFURL;
// com::sun::star::awt::XBitmap
};
item XFillBitmap XFillBitmapItem;
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 45a811a0e4eb..135071cc128c 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -636,7 +636,6 @@
#define UNO_NAME_HEADER_FILLBACKGROUND "HeaderFillBackground"
#define UNO_NAME_HEADER_FILLBITMAP "HeaderFillBitmap"
#define UNO_NAME_HEADER_FILLBITMAPNAME "HeaderFillBitmapName"
-#define UNO_NAME_HEADER_FILLBITMAPURL "HeaderFillBitmapURL"
#define UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT "HeaderFillGradientStepCount"
#define UNO_NAME_HEADER_FILLGRADIENT "HeaderFillGradient"
#define UNO_NAME_HEADER_FILLGRADIENTNAME "HeaderFillGradientName"
@@ -663,7 +662,6 @@
#define UNO_NAME_FOOTER_FILLBACKGROUND "FooterFillBackground"
#define UNO_NAME_FOOTER_FILLBITMAP "FooterFillBitmap"
#define UNO_NAME_FOOTER_FILLBITMAPNAME "FooterFillBitmapName"
-#define UNO_NAME_FOOTER_FILLBITMAPURL "FooterFillBitmapURL"
#define UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT "FooterFillGradientStepCount"
#define UNO_NAME_FOOTER_FILLGRADIENT "FooterFillGradient"
#define UNO_NAME_FOOTER_FILLGRADIENTNAME "FooterFillGradientName"
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index dcd9b5295fba..c5576b90add4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -236,7 +236,6 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
// XFillBitmapItem: three possible slots supported in UNO API
const uno::Any* pXFillBitmapItem = nullptr; GetProperty(XATTR_FILLBITMAP,
MID_BITMAP, pXFillBitmapItem);
const uno::Any* pXFillBitmapNameItem = nullptr;
GetProperty(XATTR_FILLBITMAP, MID_NAME, pXFillBitmapNameItem);
- const uno::Any* pXFillBitmapURLItem = nullptr;
GetProperty(XATTR_FILLBITMAP, MID_GRAFURL, pXFillBitmapURLItem);
const uno::Any* pXFillTransparenceItem = nullptr;
GetProperty(XATTR_FILLTRANSPARENCE, 0, pXFillTransparenceItem);
const uno::Any* pXGradientStepCountItem = nullptr;
GetProperty(XATTR_GRADIENTSTEPCOUNT, 0, pXGradientStepCountItem);
@@ -268,7 +267,7 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
pXFillColorItem ||
pXFillGradientItem || pXFillGradientNameItem ||
pXFillHatchItem || pXFillHatchNameItem ||
- pXFillBitmapItem || pXFillBitmapNameItem || pXFillBitmapURLItem ||
+ pXFillBitmapItem || pXFillBitmapNameItem ||
pXFillTransparenceItem ||
pXGradientStepCountItem ||
pXFillBmpPosItem ||
@@ -435,7 +434,7 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
}
}
- if(pXFillBitmapItem || pXFillBitmapNameItem || pXFillBitmapURLItem)
+ if (pXFillBitmapItem || pXFillBitmapNameItem)
{
if(pXFillBitmapItem)
{
@@ -457,15 +456,6 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
bRet &= SvxShape::SetFillAttribute(XATTR_FILLBITMAP,
aTempName, rToSet);
}
-
- if(pXFillBitmapURLItem)
- {
- const Graphic aNullGraphic;
- XFillBitmapItem aXFillBitmapItem(aNullGraphic);
-
- aXFillBitmapItem.PutValue(*pXFillBitmapURLItem, MID_GRAFURL);
- rToSet.Put(aXFillBitmapItem);
- }
}
if (pXFillTransparenceItem)
@@ -1789,9 +1779,8 @@ void SwXFrame::setPropertyValue(const OUString&
rPropertyName, const ::uno::Any&
}
break;
}
- case MID_GRAFURL:
+ case MID_BITMAP:
{
- // Bitmap also has the MID_GRAFURL mode where a Bitmap URL
is used
switch(pEntry->nWID)
{
case XATTR_FILLBITMAP:
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index d80b8580c236..3c9e9720d990 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -622,7 +622,6 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPageStylePropertyMa
{ OUString(UNO_NAME_HEADER_FILLBACKGROUND),
XATTR_FILLBACKGROUND, cppu::UnoType<bool>::get(), 0, 0},
{ OUString(UNO_NAME_HEADER_FILLBITMAP),
XATTR_FILLBITMAP, cppu::UnoType<css::awt::XBitmap>::get(),
0, MID_BITMAP},
{ OUString(UNO_NAME_HEADER_FILLBITMAPNAME),
XATTR_FILLBITMAP, cppu::UnoType<OUString>::get(), 0,
MID_NAME },
- { OUString(UNO_NAME_HEADER_FILLBITMAPURL),
XATTR_FILLBITMAP, cppu::UnoType<OUString>::get(), 0,
MID_GRAFURL },
{ OUString(UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT),
XATTR_GRADIENTSTEPCOUNT, cppu::UnoType<sal_Int16>::get(), 0,
0},
{ OUString(UNO_NAME_HEADER_FILLGRADIENT),
XATTR_FILLGRADIENT, cppu::UnoType<css::awt::Gradient>::get(),
0, MID_FILLGRADIENT},
{ OUString(UNO_NAME_HEADER_FILLGRADIENTNAME),
XATTR_FILLGRADIENT, cppu::UnoType<OUString>::get(), 0,
MID_NAME },
@@ -650,7 +649,6 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPageStylePropertyMa
{ OUString(UNO_NAME_FOOTER_FILLBACKGROUND),
XATTR_FILLBACKGROUND, cppu::UnoType<bool>::get(), 0, 0},
{ OUString(UNO_NAME_FOOTER_FILLBITMAP),
XATTR_FILLBITMAP, cppu::UnoType<css::awt::XBitmap>::get(),
0, MID_BITMAP},
{ OUString(UNO_NAME_FOOTER_FILLBITMAPNAME),
XATTR_FILLBITMAP, cppu::UnoType<OUString>::get(), 0,
MID_NAME },
- { OUString(UNO_NAME_FOOTER_FILLBITMAPURL),
XATTR_FILLBITMAP, cppu::UnoType<OUString>::get(), 0,
MID_GRAFURL },
{ OUString(UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT),
XATTR_GRADIENTSTEPCOUNT, cppu::UnoType<sal_Int16>::get(), 0,
0},
{ OUString(UNO_NAME_FOOTER_FILLGRADIENT),
XATTR_FILLGRADIENT, cppu::UnoType<css::awt::Gradient>::get(),
0, MID_FILLGRADIENT},
{ OUString(UNO_NAME_FOOTER_FILLGRADIENTNAME),
XATTR_FILLGRADIENT, cppu::UnoType<OUString>::get(), 0,
MID_NAME },
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 1c395b1c9a5c..dcbdf4a79d76 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1623,11 +1623,10 @@ void
SwXStyle::SetPropertyValue<sal_uInt16(XATTR_FILLGRADIENT)>(const SfxItemPro
throw lang::IllegalArgumentException();
SvxShape::SetFillAttribute(rEntry.nWID, aValue.get<OUString>(),
rStyleSet);
}
- else if(MID_GRAFURL == nMemberId)
+ else if(MID_BITMAP == nMemberId)
{
if(sal_uInt16(XATTR_FILLBITMAP) == rEntry.nWID)
{
- // Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
const Graphic aNullGraphic;
SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
XFillBitmapItem aXFillBitmapItem(aNullGraphic);
@@ -3615,11 +3614,10 @@ uno::Reference< style::XAutoStyle >
SwXAutoStyleFamily::insertStyle(
SvxShape::SetFillAttribute(pEntry->nWID, aTempName,
aSet);
bDone = true;
}
- else if(MID_GRAFURL == nMemberId)
+ else if (MID_BITMAP == nMemberId)
{
if(XATTR_FILLBITMAP == pEntry->nWID)
{
- // Bitmap also has the MID_GRAFURL mode where a
Bitmap URL is used
const Graphic aNullGraphic;
XFillBitmapItem aXFillBitmapItem(aNullGraphic);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
