[Libreoffice-commits] .: dbaccess/source extensions/source svtools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 03:36:08 PST 2012
dbaccess/source/core/dataaccess/databasecontext.cxx | 2 -
dbaccess/source/inc/stringconstants.hrc | 1
dbaccess/source/inc/stringconstants.inc | 1
dbaccess/source/ui/browser/genericcontroller.cxx | 8 ++-----
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 8 +------
extensions/source/propctrlr/formcomponenthandler.cxx | 20 +++++++------------
extensions/source/propctrlr/formstrings.hxx | 1
svtools/source/dialogs/addresstemplate.cxx | 3 --
8 files changed, 15 insertions(+), 29 deletions(-)
New commits:
commit 495111b249e1ef17be96dbdfbc5a13de6d5dd5f9
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 3 11:10:46 2012 +0200
fdo#46808, use service constructor for sdb::DatabaseContext
Change-Id: I4d845f289f324912b0fc4d8e26a2947e2d2f889e
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 798262f..c4c625f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -218,7 +218,7 @@ Reference< XInterface > ODatabaseContext::Create(const Reference< XComponentCont
Sequence< rtl::OUString > ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = SERVICE_SDB_DATABASECONTEXT;
+ aSNS[0] = "com.sun.star.sdb.DatabaseContext";
return aSNS;
}
diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc
index d8a9ceb..6926f60 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.hrc
@@ -355,7 +355,6 @@ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATAACCESSCONNECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_ROWSET);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET);
diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/source/inc/stringconstants.inc
index 9d6e79e..010fd63 100644
--- a/dbaccess/source/inc/stringconstants.inc
+++ b/dbaccess/source/inc/stringconstants.inc
@@ -193,7 +193,6 @@ IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNDESCRIPTOR, "com.sun.star.sdbcx
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS, "com.sun.star.sdb.ColumnSettings");
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN, "com.sun.star.sdb.ResultColumn");
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN, "com.sun.star.sdb.DataColumn");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT, "com.sun.star.sdb.DatabaseContext");
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE, "com.sun.star.sdb.DataSource");
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET, "com.sun.star.sdb.ResultSet");
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_ROWSET, "com.sun.star.sdb.RowSet");
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 58345e6..76df18a 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -258,15 +258,13 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
{
m_xDatabaseContext = DatabaseContext::create(comphelper::getComponentContext(getORB()));
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("OGenericUnoController::Construct: could not create (or start listening at) the database context!");
+ // at least notify the user. Though the whole component does not make any sense without the database context ...
+ ShowServiceNotAvailableError(getView(), String("com.sun.star.sdb.DatabaseContext"), sal_True);
}
- if (!m_xDatabaseContext.is())
- { // at least notify the user. Though the whole component does not make any sense without the database context ...
- ShowServiceNotAvailableError(getView(), String(SERVICE_SDB_DATABASECONTEXT), sal_True);
- }
return sal_True;
}
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 9082417..2b5cbfe 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -210,13 +210,9 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
{
m_xDatabaseContext = DatabaseContext::create(comphelper::getComponentContext(m_xORB));
}
- catch(Exception&)
- {
- }
-
- if ( !m_xDatabaseContext.is() )
+ catch(const Exception&)
{
- ShowServiceNotAvailableError(_pParent->GetParent(), String(SERVICE_SDB_DATABASECONTEXT), sal_True);
+ ShowServiceNotAvailableError(_pParent->GetParent(), String("com.sun.star.sdb.DatabaseContext"), sal_True);
}
}
//-------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 992b2d5..350483c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -45,6 +45,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/DatabaseContext.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -527,9 +528,8 @@ namespace pcr
if ( !sControlValue.isEmpty() )
{
- Reference< XNameAccess > xDatabaseContext;
- m_aContext.createComponent( (::rtl::OUString)SERVICE_DATABASE_CONTEXT, xDatabaseContext );
- if ( !xDatabaseContext.is() || !xDatabaseContext->hasByName( sControlValue ) )
+ Reference< XDatabaseContext > xDatabaseContext = sdb::DatabaseContext::create( m_aContext.getUNOContext() );
+ if ( !xDatabaseContext->hasByName( sControlValue ) )
{
::svt::OFileNotation aTransformer(sControlValue);
aPropertyValue <<= ::rtl::OUString( aTransformer.get( ::svt::OFileNotation::N_URL ) );
@@ -1360,15 +1360,11 @@ namespace pcr
::std::vector< ::rtl::OUString > aListEntries;
- Reference< XNameAccess > xDatabaseContext;
- m_aContext.createComponent( (rtl::OUString)SERVICE_DATABASE_CONTEXT, xDatabaseContext );
- if (xDatabaseContext.is())
- {
- Sequence< ::rtl::OUString > aDatasources = xDatabaseContext->getElementNames();
- aListEntries.resize( aDatasources.getLength() );
- ::std::copy( aDatasources.getConstArray(), aDatasources.getConstArray() + aDatasources.getLength(),
- aListEntries.begin() );
- }
+ Reference< XDatabaseContext > xDatabaseContext = sdb::DatabaseContext::create( m_aContext.getUNOContext() );
+ Sequence< ::rtl::OUString > aDatasources = xDatabaseContext->getElementNames();
+ aListEntries.resize( aDatasources.getLength() );
+ ::std::copy( aDatasources.getConstArray(), aDatasources.getConstArray() + aDatasources.getLength(),
+ aListEntries.begin() );
aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl(
_rxControlFactory, aListEntries, sal_False, sal_True );
}
diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx
index 39a05d8..48eab4c 100644
--- a/extensions/source/propctrlr/formstrings.hxx
+++ b/extensions/source/propctrlr/formstrings.hxx
@@ -280,7 +280,6 @@ namespace pcr
PCR_CONSTASCII_STRING( SERVICE_COMPONENT_GROUPBOX, "com.sun.star.form.component.GroupBox" );
PCR_CONSTASCII_STRING( SERVICE_COMPONENT_FIXEDTEXT, "com.sun.star.form.component.FixedText" );
PCR_CONSTASCII_STRING( SERVICE_COMPONENT_FORMATTEDFIELD,"com.sun.star.form.component.FormattedField" );
- PCR_CONSTASCII_STRING( SERVICE_DATABASE_CONTEXT, "com.sun.star.sdb.DatabaseContext" );
PCR_CONSTASCII_STRING( SERVICE_TEXT_DOCUMENT, "com.sun.star.text.TextDocument" );
PCR_CONSTASCII_STRING( SERVICE_WEB_DOCUMENT, "com.sun.star.text.WebDocument" );
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 2106538..1a9a4d3 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -793,8 +793,7 @@ void AssignmentPersistentData::Commit()
{
m_xDatabaseContext = DatabaseContext::create(comphelper::getComponentContext(m_xORB));
}
- catch(Exception&) { }
- if (!m_xDatabaseContext.is())
+ catch(const Exception&)
{
const rtl::OUString sContextServiceName("com.sun.star.sdb.DatabaseContext");
ShowServiceNotAvailableError( this, sContextServiceName, sal_False);
More information about the Libreoffice-commits
mailing list