[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source

Michael Stahl mstahl at redhat.com
Tue Jun 17 14:04:04 PDT 2014


 writerfilter/source/rtftok/rtfsprm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d0552a34dbc34c840aaa7a3e5fb48cb247ac623
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 17 22:58:57 2014 +0200

    writerfilter: try to make tinderbox happy again
    
    Change-Id: I445303e52fbfaa58e68c01970e21941537484506
    (cherry picked from commit 31376a31d12a22d4870bbe4033dbbce18c13f07d)

diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 40b8fcc..1b0df46 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -149,7 +149,7 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id)
             return RTFValue::Pointer_t(new RTFValue(0));
 
         default:
-            return 0;
+            return RTFValue::Pointer_t();
     }
 }
 


More information about the Libreoffice-commits mailing list