cui/source/options/treeopt.cxx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
New commits: commit b15019d84f52f546294c0336382ea6217f833ed2 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Jun 26 16:37:09 2015 +0200 -fsanitize=vptr: SID_ATTR_*LANGUAGE are of type SvxLanguageItem Change-Id: If00273e3836aeb70adee36f49f0ef502b6a7aebb diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 7bfc713..9df70c3 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1252,11 +1252,23 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) const SfxPoolItem* pItem = NULL; SfxDispatcher* pDispatch = pViewFrame->GetDispatcher(); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem)) - pRet->Put(SfxUInt16Item(SID_ATTR_LANGUAGE, static_cast<const SvxLanguageItem*>(pItem)->GetLanguage())); + pRet->Put( + SvxLanguageItem( + (static_cast<const SvxLanguageItem*>(pItem) + ->GetLanguage()), + SID_ATTR_LANGUAGE)); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem)) - pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CJK_LANGUAGE, static_cast<const SvxLanguageItem*>(pItem)->GetLanguage())); + pRet->Put( + SvxLanguageItem( + (static_cast<const SvxLanguageItem*>(pItem) + ->GetLanguage()), + SID_ATTR_CHAR_CJK_LANGUAGE)); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem)) - pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CTL_LANGUAGE, static_cast<const SvxLanguageItem*>(pItem)->GetLanguage())); + pRet->Put( + SvxLanguageItem( + (static_cast<const SvxLanguageItem*>(pItem) + ->GetLanguage()), + SID_ATTR_CHAR_CTL_LANGUAGE)); pRet->Put(aHyphen); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem)) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits