tdf#120703 PVS: V547 Expression is always true/false

Change-Id: I0b3c407331bfa1fa0c5003250d327d4f26de3643
Reviewed-on: https://gerrit.libreoffice.org/63235
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

2 files changed, 17 insertions, 43 deletions

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 3469fda997fa..c048d2ecb8b4 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1299,8 +1299,6 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
     uno::Sequence < beans::PropertyValue > aProps;
 
     // export sub streams for package, else full stream into a file
-    bool bErr = false;
-
     uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY);
     if ( xProp.is() )
     {
@@ -1349,44 +1347,23 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
     aDelegatorArguments[nArgsLen++] <<= xObjectResolver;
 
     uno::Reference<XComponent> xCom(static_cast<OWeakObject*>(this),uno::UNO_QUERY);
-    if( !bErr )
-    {
-        xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("settings.xml")));
-        WriteThroughComponent(
-            xCom, "settings.xml",
-            "com.sun.star.comp.report.XMLSettingsExporter",
-            aDelegatorArguments, aProps, _xStorageToSaveTo );
-    }
+    // Try to write to settings.xml, meta.xml, and styles.xml; only really care about success of
+    // write to content.xml (keeping logic of commit 94ccba3eebc83b58e74e18f0e028c6a995ce6aa6)
+    xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("settings.xml")));
+    WriteThroughComponent(xCom, "settings.xml", "com.sun.star.comp.report.XMLSettingsExporter",
+                          aDelegatorArguments, aProps, _xStorageToSaveTo);
 
-    if( !bErr )
-    {
-        xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("meta.xml")));
-        WriteThroughComponent(
-            xCom, "meta.xml",
-            "com.sun.star.comp.report.XMLMetaExporter",
-            aDelegatorArguments, aProps, _xStorageToSaveTo );
-    }
+    xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("meta.xml")));
+    WriteThroughComponent(xCom, "meta.xml", "com.sun.star.comp.report.XMLMetaExporter",
+                          aDelegatorArguments, aProps, _xStorageToSaveTo);
 
-    if( !bErr )
-    {
-        xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("styles.xml")));
-        WriteThroughComponent(
-            xCom, "styles.xml",
-            "com.sun.star.comp.report.XMLStylesExporter",
-            aDelegatorArguments, aProps, _xStorageToSaveTo );
-    }
+    xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("styles.xml")));
+    WriteThroughComponent(xCom, "styles.xml", "com.sun.star.comp.report.XMLStylesExporter",
+                          aDelegatorArguments, aProps, _xStorageToSaveTo);
 
-    if ( !bErr )
-    {
-        xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("content.xml")));
-        if( !WriteThroughComponent(
-                xCom, "content.xml",
-                "com.sun.star.comp.report.ExportFilter",
-                aDelegatorArguments, aProps, _xStorageToSaveTo ) )
-        {
-            bErr = true;
-        }
-    }
+    xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("content.xml")));
+    bool bOk = WriteThroughComponent(xCom, "content.xml", "com.sun.star.comp.report.ExportFilter",
+                                     aDelegatorArguments, aProps, _xStorageToSaveTo);
 
     uno::Any aImage;
     uno::Reference< embed::XVisualObject > xCurrentController(getCurrentController(),uno::UNO_QUERY);
@@ -1403,7 +1380,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
         m_pImpl->m_pObjectContainer->InsertGraphicStreamDirectly(xStream, "report", "image/png");
     }
 
-    if ( !bErr )
+    if (bOk)
     {
         bool bPersist = false;
         if ( _xStorageToSaveTo == m_pImpl->m_xStorage )
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 008792b2cb3f..a50d13d7a8db 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -340,7 +340,7 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
         Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY );
         if ( xServiceInfo.is() )
         {
-            const char* pResId = nullptr;
+            const char* pResId;
             if ( xServiceInfo->supportsService( SERVICE_FIXEDTEXT ) )
             {
                 pResId = RID_STR_PROPTITLE_FIXEDTEXT;
@@ -384,10 +384,7 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
                 return aName;
             }
 
-            if (pResId)
-            {
-                aName += RptResId(pResId);
-            }
+            aName += RptResId(pResId);
         }
     }
     else    // multiselection