summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/postgresql/pq_driver.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-13 09:52:43 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-13 10:05:57 +0200
commitf50a41437ee99aee499dbabd1d36ef8197db5559 (patch)
tree27aaa825787a3c3999472ee3a254b9d31100e3d3 /connectivity/source/drivers/postgresql/pq_driver.cxx
parenta91805241c64694b0e4ba16b90edcf56fab2cf5a (diff)
fdo#53246 Fresh postgresql-sdbc implementation names
The descriptions for fdo#53246 "Libo36 does not start, InvalidRegistryException from program/services/postgresql-sdbc.rdb" make it look like the user had installed the functionality that comes bundled in postgresql-sdbc.rdb also as an extension installed per-user or shared. <http://wiki.documentfoundation.org/PostgreSQL-SDBC> indicates that what is now bundled due to c97d74b5f0608866bad3f7ae943811bdff4f7986 "fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part" indeed was once available as a freestanding postgresql-sdbc-*.oxt that could have been installed per-user or shared. To prevent problems with such scenarios, rename the relevant implementation names by adding a ".noext" suffix. Change-Id: I43414a64461ba643f0ca0b2749450099cb6c8a4d
Diffstat (limited to 'connectivity/source/drivers/postgresql/pq_driver.cxx')
-rw-r--r--connectivity/source/drivers/postgresql/pq_driver.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 98ee8ea7cd77..ed8480c318c4 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -106,7 +106,7 @@ OUString DriverGetImplementationName()
{
MutexGuard guard( osl::Mutex::getGlobalMutex() );
static OUString instance(
- RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver" ) );
+ RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver.noext" ) );
p = &instance;
}
return *p;
@@ -137,7 +137,7 @@ Reference< XConnection > Driver::connect(
seq[1] <<= info;
return Reference< XConnection> (
m_smgr->createInstanceWithArgumentsAndContext(
- OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.connectivity.pq.Connection" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.connectivity.pq.Connection.noext" ) ),
seq, m_ctx ),
UNO_QUERY );
}