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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/core/bastyp/init.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/frmdlg.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 991cdd1caa2c..c898de64b03f 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -381,8 +381,8 @@ SfxItemInfo aSlotTab[] = { 0, 0 }, // RES_AUTO_STYLE { 0, SFX_ITEM_POOLABLE }, // RES_FRMATR_STYLE_NAME { 0, SFX_ITEM_POOLABLE }, // RES_FRMATR_CONDITIONAL_STYLE_NAME - { SID_ATTR_FILL_STYLE, SFX_ITEM_POOLABLE }, // RES_FILL_STYLE - { SID_ATTR_FILL_GRADIENT, SFX_ITEM_POOLABLE }, // RES_FILL_GRADIENT + { SID_SW_ATTR_FILL_STYLE, SFX_ITEM_POOLABLE }, // RES_FILL_STYLE + { SID_SW_ATTR_FILL_GRADIENT, SFX_ITEM_POOLABLE }, // RES_FILL_GRADIENT { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_MIRRORGRF { SID_ATTR_GRAF_CROP, SFX_ITEM_POOLABLE }, // RES_GRFATR_CROPGRF diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 3b328d8ab5d3..32cb560ce075 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -182,11 +182,11 @@ void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SvxGradientListItem aGradientListItem(m_pWrtShell->GetDoc()->GetOrCreateDrawModel()->GetGradientList(), SID_GRADIENT_LIST); aSet.Put(aGradientListItem); - XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rSet.Get(RES_FILL_STYLE)).GetValue(), SID_ATTR_FILL_STYLE); + XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rSet.Get(RES_FILL_STYLE)).GetValue(), SID_SW_ATTR_FILL_STYLE); aSet.Put(aFillStyleItem); const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)m_rSet.Get(RES_FILL_GRADIENT); - XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), SID_ATTR_FILL_GRADIENT); + XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), SID_SW_ATTR_FILL_GRADIENT); aSet.Put(aFillGradientItem); rPage.PageCreated(aSet); |