Conflicts: connectivity/source/inc/odbc/OConnection.hxx Change-Id: I5ca98359e18cf1b27bf53037dde211774d798626 Reviewed-on: https://gerrit.libreoffice.org/8245 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>