[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Tue Oct 22 12:20:47 UTC 2019


 vcl/source/filter/graphicfilter.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 105d98caa70389c12ad4f9a2a2b7474a4be73aa2
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Oct 18 00:40:59 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Oct 22 14:20:08 2019 +0200

    pdfium: Switch the condition for better readibility.
    
    Change-Id: I8acf1e98f032f6943b2e7d09ac276f0f1ac4b120
    Reviewed-on: https://gerrit.libreoffice.org/81061
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 0aea92f7ad36..4a8f5a80cfff 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2013,12 +2013,12 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
                 nStatus = ERRCODE_GRFILTER_FILTERERROR;
             }
         }
-        else if (aFilterName == IMP_PDF)
+        else if (aFilterName.equalsIgnoreAsciiCase(IMP_PDF))
         {
-            if (!vcl::ImportPDF(rIStream, rGraphic))
-                nStatus = ERRCODE_GRFILTER_FILTERERROR;
-            else
+            if (vcl::ImportPDF(rIStream, rGraphic))
                 eLinkType = GfxLinkType::NativePdf;
+            else
+                nStatus = ERRCODE_GRFILTER_FILTERERROR;
         }
         else
             nStatus = ERRCODE_GRFILTER_FILTERERROR;


More information about the Libreoffice-commits mailing list