SVN commit 579374 by staniek:

SVN_SILENT fix height & possible crash


 M  +1 -1      editor.cpp  
 M  +1 -1      editors/combobox.cpp  


--- branches/koffice/1.6/koffice/lib/koproperty/editor.cpp #579373:579374
@@ -749,7 +749,7 @@
 
 	int y = viewportToContents(QPoint(0, itemRect(d->currentItem).y())).y();
 	QRect geometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height());
-	d->undoButton->resize(d->baseRowHeight, d->baseRowHeight);
+	d->undoButton->resize(d->baseRowHeight, d->currentItem->height());
 
 	updateEditorGeometry(true, show);
 
--- branches/koffice/1.6/koffice/lib/koproperty/editors/combobox.cpp #579373:579374
@@ -79,7 +79,7 @@
 void
 ComboBox::setValue(const QVariant &value, bool emitChange)
 {
-	if (!property()->listData()) {
+	if (!property() || !property()->listData()) {
 		kopropertywarn << "ComboBox::value(): propery listData not available!" << endl;
 		return;
 	}