[Libreoffice-commits] .: Branch 'integration/dev300_m98' - forms/prj forms/source

[Michael Meeks]

 forms/prj/build.lst                |    2 +-
 forms/source/component/ListBox.cxx |    7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 957c1ef8341db3c5695618d8e3ea49fe87af6b5b
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Mar 4 21:07:10 2011 +0000

    fix misc merge issues

diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 115c035..d5e9f67 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 3d366c3..efbc2a8 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 ) )