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

ccsheller ccsheller at gmail.com
Tue Aug 22 12:51:27 UTC 2017


 vcl/source/filter/graphicfilter.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e4000dbe27ba65146854f02c9affb45e22f6639f
Author: ccsheller <ccsheller at gmail.com>
Date:   Tue Aug 22 18:35:48 2017 +0800

    unnecessary condition
    
    truth table
    pContext   bDummyContext  !pContext || bDummyContext    pContext && !bDummyContext
    T             T                     T                             F
    T             F                     F                             T
    F             T                     T                             F
    F             F                     T                             F
    
    Change-Id: I52e4647cb081eae265b3cc31e60a1ac6b0a5337d
    Reviewed-on: https://gerrit.libreoffice.org/41418
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 4747301d4510..50bb556fba98 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1554,8 +1554,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
     }
     else
     {
-        if( pContext && !bDummyContext )
-            aFilterName = pContext->GetUpperFilterName();
+        aFilterName = pContext->GetUpperFilterName();
 
         nStreamBegin = 0;
         nStatus = ERRCODE_NONE;


More information about the Libreoffice-commits mailing list