diff options
| -rw-r--r-- | svtools/source/control/valueset.cxx | 10 | ||||
| -rw-r--r-- | svx/source/tbxctrls/SvxColorValueSet.cxx | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 75a8d5374c54..dfcad5d4f6e7 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -105,13 +105,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V { WinBits nWinBits = WB_TABSTOP; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("border")); - if (aFind != rMap.end()) - { - if (toBool(aFind->second)) - nWinBits |= WB_BORDER; - rMap.erase(aFind); - } + OString sBorder = VclBuilder::extractCustomProperty(rMap); + if (!sBorder.isEmpty()) + nWinBits |= WB_BORDER; return new ValueSet(pParent, nWinBits); } diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 9c558c29f069..7f4924e4f45d 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -33,13 +33,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxColorValueSet(Window *pP { WinBits nWinBits = WB_TABSTOP; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("border")); - if (aFind != rMap.end()) - { - if (toBool(aFind->second)) - nWinBits |= WB_BORDER; - rMap.erase(aFind); - } + OString sBorder = VclBuilder::extractCustomProperty(rMap); + if (!sBorder.isEmpty()) + nWinBits |= WB_BORDER; return new SvxColorValueSet(pParent, nWinBits); } |