diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-04 21:07:10 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-04 21:07:10 +0000 |
| commit | 957c1ef8341db3c5695618d8e3ea49fe87af6b5b (patch) | |
| tree | 01e4c4dcad257547abafbb202136daec95b54f45 | |
| parent | a293b92aeb43e374aee53f86f227c1e8e1c15d00 (diff) | |
fix misc merge issues
| -rw-r--r-- | forms/prj/build.lst | 2 | ||||
| -rw-r--r-- | forms/source/component/ListBox.cxx | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 115c035ed..d5e9f67a0 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms : l10n oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL +fm forms : l10n oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt connectivity NULL fm forms usr1 - all fm_mkofrm NULL fm forms\inc nmake - all fm_inc NULL fm forms\source\inc get - all fm_sinc NULL diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 3d366c3d7..efbc2a812 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -1105,13 +1105,6 @@ namespace frm } //-------------------------------------------------------------------- - void OListBoxModel::resetNoBroadcast() - { - OBoundControlModel::resetNoBroadcast(); - m_aSaveValue.setNull(); - } - - //-------------------------------------------------------------------- void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException ) { if ( !OEntryListHelper::handleDisposing( _rSource ) ) |