[Libreoffice-commits] .: dbaccess/source
Joseph Powers
jpowers at kemper.freedesktop.org
Thu Feb 3 05:41:15 PST 2011
dbaccess/source/ui/misc/linkeddocuments.cxx | 35 +++++++++++++---------------
1 file changed, 17 insertions(+), 18 deletions(-)
New commits:
commit d1240282164c8d6165e3a946aea33d707e80d57e
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Feb 3 05:40:49 2011 -0800
Remove a #include that wasn't needed.
Plus, some tailing white space.
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 69ef514..e28c4d8 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
@@ -54,7 +54,6 @@
#include <svl/filenotation.hxx>
#include "browserids.hxx"
#include <sfx2/new.hxx>
-#include <svtools/templdlg.hxx>
#include "moduledbu.hxx"
// -----------------
// for calling basic
@@ -123,7 +122,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 +134,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 +179,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 +190,7 @@ namespace dbaui
xRet = xComponentLoader->loadComponentFromURL( _rLinkName, ::rtl::OUString(), 0, aArguments.getPropertyValues() );
}
- catch(Exception& e)
+ catch(Exception& e)
{
(void)e;
throw;
@@ -218,7 +217,7 @@ namespace dbaui
}
aArgs.put( "DocumentUI", m_xDocumentUI );
-
+
Reference< XJobExecutor > xWizard;
{
WaitObject aWaitCursor( m_pDialogParent );
@@ -251,7 +250,7 @@ namespace dbaui
void OLinkedDocumentsAccess::newTableWithPilot()
{
impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, ::rtl::OUString() );
- }
+ }
//------------------------------------------------------------------
void OLinkedDocumentsAccess::newQueryWithPilot()
{
@@ -299,7 +298,7 @@ namespace dbaui
Reference< XComponent > xNewDocument;
try
{ // get the desktop object
-
+
Reference<XMultiServiceFactory> xORB(m_xDocumentContainer,UNO_QUERY);
if ( xORB.is() )
{
@@ -347,10 +346,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() )
@@ -365,7 +364,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;
@@ -378,9 +377,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;
@@ -390,10 +389,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);
@@ -405,7 +404,7 @@ namespace dbaui
}
return xRet;
}
-
+
//......................................................................
} // namespace dbaui
More information about the Libreoffice-commits
mailing list