Cleanup the TEXT_TO_INSET_OFFSET mess. This correction is done now once in InsetText...

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 2dc4086bb4484d060b6990dcb69a6534edeb3a61..97462277b3a45ab776e455c842be93cb4b50ed87 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -293,27 +293,28 @@ void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
 }
 
 
-void LyXFunc::processKeySym(KeySymbolPtr keysym, key_modifier::state state)
+void LyXFunc::processKeySym(KeySymbol const & keysym,
+               key_modifier::state state)
 {
-       LYXERR(Debug::KEY) << "KeySym is " << keysym->getSymbolName() << endl;
+       LYXERR(Debug::KEY) << "KeySym is " << keysym.getSymbolName() << endl;
 
        // Do nothing if we have nothing (JMarc)
-       if (!keysym->isOK()) {
+       if (!keysym.isOK()) {
                LYXERR(Debug::KEY) << "Empty kbd action (probably composing)"
                                   << endl;
                return;
        }
 
-       if (keysym->isModifier()) {
+       if (keysym.isModifier()) {
                LYXERR(Debug::KEY) << "isModifier true" << endl;
                return;
        }
 
        //Encoding const * encoding = view()->cursor().getEncoding();
-       //encoded_last_key = keysym->getISOEncoded(encoding ? encoding->name() : "");
+       //encoded_last_key = keysym.getISOEncoded(encoding ? encoding->name() : "");
        // FIXME: encoded_last_key shadows the member variable of the same
        // name. Is that intended?
-       char_type encoded_last_key = keysym->getUCSEncoded();
+       char_type encoded_last_key = keysym.getUCSEncoded();
 
        // Do a one-deep top-level lookup for
        // cancel and meta-fake keys. RVDK_PATCH_5
@@ -371,7 +372,7 @@ void LyXFunc::processKeySym(KeySymbolPtr keysym, key_modifier::state state)
                // Hmm, we didn't match any of the keysequences. See
                // if it's normal insertable text not already covered
                // by a binding
-               if (keysym->isText() && keyseq->length() == 1) {
+               if (keysym.isText() && keyseq->length() == 1) {
                        LYXERR(Debug::KEY) << "isText() is true, inserting." << endl;
                        func = FuncRequest(LFUN_SELF_INSERT,
                                           FuncRequest::KEYBOARD);
@@ -731,6 +732,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_BUFFER_PARAMS_APPLY:
        case LFUN_LAYOUT_MODULES_CLEAR:
        case LFUN_LAYOUT_MODULE_ADD:
+       case LFUN_LAYOUT_RELOAD:
        case LFUN_LYXRC_APPLY:
        case LFUN_BUFFER_NEXT:
        case LFUN_BUFFER_PREVIOUS:
@@ -803,7 +805,7 @@ void showPrintError(string const & name)
 }
 
 
-void loadTextclass(string const & name)
+void loadTextClass(string const & name)
 {
        std::pair<bool, textclass_type> const tc_pair =
                textclasslist.numberOfClass(name);
@@ -1812,7 +1814,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        BOOST_ASSERT(lyx_view_);
                        Buffer * buffer = lyx_view_->buffer();
 
-                       loadTextclass(argument);
+                       loadTextClass(argument);
 
                        std::pair<bool, textclass_type> const tc_pair =
                                textclasslist.numberOfClass(argument);
@@ -1835,9 +1837,21 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        updateFlags = Update::Force | Update::FitCursor;
                        break;
                }
+               
+               case LFUN_LAYOUT_RELOAD: {
+                       BOOST_ASSERT(lyx_view_);
+                       Buffer * buffer = lyx_view_->buffer();
+                       TextClass_ptr oldClass = buffer->params().getTextClass_ptr();
+                       textclass_type const tc = buffer->params().getBaseClass();
+                       textclasslist.reset(tc);
+                       buffer->params().setBaseClass(tc);
+                       updateLayout(oldClass, buffer);
+                       updateFlags = Update::Force | Update::FitCursor;
+                       break;
+               }
 
                case LFUN_TEXTCLASS_LOAD:
-                       loadTextclass(argument);
+                       loadTextClass(argument);
                        break;
 
                case LFUN_LYXRC_APPLY: {