From a41bb78a0e9d51d90e1eb923a02757bdc41c5486 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Mon, 16 Oct 2006 16:21:52 +0000
Subject: [PATCH] fix bug 2910:

* src/frontends/qt3/QDocumentDialog.C (updateNumbering): don't include headings
	that have no counter in their label.
* src/frontends/qt3/ui/NumberingModuleBase.ui: show scrollbar when appropriate.

* src/frontends/qt4/QDocumentDialog.C (updateNumbering): don't include headings
	that have no counter in their label.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15352 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt3/QDocumentDialog.C         | 3 ++-
 src/frontends/qt3/ui/NumberingModuleBase.ui | 4 ++--
 src/frontends/qt4/QDocumentDialog.C         | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt3/QDocumentDialog.C b/src/frontends/qt3/QDocumentDialog.C
index 6e4ed82b88..4c9a3f1090 100644
--- a/src/frontends/qt3/QDocumentDialog.C
+++ b/src/frontends/qt3/QDocumentDialog.C
@@ -436,7 +436,8 @@ void QDocumentDialog::updateNumbering()
 	QListViewItem * item = 0;
 	for ( ; cit != end ; ++cit) {
 		int const toclevel = (*cit)->toclevel;
-		if (toclevel != LyXLayout::NOT_IN_TOC) {
+		if (toclevel != LyXLayout::NOT_IN_TOC 
+		    && (*cit)->labeltype == LABEL_COUNTER) {
 			item = new QListViewItem(numberingModule->tocLV,
 						 item, qt_((*cit)->name()));
 			item->setText(1, (toclevel <= depth) ? yes : no);
diff --git a/src/frontends/qt3/ui/NumberingModuleBase.ui b/src/frontends/qt3/ui/NumberingModuleBase.ui
index ac75f2c153..567e31b8bd 100644
--- a/src/frontends/qt3/ui/NumberingModuleBase.ui
+++ b/src/frontends/qt3/ui/NumberingModuleBase.ui
@@ -144,10 +144,10 @@
                 <enum>AutoOneFit</enum>
             </property>
             <property name="vScrollBarMode">
-                <enum>AlwaysOff</enum>
+                <enum>Auto</enum>
             </property>
             <property name="hScrollBarMode">
-                <enum>AlwaysOff</enum>
+                <enum>Auto</enum>
             </property>
             <property name="rootIsDecorated">
                 <bool>false</bool>
diff --git a/src/frontends/qt4/QDocumentDialog.C b/src/frontends/qt4/QDocumentDialog.C
index 24723b5199..5bd74a7af0 100644
--- a/src/frontends/qt4/QDocumentDialog.C
+++ b/src/frontends/qt4/QDocumentDialog.C
@@ -622,7 +622,8 @@ void QDocumentDialog::updateNumbering()
 	QTreeWidgetItem * item = 0;
 	for ( ; cit != end ; ++cit) {
 		int const toclevel = (*cit)->toclevel;
-		if (toclevel != LyXLayout::NOT_IN_TOC) {
+		if (toclevel != LyXLayout::NOT_IN_TOC 
+		    && (*cit)->labeltype == LABEL_COUNTER) {
 			item = new QTreeWidgetItem(numberingModule->tocTW);
 			item->setText(0, qt_((*cit)->name()));
 			item->setText(1, (toclevel <= depth) ? yes : no);
-- 
2.39.2