* readd accidentally removed code (rev 14143)

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

diff --git a/src/frontends/qt3/QDocument.C b/src/frontends/qt3/QDocument.C
index dbb20e0165d9d72e23072bfa3557f329f0aff25f..82262b1e1dd33b5fb614e6ac82f511ccd4e60084 100644 (file)
--- a/src/frontends/qt3/QDocument.C
+++ b/src/frontends/qt3/QDocument.C
@@ -688,6 +688,11 @@ void QDocument::update_contents()
        if (n >= 0)
                dialog_->fontModule->fontsDefaultCO->setCurrentItem(n);
 
+       // paper
+       int const psize = params.papersize;
+       dialog_->pageLayoutModule->papersizeCO->setCurrentItem(psize);
+       dialog_->setCustomPapersize(psize);
+
        // margins
        MarginsModuleBase * m = dialog_->marginsModule;
 

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 1d0721f0c6368518880dded2964a5b83e1337920..27d6348627bc0de847ae54809aa6b323c5153ec0 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -60,7 +60,7 @@ namespace lyx {
 
 using support::bformat;
 using support::contains;
-using lyx::support::findToken;
+using support::findToken;
 using support::getStringFromVector;
 using support::getVectorFromString;
 using support::libFileSearch;