core.git: chart2/source

[Xisco Fauli (via logerrit)]

 chart2/source/model/template/ChartTypeTemplate.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b54e905ce6d295104af9a6d2a01b38c02abee6e3
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Nov 27 12:51:19 2024 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Nov 27 14:13:39 2024 +0100

    PVS: V560 A part of conditional expression is always true
    
    Since
    commit 9b538afc2995f7d703a77bb4e6d0e1bc97e3ca20
    Author: Vladimir Glazounov <v...@openoffice.org>
    Date:   Tue May 22 17:46:33 2007 +0000
    
        INTEGRATION: CWS chart2mst3 (1.10.4); FILE MERGED
    
    Change-Id: I1ed040165018d38770f7438a7f64436c7aa4873f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177412
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx 
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 265a5a97058a..46991f23e37a 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -317,13 +317,13 @@ bool ChartTypeTemplate::matchesTemplate2(
             for( std::size_t nCooSysIdx=0; bResult && (nCooSysIdx < 
aCooSysSeq.size()); ++nCooSysIdx )
             {
                 // match dimension
-                bResult = bResult && (aCooSysSeq[nCooSysIdx]->getDimension() 
== nDimensionToMatch);
+                bResult = aCooSysSeq[nCooSysIdx]->getDimension() == 
nDimensionToMatch;
 
                 const std::vector< rtl::Reference< ChartType > > & 
aChartTypeSeq( aCooSysSeq[nCooSysIdx]->getChartTypes2());
                 for( std::size_t nCTIdx=0; bResult && (nCTIdx < 
aChartTypeSeq.size()); ++nCTIdx )
                 {
                     // match chart type
-                    bResult = bResult && aChartTypeSeq[nCTIdx]->getChartType() 
== aChartTypeToMatch;
+                    bResult = aChartTypeSeq[nCTIdx]->getChartType() == 
aChartTypeToMatch;
                     bool bFound=false;
                     bool bAmbiguous=false;
                     // match stacking mode
@@ -508,7 +508,7 @@ void ChartTypeTemplate::createCoordinateSystems(
     {
         bool bOk = true;
         for( std::size_t i=0; bOk && i<aCoordinateSystems.size(); ++i )
-            bOk = bOk && ( xCooSys->getCoordinateSystemType() == 
aCoordinateSystems[i]->getCoordinateSystemType() &&
+            bOk = ( xCooSys->getCoordinateSystemType() == 
aCoordinateSystems[i]->getCoordinateSystemType() &&
                            (xCooSys->getDimension() == 
aCoordinateSystems[i]->getDimension()) );
         // coordinate systems are ok
         if( bOk )