mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Postgresql native, fix readLogLevelFromConfiguration

Browse Source 
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 1bdb2b6f06
author	Noel Grandin <noel@peralex.com>	2013-11-04 13:51:21 +0200
committer	Noel Grandin <noel@peralex.com>	2013-11-11 11:21:25 +0200
commit	1bdb2b6f06 (patch)
tree	1d941e1795
parent	2f2416ff06 (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 <serval2412@yahoo.fr>
This commit is contained in:
Julien Nabet
2020-02-23 17:36:14 +01:00
parent be81807aa2
commit abf44a9ddd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/source/drivers/postgresql/pq_connection.cxx
View File

@@ -131,7 +131,7 @@ static LogLevel readLogLevelFromConfiguration()
OUString fileName; OUString fileName;
osl_getModuleURLFromFunctionAddress( osl_getModuleURLFromFunctionAddress(
reinterpret_cast<oslGenericFunction>(readLogLevelFromConfiguration), &fileName.pData ); reinterpret_cast<oslGenericFunction>(readLogLevelFromConfiguration), &fileName.pData );
fileName = fileName.copy( fileName.lastIndexOf( '/' )+1 ) + fileName = fileName.copy( 0, fileName.lastIndexOf( '/' )+1 ) +
#ifdef MACOSX #ifdef MACOSX
"../Resources/" "../Resources/"
#endif #endif