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

[Caolán McNamara (via logerrit)]

 chart2/source/model/template/ChartTypeManager.cxx |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 65c27ed5aa3b5ee6bdc9f1c992428ab31cd0634c
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jan 20 08:52:24 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 20 10:56:32 2022 +0100

    cid#1497461 Logically dead code
    
    Change-Id: Ia8a7fe24e46d749f8837efb50145c66b0ecb5ee2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128642
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/chart2/source/model/template/ChartTypeManager.cxx 
b/chart2/source/model/template/ChartTypeManager.cxx
index 67e343498365..5b639dbf31ab 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -232,13 +232,6 @@ rtl::Reference< ::chart::ChartTypeTemplate > 
ChartTypeManager::createTemplate(
 {
     TemplateId nId = lcl_GetTemplateIdForService( aServiceSpecifier );
 
-    if( nId == TEMPLATE_NOT_FOUND )
-    {
-        assert(false);
-        SAL_WARN("chart2", "Couldn't instantiate service: "<< 
aServiceSpecifier );
-        return nullptr;
-    }
-
     rtl::Reference< ::chart::ChartTypeTemplate > xTemplate;
     switch( nId )
     {
@@ -507,14 +500,16 @@ rtl::Reference< ::chart::ChartTypeTemplate > 
ChartTypeManager::createTemplate(
         case TEMPLATE_BUBBLE:
             xTemplate.set( new BubbleChartTypeTemplate( m_xContext, 
aServiceSpecifier ));
             break;
+
+        case TEMPLATE_NOT_FOUND:
+            SAL_WARN("chart2", "Couldn't instantiate service: "<< 
aServiceSpecifier );
+            assert(false);
+            break;
+
         default: break;
 //            case TEMPLATE_SURFACE:
 //            case TEMPLATE_ADDIN:
 //               break;
-
-        case TEMPLATE_NOT_FOUND:
-            assert( false );
-            break;
     }
 
     return xTemplate;