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

Stephan Bergmann sbergman at redhat.com
Mon Oct 17 14:51:04 UTC 2016


 writerfilter/source/dmapper/NumberingManager.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 9bcae1a129a02b1fb0a0a4c231ece851c7798da8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 17 16:49:00 2016 +0200

    So MSVC 2013 is too dumb...
    
    ...to introduce a temporary in
    
      lcl_makePropVal<sal_Int16>(PROP_START_WITH, m_nIStartAt)
    
    and instead complains: "cannot convert argument 2 from 'sal_Int32' to
    'sal_Int16 &&'".
    
    Change-Id: Ic79de8635cc33556ba0803330c0eef314414a7fc

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 4310e40..3867b00 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <utility>
-
 #include "ConversionHelper.hxx"
 #include "NumberingManager.hxx"
 #include "StyleSheetTable.hxx"
@@ -51,9 +49,9 @@ namespace dmapper {
 
 //---------------------------------------------------  Utility functions
 template <typename T>
-beans::PropertyValue lcl_makePropVal(PropertyIds nNameID, T && aValue)
+beans::PropertyValue lcl_makePropVal(PropertyIds nNameID, T const & aValue)
 {
-    return {getPropertyName(nNameID), 0, uno::makeAny(std::forward<T>(aValue)), beans::PropertyState_DIRECT_VALUE};
+    return {getPropertyName(nNameID), 0, uno::makeAny(aValue), beans::PropertyState_DIRECT_VALUE};
 }
 
 sal_Int32 lcl_findProperty( const uno::Sequence< beans::PropertyValue >& aProps, const OUString& sName )


More information about the Libreoffice-commits mailing list