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

[Caolán McNamara]

 connectivity/source/drivers/evoab2/NConnection.cxx |   11 ++++++-----
 sw/source/core/doc/DocumentRedlineManager.cxx      |    2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3528aea9bbb74aab3fd1035be146110b80e2780e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 30 20:46:06 2015 +0000

    coverity#1267700 Uninitialized scalar field
    
    Change-Id: I1e9d412ccf68996e59e0875c0f0af17592258acb

diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index c6f0050..17ea5c6 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -40,16 +40,17 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
-OEvoabConnection::OEvoabConnection( OEvoabDriver& _rDriver )
-    :OSubComponent<OEvoabConnection, OConnection_BASE>( (::cppu::OWeakObject*)(&_rDriver), this )
-    ,m_rDriver(_rDriver)
-    ,m_xCatalog(NULL)
+OEvoabConnection::OEvoabConnection(OEvoabDriver& _rDriver)
+    : OSubComponent<OEvoabConnection, OConnection_BASE>( (::cppu::OWeakObject*)(&_rDriver), this )
+    , m_rDriver(_rDriver)
+    , m_eSDBCAddressType(SDBCAddress::EVO_LOCAL)
+    , m_xCatalog(NULL)
 {
 }
 
 OEvoabConnection::~OEvoabConnection()
 {
-        ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     if(!isClosed()) {
         acquire();
commit faf55a1db829bfb3f2f47f9d87190e9396676e25
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 30 17:31:46 2015 +0000

    lcl_CheckRedline says it check for the list being sorted
    
    Change-Id: Ie86b091f8253fb9464b1bf4823c6f21da969ff90

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 873b4d6..c192cd3 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -104,6 +104,8 @@ using namespace com::sun::star;
                 SAL_WARN_IF( *pPrev->End() > *pCurrent->Start(), "sw",
                              _ERROR_PREFIX "overlapping redlines" );
             }
+
+            assert(std::is_sorted(rTbl.begin(), rTbl.end(), CompareSwRedlineTbl()));
         }
     }