Extended loplugin:ostr manual changes

I had done these a while ago, when I looked into extending loplugin:ostr to do
more automatic rewriting, and these were places where I needed to do something
manually, for one reason or another, because the automatic rewriting would not
pick it up correctly.

However, I got distracted, and a wholesale automatic rewrite would still run
into cases where an _ostr/_ustr instance from a library's .rodata would still be
referenced after the library has already been dlcose'd.  So I never came around
to finishing all that.

But there appears to be renewed interest in (automatic) rewritings here now, so
it probably makes sense if I share this part of my work anyway.

Change-Id: I3da9d38398e4bca373cb0000a9d34b49a36ad58a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166792
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins

1 files changed, 3 insertions, 5 deletions

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 19569dd77d61..234fc969db63 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -213,14 +213,12 @@ namespace connectivity
                 aProperties.put( "JavaDriverClass",
                     OUString(  "org.hsqldb.jdbcDriver"  ) );
                 aProperties.put( "JavaDriverClassPath",
-                    OUString(
 #ifdef SYSTEM_HSQLDB
-                        HSQLDB_JAR
+                        u"" HSQLDB_JAR
 #else
-                        "vnd.sun.star.expand:$LO_JAVA_DIR/hsqldb.jar"
+                        u"vnd.sun.star.expand:$LO_JAVA_DIR/hsqldb.jar"
 #endif
-                        " vnd.sun.star.expand:$LO_JAVA_DIR/sdbc_hsqldb.jar"
-                        ) );
+                        " vnd.sun.star.expand:$LO_JAVA_DIR/sdbc_hsqldb.jar"_ustr );
 
                 // auto increment handling
                 aProperties.put( "IsAutoRetrievingEnabled", true );