* Transfer Intl member from LyXView to BufferView.

[features.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 86d8c8e761bf3df6fa100afb5abf53fc9d26ea04..e16a2da665e60296e04f6a506bbd70a54975d404 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -136,7 +136,8 @@ T * getInsetByCode(LCursor & cur, InsetBase::Code code)
 BufferView::BufferView(LyXView * owner)
        : owner_(owner), buffer_(0), wh_(0),
          cursor_(*this),
-         multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0)
+         multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0),
+         intl_(new Intl)
 {
        xsel_cache_.set = false;
 
@@ -149,6 +150,8 @@ BufferView::BufferView(LyXView * owner)
                        saved_positions[bm->get<0>()] = Position( bm->get<1>(), bm->get<2>(), bm->get<3>() );
        // and then clear them
        bmList.clear();
+
+       intl_->initKeyMapper(lyxrc.use_kbmap);
 }
 
 
@@ -594,13 +597,12 @@ void BufferView::switchKeyMap()
        if (!lyxrc.rtl_support)
                return;
 
-       Intl & intl = owner_->getIntl();
        if (getLyXText()->real_current_font.isRightToLeft()) {
-               if (intl.keymap == Intl::PRIMARY)
-                       intl.keyMapSec();
+               if (intl_->keymap == Intl::PRIMARY)
+                       intl_->keyMapSec();
        } else {
-               if (intl.keymap == Intl::SECONDARY)
-                       intl.keyMapPrim();
+               if (intl_->keymap == Intl::SECONDARY)
+                       intl_->keyMapPrim();
        }
 }
 
@@ -1261,12 +1263,6 @@ lyx::pit_type BufferView::anchor_ref() const
 }
 
 
-int BufferView::offset_ref() const
-{
-       return offset_ref_;
-}
-
-
 ViewMetricsInfo const & BufferView::viewMetricsInfo()
 {
        return metrics_info_;