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

Matúš Kukan matus.kukan at collabora.com
Mon Dec 8 03:32:11 PST 2014


 sax/source/fastparser/fastparser.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 848adf433a2408fd37f333b66413b94be97e1f7a
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Mon Dec 8 11:41:34 2014 +0100

    fastparser: Redundant check after assert
    
    Change-Id: Ibc56102831d4d36392bea4e4e088e207cef99429

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index fc1f5a9..a0e99b9 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -623,15 +623,12 @@ void FastSaxParserImpl::DefineNamespace( const OString& rPrefix, const OUString&
 {
     Entity& rEntity = getEntity();
     assert(!rEntity.maNamespaceCount.empty()); // need a context!
-    if( !rEntity.maNamespaceCount.empty() )
-    {
-        sal_uInt32 nOffset = rEntity.maNamespaceCount.top()++;
 
-        if( rEntity.maNamespaceDefines.size() <= nOffset )
-            rEntity.maNamespaceDefines.resize( rEntity.maNamespaceDefines.size() + 64 );
+    sal_uInt32 nOffset = rEntity.maNamespaceCount.top()++;
+    if( rEntity.maNamespaceDefines.size() <= nOffset )
+        rEntity.maNamespaceDefines.resize( rEntity.maNamespaceDefines.size() + 64 );
 
-        rEntity.maNamespaceDefines[nOffset].reset( new NamespaceDefine( rPrefix, GetNamespaceToken( namespaceURL ), namespaceURL ) );
-    }
+    rEntity.maNamespaceDefines[nOffset].reset( new NamespaceDefine( rPrefix, GetNamespaceToken( namespaceURL ), namespaceURL ) );
 }
 
 sal_Int32 FastSaxParserImpl::GetToken( const xmlChar* pName, sal_Int32 nameLen /* = 0 */ )


More information about the Libreoffice-commits mailing list