[Libreoffice-commits] core.git: 2 commits - include/svtools svtools/source sw/source

[Caolán McNamara]

 include/svtools/imagemgr.hrc     |  148 ---------------------------------------
 svtools/source/misc/imagemgr.cxx |    2 
 svtools/source/misc/imagemgr.hrc |  148 +++++++++++++++++++++++++++++++++++++++
 svtools/source/misc/imagemgr.src |    2 
 sw/source/filter/ww8/ww8scan.cxx |    6 +
 5 files changed, 154 insertions(+), 152 deletions(-)

New commits:
commit e043c1c93faf5c334280c71138b9324af741a5a7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 27 16:27:10 2016 +0000

    shuffle for coverity#1394416
    
    Change-Id: I5917aa91021a8ddbb14ac7ccee1ba06ab6a514ab

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 09f44c2..6c16920 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2534,10 +2534,12 @@ WW8PLCFx_Fc_FKP::WW8Fkp::WW8Fkp(const WW8Fib& rFib, SvStream* pSt,
                          are expanding, then we tack the old data onto the end
                          of the new data
                         */
-                        bool bExpand = IsExpandableSprm(nSpId);
+                        const bool bExpand = IsExpandableSprm(nSpId);
                         const sal_uInt8* pStartData = aEntry.mpData + 2;
                         const sal_uInt8* pLastValidDataPos = maRawData + 512 - sizeof(sal_uInt32);
-                        if ((IsReplaceAllSprm(nSpId) || bExpand) && pStartData <= pLastValidDataPos)
+                        if (pStartData > pLastValidDataPos)
+                            pStartData = nullptr;
+                        if ((IsReplaceAllSprm(nSpId) || bExpand) && pStartData)
                         {
                             sal_uInt32 nCurr = pDataSt->Tell();
                             sal_uInt32 nPos = SVBT32ToUInt32(pStartData);
commit 6f4d538ede236a578de4f9427821c1aed7cd1d45
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 27 16:05:09 2016 +0000

    this can be local
    
    Change-Id: I8084e8c33a930f13cf7f1212a086a9f1ad1bdfb4

diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 0db8c6f..78d674e 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -37,10 +37,10 @@
 #include <tools/rcid.h>
 #include <unotools/configmgr.hxx>
 #include <svtools/svtools.hrc>
-#include <svtools/imagemgr.hrc>
 #include <svtools/svtresid.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/lazydelete.hxx>
+#include "imagemgr.hrc"
 
 // globals *******************************************************************
 
diff --git a/include/svtools/imagemgr.hrc b/svtools/source/misc/imagemgr.hrc
similarity index 100%
rename from include/svtools/imagemgr.hrc
rename to svtools/source/misc/imagemgr.hrc
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index a98e593..ee442fb 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -18,7 +18,7 @@
  */
 
 #include <svtools/svtools.hrc>
-#include <svtools/imagemgr.hrc>
+#include "imagemgr.hrc"
 
  // images ********************************************************************