diff --git a/src/ChangeLog b/src/ChangeLog index 5988f0d601..d24276a67a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-01-15 Dekel Tsur + + * paragraph.C (asString): Remove XForms RTL hacks. + 2003-01-13 Alfredo Braunstein * buffer.C: fix typo diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 1c29e38de9..0814620aa8 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2003-01-15 Dekel Tsur + + * ControlSpellchecker.[Ch]: Remove XForms RTL hacks. + 2003-01-11 Juergen Spitzmueller * helper_funcs.[Ch]: implement browseDir (browse directory) [bug 824] diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C index 03ce407d5a..8e94118f0b 100644 --- a/src/frontends/controllers/ControlSpellchecker.C +++ b/src/frontends/controllers/ControlSpellchecker.C @@ -30,13 +30,11 @@ #include "frontends/Alert.h" -#include "support/lstrings.h" - #include "BoostFormat.h" ControlSpellchecker::ControlSpellchecker(LyXView & lv, Dialogs & d) : ControlDialogBD(lv, d), - rtl_(false), newval_(0.0), oldval_(0), newvalue_(0), count_(0), + newval_(0.0), oldval_(0), newvalue_(0), count_(0), stop_(false), speller_(0) {} @@ -64,14 +62,6 @@ void ControlSpellchecker::setParams() } #endif - if (lyxrc.isp_use_alt_lang) { - Language const * lang = languages.getLanguage(tmp); - if (lang) - rtl_ = lang->RightToLeft(); - } else { - rtl_ = buffer()->params.language->RightToLeft(); - } - if (!speller_->error().empty()) { emergency_exit_ = true; Alert::alert("The spellchecker has failed", speller_->error()); @@ -153,21 +143,13 @@ void ControlSpellchecker::insert() string const ControlSpellchecker::getSuggestion() const { - string miss(speller_->nextMiss()); - - if (rtl_) - std::reverse(miss.begin(), miss.end()); - - return miss; + return speller_->nextMiss(); } string const ControlSpellchecker::getWord() const { - string tmp = word_.word(); - if (rtl_) - std::reverse(tmp.begin(), tmp.end()); - return tmp; + return word_.word(); } @@ -231,7 +213,6 @@ void ControlSpellchecker::clearParams() view().partialUpdate(2); // reset values to initial - rtl_ = false; newval_ = 0.0; oldval_ = 0; newvalue_ = 0; diff --git a/src/frontends/controllers/ControlSpellchecker.h b/src/frontends/controllers/ControlSpellchecker.h index aa359865cd..8d026dc9ac 100644 --- a/src/frontends/controllers/ControlSpellchecker.h +++ b/src/frontends/controllers/ControlSpellchecker.h @@ -71,9 +71,6 @@ private: /// not needed. virtual void apply() {} - /// right to left - bool rtl_; - /// current word being checked and lang code WordLangTuple word_; diff --git a/src/paragraph.C b/src/paragraph.C index 248b349d53..bd4a227814 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -49,7 +49,6 @@ using std::fstream; using std::ios; using std::lower_bound; using std::upper_bound; -using std::reverse; using lyx::pos_type; @@ -1748,9 +1747,6 @@ string const Paragraph::asString(Buffer const * buffer, bool label) const } } - if (isRightToLeftPar(bparams)) - reverse(s.begin() + len,s.end()); - return s; }