sw: import draw:fill-gradient-name for Writer textframes

Change-Id: I695cf16bc3b06823ae9e0546cb751e41eb201706

svx/source/xoutdev/xattr.cxx

@@ -3594,7 +3594,7 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con
     if( pModel )
     {
         const String aUniqueName = NameOrIndex::CheckNamedItem(
-                this, XATTR_FILLGRADIENT, &pModel->GetItemPool(),
+                this, Which(), &pModel->GetItemPool(),
                 pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL,
                 XFillGradientItem::CompareValueFunc, RID_SVXSTR_GRADIENT,
                 pModel->GetPropertyList( XGRADIENT_LIST ) );

sw/source/core/unocore/unoframe.cxx

@@ -236,11 +236,29 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SwDoc* pDoc, SfxItemSet& rToSe
             XFillGradientItem aFillGradient( static_cast <const :: XFillGradientItem & > ( rFromSet.Get ( RES_FILL_GRADIENT ) ) );
             XFillGradientItem* pItem = &aFillGradient;
             if (pFillGradient)
+            {
                 bRet &= ((SfxPoolItem*)pItem)->PutValue(*pFillGradient, MID_FILLGRADIENT);
+                // If gradient is set directly, we always generate an associated style name for it.
+                SdrModel* pModel = pDoc->GetDrawModel();
+                pItem = pItem->checkForUniqueItem( pModel );
+            }
             if (pName)
+            {
                 bRet &= ((SfxPoolItem*)pItem)->PutValue(*pName, MID_NAME);
-            SdrModel* pModel = pDoc->GetDrawModel();
-            pItem = pItem->checkForUniqueItem( pModel );
+                // Look up the associated style name.
+                SfxItemPool& rPool = pDoc->GetDrawModel()->GetItemPool();
+                const sal_uInt32 nCount = rPool.GetItemCount2(XATTR_FILLGRADIENT);
+                const XFillGradientItem* pStyleItem;
+                for (sal_uInt32 i = 0; i < nCount; ++i)
+                {
+                    pStyleItem = (XFillGradientItem*)rPool.GetItem2(XATTR_FILLGRADIENT, i);
+                    if (pStyleItem && pStyleItem->GetName() == pItem->GetName())
+                    {
+                        pItem->SetGradientValue(pStyleItem->GetGradientValue());
+                        break;
+                    }
+                }
+            }
             if (pItem)
             {
                 rToSet.Put(*pItem);