[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-1' - cui/source include/svx sw/source
Miklos Vajna
vmiklos at suse.cz
Mon Aug 19 03:28:23 PDT 2013
cui/source/tabpages/backgrnd.cxx | 14 +++++++-------
include/svx/svxids.hrc | 2 ++
sw/source/core/bastyp/init.cxx | 4 ++--
sw/source/ui/frmdlg/frmdlg.cxx | 4 ++--
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit c1ba41e17fbf5039067b46df5c433a5811353d8b
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Aug 16 21:03:18 2013 +0200
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 at redhat.com>
(cherry picked from commit 823cab696bdaa059e5d1243a636e7d975b2110cc)
Reviewed-on: https://gerrit.libreoffice.org/5464
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Reviewed-by: Petr Mladek <pmladek at suse.cz>
Tested-by: Petr Mladek <pmladek at suse.cz>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a8ce0a7..bf6174a 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
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6f91c28..5c2412b 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -955,6 +955,8 @@
#define FN_SVX_SET_NUMBER (SID_SVX_START+1136)
#define FN_SVX_SET_BULLET (SID_SVX_START+1137)
+#define SID_SW_ATTR_FILL_STYLE (SID_SVX_START+1138)
+#define SID_SW_ATTR_FILL_GRADIENT (SID_SVX_START+1139)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 991cdd1..c898de6 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 3b328d8..32cb560 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);
More information about the Libreoffice-commits
mailing list