diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-16 21:03:18 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-08-19 10:27:52 +0000 |
| commit | c1ba41e17fbf5039067b46df5c433a5811353d8b (patch) | |
| tree | 5c05b9e21f78c690128c63d07cffa31ba1fe9c9e /cui/source/tabpages | |
| parent | 6aea690903ac6ef5917e4038afdf1cd60f76ca27 (diff) | |
fdo#66827 sw: rename SID_ATTR_FILL_GRADIENT to SID_SW_ATTR_FILL_GRADIENT
Change-Id: Ieff7fc6a5b718e11de7d1e4ec2087d64a8a13cae
(cherry picked from commit f694f14ab64f48e40365fd877e201a0382297368)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 823cab696bdaa059e5d1243a636e7d975b2110cc)
Reviewed-on: https://gerrit.libreoffice.org/5464
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'cui/source/tabpages')
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index a8ce0a75eba8..bf6174a4d1de 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -806,16 +806,16 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) rCoreSet.ClearItem( nWhich ); // Handle XFILL_GRADIENT -> XFILL_SOLID - XFillStyleItem aFillStyleItem(XFILL_SOLID, GetWhich(SID_ATTR_FILL_STYLE)); + XFillStyleItem aFillStyleItem(XFILL_SOLID, GetWhich(SID_SW_ATTR_FILL_STYLE)); rCoreSet.Put(aFillStyleItem); } else { - XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), GetWhich(SID_ATTR_FILL_STYLE)); + XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), GetWhich(SID_SW_ATTR_FILL_STYLE)); rCoreSet.Put(aFillStyleItem); const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)m_rXFillSet.Get(XATTR_FILLGRADIENT); - XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), GetWhich(SID_ATTR_FILL_GRADIENT)); + XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), GetWhich(SID_SW_ATTR_FILL_GRADIENT)); rCoreSet.Put(aFillGradientItem); } } @@ -870,11 +870,11 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if (bIsGradient) { // Handle XFILL_BITMAP -> XFILL_GRADIENT - XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), GetWhich(SID_ATTR_FILL_STYLE)); + XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), GetWhich(SID_SW_ATTR_FILL_STYLE)); rCoreSet.Put(aFillStyleItem); const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)m_rXFillSet.Get(XATTR_FILLGRADIENT); - XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), GetWhich(SID_ATTR_FILL_GRADIENT)); + XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), GetWhich(SID_SW_ATTR_FILL_GRADIENT)); rCoreSet.Put(aFillGradientItem); } } @@ -1936,9 +1936,9 @@ void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) // If we get a gradient list, also read fill and gradient style. m_pGradientList = pGradientListItem->GetGradientList(); m_pLbGradients->Fill(m_pGradientList); - const XFillStyleItem& rFillStyleItem = (const XFillStyleItem&)aSet.Get(SID_ATTR_FILL_STYLE); + const XFillStyleItem& rFillStyleItem = (const XFillStyleItem&)aSet.Get(SID_SW_ATTR_FILL_STYLE); m_rXFillSet.Put(XFillStyleItem(rFillStyleItem.GetValue())); - const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)aSet.Get(SID_ATTR_FILL_GRADIENT); + const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)aSet.Get(SID_SW_ATTR_FILL_GRADIENT); m_rXFillSet.Put(XFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue())); } else |