summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-05-29 11:22:57 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-05-29 11:25:37 +0200
commit0bebf37bac076a56801ef7d1c113f729b12b9f46 (patch)
tree29384b85d206d0b777d15a20575f9e8c592987be /jvmfwk
parentad71552f2f3d7dd140c567dee2b16e274c0cb467 (diff)
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").
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/source/elements.cxx2
1 files changed, 1 insertions, 1 deletions
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)