summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-01-14 21:33:34 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-01-16 11:03:07 +0100
commitec5e17c4c8db3ece513822b8252a08b0cf993785 (patch)
tree83623de6cc2e82d9ce149779a6897e773a49d50a /sw
parent1cdedb290a93d949c9311b33698b48822e181fab (diff)
remove bDone band-aid
Change-Id: I7c4783ab70e7456d30ee86bb1c415e6d54df3285
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/unocore/unostyle.cxx44
1 files changed, 7 insertions, 37 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index f36ce71b3756..50ca5aefc0b8 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1742,7 +1742,7 @@ void SwXStyle::SetPropertyValue<SID_SWREGISTER_COLLECTION>(const SfxItemProperty
o_rStyleBase.GetItemSet().Put(SfxStringItem(SID_SWREGISTER_COLLECTION, aString ) );
}
template<>
-void SwXStyle::SetPropertyValue<RES_TXTATR_CJK_RUBY>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
+void SwXStyle::SetPropertyValue<RES_TXTATR_CJK_RUBY>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
{
if(MID_RUBY_CHARSTYLE != rEntry.nMemberId)
return;
@@ -1766,6 +1766,7 @@ void SwXStyle::SetPropertyValue<RES_TXTATR_CJK_RUBY>(const SfxItemPropertySimple
pRuby->SetCharFormatId(nId);
}
rStyleSet.Put(*pRuby);
+ lcl_SetDefaultWay(rEntry, rPropSet, rValue, o_rStyleBase);
}
template<>
void SwXStyle::SetPropertyValue<RES_PARATR_DROP>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
@@ -1811,104 +1812,73 @@ void SwXStyle::SetPropertyValue<RES_PARATR_NUMRULE>(const SfxItemPropertySimpleE
void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
- SfxStyleFamily eFamily = m_rEntry.m_eFamily;
- SwDoc* pDoc(m_pDoc);
- //UUUU adapted switch logic to a more readable state; removed goto's and made
- // execution of standard setting of proerty in ItemSet dependent of this variable
- bool bDone(false);
- uno::Any aValue(rValue);
- const auto nMemberId(lcl_TranslateMetric(rEntry, pDoc, aValue));
-
switch(rEntry.nWID)
{
case FN_UNO_HIDDEN:
SetPropertyValue<FN_UNO_HIDDEN>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case FN_UNO_STYLE_INTEROP_GRAB_BAG:
SetPropertyValue<FN_UNO_STYLE_INTEROP_GRAB_BAG>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case XATTR_FILLGRADIENT:
case XATTR_FILLHATCH:
case XATTR_FILLBITMAP:
case XATTR_FILLFLOATTRANSPARENCE:
SetPropertyValue<XATTR_FILLGRADIENT>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case RES_BACKGROUND:
SetPropertyValue<RES_BACKGROUND>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case OWN_ATTR_FILLBMP_MODE:
SetPropertyValue<OWN_ATTR_FILLBMP_MODE>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case RES_PAPER_BIN:
SetPropertyValue<RES_PAPER_BIN>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case FN_UNO_NUM_RULES: // special handling for a SvxNumRuleItem:
SetPropertyValue<FN_UNO_NUM_RULES>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case RES_PARATR_OUTLINELEVEL:
SetPropertyValue<RES_PARATR_OUTLINELEVEL>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case FN_UNO_FOLLOW_STYLE:
SetPropertyValue<FN_UNO_FOLLOW_STYLE>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case RES_PAGEDESC:
SetPropertyValue<RES_PAGEDESC>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case RES_TEXT_VERT_ADJUST:
SetPropertyValue<RES_TEXT_VERT_ADJUST>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case FN_UNO_IS_AUTO_UPDATE:
- {
SetPropertyValue<FN_UNO_IS_AUTO_UPDATE>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
- }
case FN_UNO_PARA_STYLE_CONDITIONS:
SetPropertyValue<FN_UNO_PARA_STYLE_CONDITIONS>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case FN_UNO_CATEGORY:
- {
SetPropertyValue<FN_UNO_CATEGORY>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
- }
case SID_SWREGISTER_COLLECTION:
- {
SetPropertyValue<SID_SWREGISTER_COLLECTION>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
- }
case RES_TXTATR_CJK_RUBY:
SetPropertyValue<RES_TXTATR_CJK_RUBY>(rEntry, rPropSet, rValue, rBase);
break;
case RES_PARATR_DROP:
SetPropertyValue<RES_PARATR_DROP>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
case RES_PARATR_NUMRULE:
SetPropertyValue<RES_PARATR_NUMRULE>(rEntry, rPropSet, rValue, rBase);
- bDone = true;
break;
default:
- {
- // nothing to do
+ //UUUU adapted switch logic to a more readable state; removed goto's and made
+ // execution of standard setting of proerty in ItemSet dependent of this variable
+ uno::Any aValue(rValue);
+ lcl_TranslateMetric(rEntry, m_pDoc, aValue);
+ lcl_SetDefaultWay(rEntry, rPropSet, aValue, rBase);
break;
- }
}
- if(!bDone)
- lcl_SetDefaultWay(rEntry, rPropSet, aValue, rBase);
}
void SAL_CALL SwXStyle::SetPropertyValues_Impl(