Kaydet (Commit) 6dbcf11f authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

refactor out to limit scope: FN_UNO_STYLE_INTEROP_GRAB_BAG

Change-Id: I0d85021ded0b33d9c2c8d2454ad737842323a099
üst d333bf69
...@@ -1425,6 +1425,13 @@ void SwXStyle::SetPropertyValue<FN_UNO_HIDDEN>(const SfxItemPropertySimpleEntry& ...@@ -1425,6 +1425,13 @@ void SwXStyle::SetPropertyValue<FN_UNO_HIDDEN>(const SfxItemPropertySimpleEntry&
} }
lcl_SetDefaultWay(rEntry, rPropSet, rValue, o_rStyleBase); lcl_SetDefaultWay(rEntry, rPropSet, rValue, o_rStyleBase);
} }
template<>
void SwXStyle::SetPropertyValue<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
{
o_rStyleBase.getNewBase()->GetItemSet();
o_rStyleBase.getNewBase()->SetGrabBagItem(rValue);
lcl_SetDefaultWay(rEntry, rPropSet, rValue, o_rStyleBase);
}
static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
const SfxItemPropertySet& rPropSet, const SfxItemPropertySet& rPropSet,
...@@ -1478,15 +1485,9 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, ...@@ -1478,15 +1485,9 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
switch(rEntry.nWID) switch(rEntry.nWID)
{ {
case FN_UNO_HIDDEN: case FN_UNO_HIDDEN:
case FN_UNO_STYLE_INTEROP_GRAB_BAG:
assert(false); assert(false);
break; break;
case FN_UNO_STYLE_INTEROP_GRAB_BAG:
{
rBase.getNewBase()->GetItemSet();
rBase.getNewBase()->SetGrabBagItem(rValue);
}
break;
case XATTR_FILLGRADIENT: case XATTR_FILLGRADIENT:
case XATTR_FILLHATCH: case XATTR_FILLHATCH:
case XATTR_FILLBITMAP: case XATTR_FILLBITMAP:
...@@ -2033,6 +2034,8 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl( ...@@ -2033,6 +2034,8 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl(
{ {
case FN_UNO_HIDDEN: case FN_UNO_HIDDEN:
SetPropertyValue<FN_UNO_HIDDEN>(*pEntry, *pPropSet, pValues[nProp], aBaseImpl); SetPropertyValue<FN_UNO_HIDDEN>(*pEntry, *pPropSet, pValues[nProp], aBaseImpl);
case FN_UNO_STYLE_INTEROP_GRAB_BAG:
SetPropertyValue<FN_UNO_STYLE_INTEROP_GRAB_BAG>(*pEntry, *pPropSet, pValues[nProp], aBaseImpl);
default: default:
lcl_SetStyleProperty(*pEntry, *pPropSet, pValues[nProp], aBaseImpl, m_pBasePool, m_pDoc, m_rEntry.m_eFamily); lcl_SetStyleProperty(*pEntry, *pPropSet, pValues[nProp], aBaseImpl, m_pBasePool, m_pDoc, m_rEntry.m_eFamily);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment