From 58e31745600757f3d95085e67aa6bf13d7b9878b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 12 Feb 2019 12:31:47 +0200
Subject: loplugin:flatten in sdext

Change-Id: I5a7c2d38ef2e4af54316becd807bffab83d402d0
Reviewed-on: https://gerrit.libreoffice.org/67715
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx       | 96 +++++++++++-----------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'sdext/source/pdfimport/xpdfwrapper')

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 9842b9734e8d..3b6fcce7d137 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -553,23 +553,23 @@ void PDFOutDev::processLink(Link* link, Catalog*)
     link->getRect( &x1, &y1, &x2, &y2 );
 
     LinkAction* pAction = link->getAction();
-    if (pAction && pAction->getKind() == actionURI)
-    {
+    if (!(pAction && pAction->getKind() == actionURI))
+return;
+
 #if POPPLER_CHECK_VERSION(0, 72, 0)
-        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+    const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
 #else
-        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
+    const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
 #endif
 
-        std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
+    std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
 
-        printf( "drawLink %f %f %f %f %s\n",
-                normalize(x1),
-                normalize(y1),
-                normalize(x2),
-                normalize(y2),
-                aEsc.data() );
-    }
+    printf( "drawLink %f %f %f %f %s\n",
+            normalize(x1),
+            normalize(y1),
+            normalize(x2),
+            normalize(y2),
+            aEsc.data() );
 }
 
 void PDFOutDev::saveState(GfxState*)
@@ -734,52 +734,52 @@ void PDFOutDev::updateFont(GfxState *state)
     assert(state);
 
     GfxFont *gfxFont = state->getFont();
-    if( gfxFont )
-    {
-        FontAttributes aFont;
-        int nEmbedSize=0;
+    if( !gfxFont )
+        return;
+
+    FontAttributes aFont;
+    int nEmbedSize=0;
 
 #if POPPLER_CHECK_VERSION(0, 64, 0)
-        const
+    const
 #endif
-        Ref* pID = gfxFont->getID();
-        // TODO(Q3): Portability problem
-        long long fontID = static_cast<long long>(pID->gen) << 32 | static_cast<long long>(pID->num);
-        std::unordered_map< long long, FontAttributes >::const_iterator it =
-            m_aFontMap.find( fontID );
-        if( it == m_aFontMap.end() )
-        {
-            nEmbedSize = parseFont( fontID, gfxFont, state );
-            it = m_aFontMap.find( fontID );
-        }
+    Ref* pID = gfxFont->getID();
+    // TODO(Q3): Portability problem
+    long long fontID = static_cast<long long>(pID->gen) << 32 | static_cast<long long>(pID->num);
+    std::unordered_map< long long, FontAttributes >::const_iterator it =
+        m_aFontMap.find( fontID );
+    if( it == m_aFontMap.end() )
+    {
+        nEmbedSize = parseFont( fontID, gfxFont, state );
+        it = m_aFontMap.find( fontID );
+    }
 
-        printf( "updateFont" );
-        if( it != m_aFontMap.end() )
-        {
-            // conflating this with printf below crashes under Windoze
-            printf( " %lld", fontID );
+    printf( "updateFont" );
+    if( it != m_aFontMap.end() )
+    {
+        // conflating this with printf below crashes under Windoze
+        printf( " %lld", fontID );
 
-            aFont = it->second;
+        aFont = it->second;
 
 #if POPPLER_CHECK_VERSION(0, 72, 0)
-            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
+        std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
 #else
-            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
+        std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
 #endif
-            printf( " %d %d %d %d %f %d %s",
-                    aFont.isEmbedded,
-                    aFont.isBold,
-                    aFont.isItalic,
-                    aFont.isUnderline,
-                    normalize(state->getTransformedFontSize()),
-                    nEmbedSize,
-                    aEsc.data() );
-        }
-        printf( "\n" );
-
-        if( nEmbedSize )
-            writeFontFile(gfxFont);
+        printf( " %d %d %d %d %f %d %s",
+                aFont.isEmbedded,
+                aFont.isBold,
+                aFont.isItalic,
+                aFont.isUnderline,
+                normalize(state->getTransformedFontSize()),
+                nEmbedSize,
+                aEsc.data() );
     }
+    printf( "\n" );
+
+    if( nEmbedSize )
+        writeFontFile(gfxFont);
 }
 
 void PDFOutDev::updateRender(GfxState *state)
-- 
cgit