File oooqs-1.0_rc3-invalid-popup-entries.patch of Package OpenOffice_org-Quickstarter

--- oooqs/oooqs.cpp
+++ oooqs/oooqs.cpp
@@ -439,17 +439,9 @@
 			popupMenu->insertSeparator(counter);
 			counter++;
 		}
-		start->plug(popupMenu, counter);
-		counter++;
-		popupMenu->insertSeparator(counter);
-		counter++;
 	}
 	preferences->plug(popupMenu, counter);
 	counter++;
-	if (sofficeFound){
-		admin->plug(popupMenu, counter);
-		counter++;
-	}
 	popupMenu->insertSeparator(counter);
 	counter++;
 	popupMenu->insertItem(i18n("&Help"), help->menu() );
--- oooqs/prefsdialog.cpp
+++ oooqs/prefsdialog.cpp
@@ -101,6 +101,7 @@
 	GroupBox4->layout()->setMargin( 11 );
 	QGridLayout* GroupBox4Layout = new QGridLayout( GroupBox4->layout() );
 	GroupBox4Layout->setAlignment( Qt::AlignBottom );
+	GroupBox4->hide();
 
 	templates = new KURLRequester( GroupBox4, "templates" );
 	templates->fileDialog()->setOperationMode(KFileDialog::Opening);
@@ -190,6 +191,7 @@
 
 	stdWriter = new QRadioButton( stdButtons );
 	stdWriter->setText( i18n( "Writer" ) );
+	stdWriter->setChecked( TRUE );
 
 	stdGlobal = new QRadioButton( stdButtons );
 	stdGlobal->setText( i18n( "Global" ) );
@@ -202,7 +204,7 @@
 
 	stdStart = new QRadioButton( stdButtons );
 	stdStart->setText( i18n( "Start with..." ) );
-	stdStart->setChecked( TRUE );
+	stdStart->hide();
 
 	nothing = new QRadioButton( stdButtons );
 	nothing->setText( i18n( "Nothing" ) );
@@ -223,11 +225,8 @@
 	clickLayout->addWidget( stdOpen, 7, 1 );
 	clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 8, 8, 0, 1 );
 	clickLayout->addWidget( stdLast, 9, 0 );
-	clickLayout->addWidget( stdStart, 9, 1 );
+	clickLayout->addWidget( nothing, 9, 1 );
 	clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 10, 10, 0, 1 );
-	clickLayout->addWidget( nothing, 11, 0 );
-	clickLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 11, 1 );
-	clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 12, 12, 0, 1 );
 
 	/** Build the additional-page */
 	QWidget* advancedContainer = new QWidget(advanced);
@@ -241,6 +240,7 @@
 
 	saveSelections = new QCheckBox(advancedContainer);
 	saveSelections->setText( i18n( "Save selections in the \"%1\"-dialog." ).arg(i18n("Start with...")) );
+	saveSelections->hide();
 
 	QWidget* recentBox = new QWidget(advancedContainer);
 	recentLabel = new QLabel( recentBox );
@@ -266,8 +266,6 @@
 	additionalLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 	additionalLayout->addWidget(detailedMenus);
 	additionalLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
-	additionalLayout->addWidget(saveSelections);
-	additionalLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 	additionalLayout->addWidget(recentBox);
 	additionalLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 	additionalLayout->addWidget(clear);