include/oox/helper/binaryinputstream.hxx | 2 +- sw/source/filter/ww8/ww8par5.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 1b04d59eb8d3411111ee393289d2c0703c68643c Author: Caolán McNamara <[email protected]> Date: Sat Apr 9 20:16:16 2016 +0100 valgrind: use of uninitialized data on load of ooo98646-1.doc Change-Id: If6aab00a5b2283376a04b70580df6c1c4e5304a2 diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 4655b8a..88e9033 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -213,7 +213,7 @@ typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef; template< typename Type > Type BinaryInputStream::readValue() { - Type ornValue; + Type ornValue = Type(); readMemory( &ornValue, static_cast< sal_Int32 >( sizeof( Type ) ), sizeof( Type ) ); ByteOrderConverter::convertLittleEndian( ornValue ); return ornValue; commit b5a33af1989b92285c89cc108806f296afea33c7 Author: Caolán McNamara <[email protected]> Date: Sat Apr 9 10:54:07 2016 +0100 coverity#1358391 Inferred misuse of enum might be good to change nId to the enum and use the enums then Change-Id: I302f13fd960227e682f98ce2946b8567442641da diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 5e8bccc..957006c 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -895,7 +895,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) return aF.nLen; bool bHasHandler = aWW8FieldTab[aF.nId] != nullptr; - if (aF.nId == ww::eSTYLEREF) + if (aF.nId == 10) // STYLEREF { // STYLEREF, by default these are not handled. bHasHandler = false;
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
