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

Miklos Vajna vmiklos at collabora.co.uk
Fri May 9 22:34:35 PDT 2014


 sc/source/core/tool/address.cxx  |    4 ++--
 sc/source/core/tool/chgtrack.cxx |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a7e8e0f29e499e500d33e1f43d73b6f233919e93
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat May 10 07:34:02 2014 +0200

    -Werror=parentheses
    
    Change-Id: I2366a8631be276db02392db6b44ee0c47ddf9da6

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index d1ea155..7554b92 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -615,7 +615,7 @@ static const sal_Unicode* lcl_r1c1_get_col( const sal_Unicode* p,
         return NULL;
 
     p++;
-    if( isRelative = (*p == '[') )
+    if( ( isRelative = (*p == '[') ) )
         p++;
     n = sal_Unicode_strtol( p, &pEnd );
     if( NULL == pEnd )
@@ -661,7 +661,7 @@ static inline const sal_Unicode* lcl_r1c1_get_row(
         return NULL;
 
     p++;
-    if( isRelative = (*p == '[') )
+    if( ( isRelative = (*p == '[') ) )
         p++;
     n = sal_Unicode_strtol( p, &pEnd );
     if( NULL == pEnd )
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index f6def98..b9cc58a 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1018,12 +1018,12 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc )
                 case SC_CAT_DELETE_COLS :
                     if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) )
                     {   // Only if not TabDelete
-                        if ( bOk = pDoc->CanInsertCol( aRange ) )
+                        if ( ( bOk = pDoc->CanInsertCol( aRange ) ) )
                             bOk = pDoc->InsertCol( aRange );
                     }
                 break;
                 case SC_CAT_DELETE_ROWS :
-                    if ( bOk = pDoc->CanInsertRow( aRange ) )
+                    if ( ( bOk = pDoc->CanInsertRow( aRange ) ) )
                         bOk = pDoc->InsertRow( aRange );
                 break;
                 case SC_CAT_DELETE_TABS :
@@ -1031,7 +1031,7 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc )
                     //TODO: Remember table names?
                     OUString aName;
                     pDoc->CreateValidTabName( aName );
-                    if ( bOk = pDoc->ValidNewTabName( aName ) )
+                    if ( ( bOk = pDoc->ValidNewTabName( aName ) ) )
                         bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName );
                 }
                 break;


More information about the Libreoffice-commits mailing list