diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:43:02 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:43:02 +0000 |
| commit | a153bd92f10429531abea10ec4b14f4539375508 (patch) | |
| tree | 8bb11f3818664e9757b6286313a6a49245731fab /dbaccess/source/ui/tabledesign/TableController.cxx | |
| parent | 88ee0373ca9ab14d7363f3a190c2826b128694fb (diff) | |
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
Diffstat (limited to 'dbaccess/source/ui/tabledesign/TableController.cxx')
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableController.cxx | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 533d7cab3236..5a8d6c080860 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.111 $ + * $Revision: 1.112 $ * - * last change: $Author: kz $ $Date: 2007-05-10 10:41:47 $ + * last change: $Author: rt $ $Date: 2007-07-06 08:43:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -635,26 +635,11 @@ void OTableController::impl_initialize() 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 @@ void OTableController::impl_initialize() // ----------------------------------------------------------------------------- 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(); |