mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 12:32:26 +00:00
fix merge build src/frontends/qt4/QDocument.cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18509 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5b731aa6a5
commit
af6a9552ed
@ -891,7 +891,7 @@ void QDocumentDialog::apply(BufferParams & params)
|
||||
params.quotes_language = lga;
|
||||
|
||||
int const pos = langModule->languageCO->currentIndex();
|
||||
params.language = languages.getLanguage(lang_[pos]);
|
||||
params.language = lyx::languages.getLanguage(lang_[pos]);
|
||||
|
||||
// numbering
|
||||
if (params.getTextClass().hasTocLevels()) {
|
||||
|
@ -208,7 +208,7 @@ QListingsDialog::QListingsDialog(QListings * form)
|
||||
numberStepLE->setValidator(new QIntValidator(0, 1000000, this));
|
||||
firstlineLE->setValidator(new QIntValidator(0, 1000000, this));
|
||||
lastlineLE->setValidator(new QIntValidator(0, 1000000, this));
|
||||
placementLE->setValidator(new QRegExpValidator(QRegExp("[\*tbph]*"), this));
|
||||
placementLE->setValidator(new QRegExpValidator(QRegExp("[\\*tbph]*"), this));
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user