summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-06-07 22:06:46 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-06-11 19:32:21 +0200
commiteaee30b8ef7649d09ae64c484efa4d4026c2f119 (patch)
tree534c6478c16b945d84f4b8da3dbceb31b6ae518c
parent8ff1e312029adbf9e425f3d075c1e263a7c4e9c4 (diff)
Fix swapping of vector elements
...which had been broken with edc85fb55f8adc30a1416c6c854c89097060fb21 "clang-tidy performance-unnecessary-copy-init in idl..reportdesign" (and could cause "Tools - Options... - LibreOffice - Advanced - Java Options" to erroneously list a single JRE multiple times, instead of listing different JREs). Change-Id: I6799903be39a5c6aa601131fad6eab3edea8d9e4 Reviewed-on: https://gerrit.libreoffice.org/73679 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b70ab9e9e5630a965c5e6cc40c2480dddf1e2384) Reviewed-on: https://gerrit.libreoffice.org/73802 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 6b1147b149b2..4a634b329f2c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -733,8 +733,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
}
if(nCmp == 1) // cur > next
{
- vec.at(j-1)= cur;
- vec.at(j)= next;
+ std::swap(vec.at(j-1), vec.at(j));
}
}
++cIter;