User: rt Date: 2007-07-06 08:43:05+0000 Modified: dba/dbaccess/source/ui/tabledesign/TableController.cxx
Log: INTEGRATION: CWS oj14 (1.99.4); FILE MERGED 2007/06/04 19:00:59 oj 1.99.4.7: RESYNC: (1.110-1.111); FILE MERGED 2007/02/20 15:52:07 oj 1.99.4.6: RESYNC: (1.109-1.110); FILE MERGED 2006/12/18 16:25:10 oj 1.99.4.5: RESYNC: (1.108-1.109); FILE MERGED 2006/11/07 09:49:26 oj 1.99.4.4: RESYNC: (1.104-1.108); FILE MERGED 2006/07/04 08:23:44 oj 1.99.4.3: RESYNC: (1.100-1.104); FILE MERGED 2006/03/20 14:06:30 oj 1.99.4.2: RESYNC: (1.99-1.100); FILE MERGED 2006/01/03 07:49:27 oj 1.99.4.1: changed module client File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.111&r2=1.112 Delta lines: +2 -17 -------------------- --- TableController.cxx 2007-05-10 10:41:47+0000 1.111 +++ TableController.cxx 2007-07-06 08:43:02+0000 1.112 @@ -635,26 +635,11 @@ if (!isConnected()) // so what should otherwise { if(!bFirstTry) - { - String aMessage(ModuleRes(RID_STR_CONNECTION_LOST)); - ODataView* pWindow = getView(); - InfoBox(pWindow, aMessage).Execute(); - } + connectionLostMessage(); throw Exception(); } assignTable(); - if(!m_xFormatter.is()) - { - Reference< XNumberFormatsSupplier> xSupplier = ::dbtools::getNumberFormats(getConnection()); - if(xSupplier.is()) - { - m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(getORB() - ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")), UNO_QUERY); - m_xFormatter->attachNumberFormatsSupplier(xSupplier); - } - OSL_ENSURE(m_xFormatter.is(),"No NumberFormatter!"); - } } catch(const SQLException&) { @@ -686,7 +671,7 @@ // ----------------------------------------------------------------------------- sal_Bool OTableController::Construct(Window* pParent) { - m_pView = new OTableDesignView(pParent,m_xMultiServiceFacatory,this); + m_pView = new OTableDesignView(pParent,getORB(),this); OTableController_BASE::Construct(pParent); // m_pView->Construct(); // m_pView->Show(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
