[Libreoffice-commits] .: 2 commits - editeng/source xmlsecurity/source

[Libreoffice Gerrit user]

 editeng/source/misc/txtrange.cxx          |    2 +-
 xmlsecurity/source/xmlsec/xmlstreamio.cxx |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a5ee0319aa5162db9e4611449760568d9a2cb37f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 28 21:34:08 2012 +0100

    Fix "scope can be reduced" for 2 variables
    
    Change-Id: I200d7c545e82fd2167f22f5522033d6e64b975f8

diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index a06b85f..1f85dc3 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -80,7 +80,6 @@ extern "C"
 void* xmlStreamOpen( const char* uri )
 {
     ::com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInputStream ;
-    ::com::sun::star::io::XInputStream* pInputStream ;
 
     if( ( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) &&
         ( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
@@ -101,6 +100,7 @@ void* xmlStreamOpen( const char* uri )
         }
 
         if( xInputStream.is() ) {
+            ::com::sun::star::io::XInputStream* pInputStream ;
             pInputStream = xInputStream.get() ;
             pInputStream->acquire() ;
             return ( void* )pInputStream ;
@@ -138,11 +138,10 @@ int xmlStreamRead( void* context, char* buffer, int len )
 extern "C"
 int xmlStreamClose( void * context )
 {
-    ::com::sun::star::io::XInputStream* pInputStream ;
-
     if( ( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) &&
         ( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
         if( context != NULL ) {
+            ::com::sun::star::io::XInputStream* pInputStream ;
             pInputStream = ( ::com::sun::star::io::XInputStream* )context ;
             pInputStream->release() ;
         }
commit 37abf7e62941af5c697ae4cd0c3dcd58d88f156e
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 28 20:28:31 2012 +0100

    Simplify this
    
    Change-Id: If1a8a2441398ea9f20d6ec45e649967673c7a6af

diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 29fb0cd..8ba4052 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -460,7 +460,7 @@ void SvxBoundArgs::Add()
                         "BoundArgs: Array-Count: Confusion" );
         }
     }
-    if( 0 != ( nCount = pLongArr->size() ) )
+    if( !pLongArr->empty() )
     {
         if( bInner )
         {