diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-28 13:27:00 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-28 13:49:41 +0100 |
| commit | d8de1d6070b7e89fcb5e51307d20b081e83fd02d (patch) | |
| tree | 72d72ac063168f9f8166eaa36fad9f99203dd730 | |
| parent | a1bef744a24b072adc22035b5b15b376961351d8 (diff) | |
XFillGradientItem: don't assume the default Which ID
Change-Id: I2baced123f957fb47f7710c122664842e0b1bb1d
| -rw-r--r-- | svx/inc/svx/xflgrit.hxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xattr.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index 9fd04901120e..52cc5c754699 100644 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -38,7 +38,7 @@ public: XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {} XFillGradientItem(sal_uInt16 nWhich_) : NameOrIndex(nWhich_, -1) {} XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient); - XFillGradientItem(const UniString& rName, const XGradient& rTheGradient); + XFillGradientItem(const UniString& rName, const XGradient& rTheGradient, sal_uInt16 nWhich_ = XATTR_FILLGRADIENT); XFillGradientItem(const XGradient& rTheGradient); XFillGradientItem(const XFillGradientItem& rItem); XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 5a176b2d7931..e2e8a15a94d8 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -3163,8 +3163,8 @@ XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, *************************************************************************/ XFillGradientItem::XFillGradientItem(const XubString& rName, - const XGradient& rTheGradient) : - NameOrIndex(XATTR_FILLGRADIENT, rName), + const XGradient& rTheGradient, sal_uInt16 nWhich_) : + NameOrIndex(nWhich_, rName), aGradient(rTheGradient) { } @@ -3601,7 +3601,7 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con // if the given name is not valid, replace it! if( aUniqueName != GetName() ) - return new XFillGradientItem( aUniqueName, aGradient ); + return new XFillGradientItem( aUniqueName, aGradient, Which() ); } return (XFillGradientItem*)this; |