I stumbled on some duplicated code that could be cleaned up. So I did it. Modified Files: src/af/xap/win/xap_Win32DialogHelper.cpp src/af/xap/win/xap_Win32DialogHelper.h src/af/xap/win/xap_Win32Dlg_Language.cpp src/wp/ap/win/ap_Win32Dialog_MergeCells.cpp src/wp/ap/xp/ap_String_Id.h src/wp/ap/xp/ap_Toolbar_Iconmap.h src/wp/ap/xp/ap_Toolbar_Id_List.h
