connectivity/source/drivers/postgresql/pq_connection.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 145f5297c705f7f7cde999149c288f07852fcd87
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Feb 23 17:36:14 2020 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Feb 24 09:26:06 2020 +0100
Postgresql native, fix readLogLevelFromConfiguration
With:
osl_getModuleURLFromFunctionAddress(
reinterpret_cast<oslGenericFunction>(readLogLevelFromConfiguration),
&fileName.pData );
The method retrieves the path to libpostgresql-sdbc-impllo.so, eg:
file:///home/julien/lo/libreoffice/instdir/program/libpostgresql-sdbc-impllo.so
but then instead of retrieving path + "postgresql-sdbc.ini"
we obtained ".so" filename + "postgresql-sdbc.ini"=>
libpostgresql-sdbc-impllo.sopostgresql-sdbc.ini
Regression from 1bdb2b6f06c556b9af91dba4f29f3ac73190b09e
author Noel Grandin <n...@peralex.com> 2013-11-04 13:51:21 +0200
committer Noel Grandin <n...@peralex.com> 2013-11-11 11:21:25 +0200
commit 1bdb2b6f06c556b9af91dba4f29f3ac73190b09e (patch)
tree 1d941e17952cd891f5309fd862215dd09a84b001
parent 2f2416ff060c780ad87b4d3979112f52da2ae902 (diff)
remove unnecessary use of OUString constructor in CONNECTIVITY module
Change-Id: Ie7be4b1078760f94d34dd1f6cb9932bd7fa70962
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89303
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit abf44a9ddd084952bde4609e3f6d386f7916b68a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89275
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 56670cef1aa5..89baa0799202 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -131,7 +131,7 @@ static LogLevel readLogLevelFromConfiguration()
OUString fileName;
osl_getModuleURLFromFunctionAddress(
reinterpret_cast<oslGenericFunction>(readLogLevelFromConfiguration),
&fileName.pData );
- fileName = fileName.copy( fileName.lastIndexOf( '/' )+1 ) +
+ fileName = fileName.copy( 0, fileName.lastIndexOf( '/' )+1 ) +
#ifdef MACOSX
"../Resources/"
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
