summaryrefslogtreecommitdiff
path: root/include/oox/helper/propertymap.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-11-10 17:46:57 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-11-11 00:03:37 +0100
commit1fc79c3491906d85ed9972e161112459035b62ed (patch)
tree29f284f4a814b2b7a61417046364b489ce2187d7 /include/oox/helper/propertymap.hxx
parentf697d06b67e91c704c088dceafade209462e0b95 (diff)
Avoid using O[U]StringConcat lvalues containing dangling refs to temporaries
...in code accidentally using auto like > auto const aURL = uri->getUriReference() + "/" > + INetURLObject::encode( > m_sEmbeddedName, INetURLObject::PART_FPATH, > INetURLObject::EncodeMechanism::All); > > uno::Reference<uno::XInterface> xDataSource(xDatabaseContext->getByName(aURL), uno::UNO_QUERY); in <https://gerrit.libreoffice.org/#/c/44569/1> "Properly construct vnd.sun.star.pkg URL" did (causing hard to debug test failures there). So make functions taking O[U]StringConcat take those by rvalue reference. Unfortunately, that also needed adaption of various functions that just forward their arguments. And some code in sc/qa/unit/ucalc_formula.cxx used CPPUNIT_ASSERT_EQUAL on OUStringConcat arguments in cases where that happened to actually compile (because the structure of the two OUStringConcats was identical), which needed adaption too (but which would arguably better use CPPUNIT_ASSERT_EQUAL_MESSAGE, anyway). Change-Id: I8994d932aaedb2a491c7c81c167e93379d4fb6e3 Reviewed-on: https://gerrit.libreoffice.org/44608 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/oox/helper/propertymap.hxx')
-rw-r--r--include/oox/helper/propertymap.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index badcf0d5e49b..30d77ec0bfa4 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_OOX_HELPER_PROPERTYMAP_HXX
#include <map>
+#include <utility>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -67,12 +68,12 @@ public:
/** Sets the specified property to the passed value. Does nothing, if the
identifier is invalid. */
template< typename Type >
- bool setProperty( sal_Int32 nPropId, const Type& rValue )
+ bool setProperty( sal_Int32 nPropId, Type&& rValue )
{
if( nPropId < 0 )
return false;
- maProperties[ nPropId ] <<= rValue;
+ maProperties[ nPropId ] <<= std::forward<Type>(rValue);
return true;
}