[Libreoffice-commits] core.git: jvmfwk/source

[Stephan Bergmann]

 jvmfwk/source/elements.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bebf37bac076a56801ef7d1c113f729b12b9f46
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon May 29 11:22:57 2017 +0200

    Revert "loplugin:stringcopy"
    
    This reverts commit 957874168491f4b030fda85c65dd969aae82a670.  It wasn't 
really
    necessary (see commit message of 8b1fcedcd10366523967ebcbd463b2c0c6b5b17a
    "...and re-eanble loplugin:stringcopy again") and reportedly causes issues 
with
    older Boost (see
    <https://lists.freedesktop.org/archives/libreoffice/2017-May/077786.html>
    "[Libreoffice-commits] core.git: jvmfwk/source").

diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 19c3e1b1f44c..353eab37ba6f 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -260,7 +260,7 @@ void NodeJava::load()
             {
                 CXmlCharPtr sUser(xmlNodeListGetString(
                     docUser, cur->children, 1));
-                m_userClassPath = boost::optional<OUString>(sUser);
+                m_userClassPath = boost::optional<OUString>(OUString(sUser));
             }
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const 
*>("javaInfo")) == 0)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits