We don't want the document dialog to be reset for each new paragraph.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24597 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 2ba63bacbf160ca44b800f1c41ccf879b7c29598..0e42f8f720690ecbef9a74a2a1b366bfd6447c67 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -2167,6 +2167,8 @@ char const * GuiDocument::fontfamilies_gui[5] = {
 bool GuiDocument::initialiseParams(string const &)
 {
        bp_ = buffer().params();
+       // Force update on next updateContent() round.
+       current_id_ = 0;
        loadModuleInfo();
        return true;
 }

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index e4ff6ccb2083a6c2a97ff81be434608fafef5ce6..65704847e49177e532b2be428ec1c746368a5ebc 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -550,6 +550,9 @@ void GuiView::on_currentWorkAreaChanged(GuiWorkArea * wa)
 
        structureChanged();
 
+       // The document settings needs to be reinitialised.
+       updateDialog("document", "");
+
        // Buffer-dependent dialogs must be updated. This is done here because
        // some dialogs require buffer()->text.
        updateDialogs();
@@ -570,6 +573,8 @@ void GuiView::on_lastWorkAreaRemoved()
        }
 #else
        structureChanged();
+       // The document settings needs to be reinitialised.
+       updateDialog("document", "");
        updateDialogs();
 #endif
 }
@@ -624,6 +629,8 @@ bool GuiView::event(QEvent * e)
                        // The document structure, name and dialogs might have
                        // changed in another view.
                        structureChanged();
+                       // The document settings needs to be reinitialised.
+                       updateDialog("document", "");
                        updateDialogs();
                } else {
                        setWindowTitle(qt_("LyX"));
@@ -927,8 +934,6 @@ void GuiView::structureChanged()
        // Navigator needs more than a simple update in this case. It needs to be
        // rebuilt.
        updateDialog("toc", "");
-       // Same for the document settings dialog.
-       updateDialog("document", "");
 }