-fsanitize=vptr: SID_ATTR_*LANGUAGE are of type SvxLanguageItem

Change-Id: If00273e3836aeb70adee36f49f0ef502b6a7aebb
pranavk · Jun 26, 2015 · b15019d · b15019d
1 parent 4091b4f
commit b15019d
Showing 1 changed file with 15 additions and 3 deletions.
diff --git 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))