Attachment #574278 for bug #629818




				pvSugg->addItem (ucszSugg);
		}

		enchant_dict_free_string_list (m_dict, suggestions);
	}

	return pvSugg;


	if (word && len) {
		UT_UTF8String utf8 (word, len);
		enchant_dict_add (m_dict, utf8.utf8_str(), utf8.byteLength());
		return true;
	}
	return false;

	UT_return_val_if_fail (m_dict, false);

	UT_UTF8String ignore (toCorrect, toCorrectLen);
	return enchant_dict_is_added (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
}

void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)

Lines 94-100 Link Here

(-)a/configure.ac (-1 / +1 lines)
94	"	94	"
95		95
96	# optional deps	96	# optional deps
97	enchant_req='enchant >= 1.2.0'	97	enchant_req='enchant >= 2.1.1'
98	gio_req='gio-2.0'	98	gio_req='gio-2.0'
99	goffice_req='libgoffice-0.10 >= 0.10.0'	99	goffice_req='libgoffice-0.10 >= 0.10.0'
100		100

Lines 4197-4203 Link Here

(-)a/configure (-2 / +2 lines)
4197	"	4197	"
4198		4198
4199	# optional deps	4199	# optional deps
4200	enchant_req='enchant >= 1.2.0'	4200	enchant_req='enchant >= 2.1.1'
4201	gio_req='gio-2.0'	4201	gio_req='gio-2.0'
4202	goffice_req='libgoffice-0.10 >= 0.10.0'	4202	goffice_req='libgoffice-0.10 >= 0.10.0'
4203		4203
Lines 19582-19588 Link Here
19582		19582
19583	# TODO get rid of this after all platforms are using enchant exclusively	19583	# TODO get rid of this after all platforms are using enchant exclusively
19584		19584
19585	$as_echo "#define WITH_ENCHANT 1" >>confdefs.h	19585	$as_echo "#define WITH_ENCHANT 2" >>confdefs.h
19586		19586
19587	fi	19587	fi
19588	if test "$abi_cv_spell" = "yes"; then	19588	if test "$abi_cv_spell" = "yes"; then

Return to bug 629818

Lines 127-133 Link Here

(-)a/src/af/xap/xp/enchant_checker.cpp (-3 / +3 lines)
127	pvSugg->addItem (ucszSugg);	127	pvSugg->addItem (ucszSugg);
128	}	128	}
129		129
130	enchant_dict_free_suggestions (m_dict, suggestions);	130	enchant_dict_free_string_list (m_dict, suggestions);
131	}	131	}
132		132
133	return pvSugg;	133	return pvSugg;
Lines 139-145 Link Here
139		139
140	if (word && len) {	140	if (word && len) {
141	UT_UTF8String utf8 (word, len);	141	UT_UTF8String utf8 (word, len);
142	enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());	142	enchant_dict_add (m_dict, utf8.utf8_str(), utf8.byteLength());
143	return true;	143	return true;
144	}	144	}
145	return false;	145	return false;
Lines 150-156 Link Here
150	UT_return_val_if_fail (m_dict, false);	150	UT_return_val_if_fail (m_dict, false);
151		151
152	UT_UTF8String ignore (toCorrect, toCorrectLen);	152	UT_UTF8String ignore (toCorrect, toCorrectLen);
153	return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;	153	return enchant_dict_is_added (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
154	}	154	}
155		155
156	void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)	156	void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)