diff options
Diffstat (limited to 'dbaccess/source/ui/misc/linkeddocuments.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/linkeddocuments.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 8d470332158e..58e920c88493 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,7 +123,7 @@ namespace dbaui //================================================================== //= OLinkedDocumentsAccess //================================================================== - DBG_NAME(OLinkedDocumentsAccess) + DBG_NAME(OLinkedDocumentsAccess) //------------------------------------------------------------------ OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XMultiServiceFactory >& _rxORB, const Reference< XNameAccess >& _rxContainer, @@ -135,14 +135,14 @@ namespace dbaui ,m_pDialogParent(_pDialogParent) ,m_sDataSourceName(_sDataSourceName) { - DBG_CTOR(OLinkedDocumentsAccess,NULL); + DBG_CTOR(OLinkedDocumentsAccess,NULL); OSL_ENSURE(m_xORB.is(), "OLinkedDocumentsAccess::OLinkedDocumentsAccess: invalid service factory!"); OSL_ENSURE(m_pDialogParent, "OLinkedDocumentsAccess::OLinkedDocumentsAccess: really need a dialog parent!"); } //------------------------------------------------------------------ OLinkedDocumentsAccess::~OLinkedDocumentsAccess() { - DBG_DTOR(OLinkedDocumentsAccess,NULL); + DBG_DTOR(OLinkedDocumentsAccess,NULL); } //------------------------------------------------------------------ Reference< XComponent> OLinkedDocumentsAccess::impl_open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, @@ -180,7 +180,7 @@ namespace dbaui aArguments.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); try - { + { Reference<XHierarchicalNameContainer> xHier(m_xDocumentContainer,UNO_QUERY); if ( xHier.is() && xHier->hasByHierarchicalName(_rLinkName) ) { @@ -191,7 +191,7 @@ namespace dbaui xRet = xComponentLoader->loadComponentFromURL( _rLinkName, ::rtl::OUString(), 0, aArguments.getPropertyValues() ); } - catch(Exception& e) + catch(Exception& e) { (void)e; throw; @@ -218,7 +218,7 @@ namespace dbaui } aArgs.put( "DocumentUI", m_xDocumentUI ); - + Reference< XJobExecutor > xWizard; { WaitObject aWaitCursor( m_pDialogParent ); @@ -251,7 +251,7 @@ namespace dbaui void OLinkedDocumentsAccess::newTableWithPilot() { impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, ::rtl::OUString() ); - } + } //------------------------------------------------------------------ void OLinkedDocumentsAccess::newQueryWithPilot() { @@ -298,8 +298,8 @@ namespace dbaui // load the document as template Reference< XComponent > xNewDocument; try - { // get the desktop object - + { // get the desktop object + Reference<XMultiServiceFactory> xORB(m_xDocumentContainer,UNO_QUERY); if ( xORB.is() ) { @@ -347,10 +347,10 @@ namespace dbaui //------------------------------------------------------------------ Reference< XComponent > OLinkedDocumentsAccess::open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ) - { + { dbtools::SQLExceptionInfo aInfo; Reference< XComponent > xRet; - try + try { xRet = impl_open( _rLinkName, _xDefinition, _eOpenMode, _rAdditionalArgs ); if ( !xRet.is() ) @@ -366,7 +366,7 @@ namespace dbaui return xRet; } catch (com::sun::star::io::WrongFormatException e) - { + { com::sun::star::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; aSQLException.Context = e.Context; @@ -379,9 +379,9 @@ namespace dbaui String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); - aInfo.prepend(sMessage); + aInfo.prepend(sMessage); } - catch(Exception& e) + catch(Exception& e) { Any aAny = ::cppu::getCaughtException(); com::sun::star::sdbc::SQLException a; @@ -391,10 +391,10 @@ namespace dbaui aSQLException.Message = e.Message; aSQLException.Context = e.Context; aInfo = dbtools::SQLExceptionInfo(aSQLException); - + // more like a hack, insert an empty message aInfo.prepend(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \n"))); - + String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); aInfo.prepend(sMessage); @@ -406,10 +406,10 @@ namespace dbaui } return xRet; } - + //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |