clang-format c*,d*,e* with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i <path-of-the-file>

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I06087a1385ca9da6a28d36ea4c0d2e40bdbf8f03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88774
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>

26 files changed, 51 insertions, 92 deletions

diff --git a/comphelper/qa/unit/threadpooltest.cxx b/comphelper/qa/unit/threadpooltest.cxx
index 8148cce941e8..10fb90c3014f 100644
--- a/comphelper/qa/unit/threadpooltest.cxx
+++ b/comphelper/qa/unit/threadpooltest.cxx
@@ -26,8 +26,8 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-void ThreadPoolTest::testPreferredConcurrency() {
-
+void ThreadPoolTest::testPreferredConcurrency()
+{
     // Check default.
     auto nThreads = comphelper::ThreadPool::getPreferredConcurrency();
     sal_Int32 nExpected = 4; // UTs are capped to 4.
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index 13246ee24cec..9b477e8bbe3a 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -24,14 +24,16 @@ using namespace com::sun::star;
 class Test : public UnoApiTest
 {
 public:
-    Test() : UnoApiTest("/cppcanvas/qa/extras/emfplus/data/")
+    Test()
+        : UnoApiTest("/cppcanvas/qa/extras/emfplus/data/")
     {
     }
 
     virtual void setUp() override
     {
         UnoApiTest::setUp();
-        mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
+        mxDesktop.set(
+            frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
         SfxApplication::GetOrCreate();
     };
 
diff --git a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
index e5a463b9ab78..e1156b0edf4d 100644
--- a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
+++ b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
@@ -39,9 +39,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-DbaccessDialogsTest::DbaccessDialogsTest()
-{
-}
+DbaccessDialogsTest::DbaccessDialogsTest() {}
 
 void DbaccessDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/dbaccess/source/filter/xml/xmlservices.hxx b/dbaccess/source/filter/xml/xmlservices.hxx
index 66c8aa53cc74..429ac4c20224 100644
--- a/dbaccess/source/filter/xml/xmlservices.hxx
+++ b/dbaccess/source/filter/xml/xmlservices.hxx
@@ -32,7 +32,6 @@ void createRegistryInfo_ODBFilter();
 void createRegistryInfo_ODBFilterExport();
 void createRegistryInfo_OFullExport();
 void createRegistryInfo_OSettingsExport();
-
 }
 
 #endif
diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx
index c44fb78d8c4d..d32774292a98 100644
--- a/dbaccess/source/ui/control/undosqledit.cxx
+++ b/dbaccess/source/ui/control/undosqledit.cxx
@@ -26,7 +26,7 @@ void OSqlEditUndoAct::ToggleText()
 {
     OUString strNext = m_pOwner->GetText();
     m_pOwner->SetText(m_strNextText);
-    m_strNextText  =strNext;
+    m_strNextText = strNext;
 }
 
 } // namespace
diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx
index f7eed5e85b9b..9df39fe61c44 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.hxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.hxx
@@ -23,6 +23,6 @@
 #include <osl/module.h>
 #include <commontypes.hxx>
 
-OUString getAdoDatalink(long hWnd,OUString const & oldLink);
+OUString getAdoDatalink(long hWnd, OUString const& oldLink);
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx
index 3bc1d53bf218..8718f05a838a 100644
--- a/dbaccess/source/ui/inc/uiservices.hxx
+++ b/dbaccess/source/ui/inc/uiservices.hxx
@@ -50,7 +50,6 @@ void createRegistryInfo_OTextConnectionSettingsDialog();
 void createRegistryInfo_OUserSettingsDialog();
 void createRegistryInfo_OViewControl();
 void createRegistryInfo_SbaXGridControl();
-
 }
 
 #endif
diff --git a/desktop/qa/unit/desktop-dialogs-test.cxx b/desktop/qa/unit/desktop-dialogs-test.cxx
index 2a48c03f909c..54cadc33794c 100644
--- a/desktop/qa/unit/desktop-dialogs-test.cxx
+++ b/desktop/qa/unit/desktop-dialogs-test.cxx
@@ -36,9 +36,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-DesktopDialogsTest::DesktopDialogsTest()
-{
-}
+DesktopDialogsTest::DesktopDialogsTest() {}
 
 void DesktopDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index a029832d17d3..3bda24b02b6c 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -19,9 +19,7 @@ void update_checker();
 class Updater
 {
 private:
-
 public:
-
     static OUString getUpdateInfoLog();
     static OUString getPatchDirURL();
     static OUString getUpdateFileURL();
diff --git a/desktop/unx/source/pagein.h b/desktop/unx/source/pagein.h
index c31922b3f1a0..308fca530ada 100644
--- a/desktop/unx/source/pagein.h
+++ b/desktop/unx/source/pagein.h
@@ -22,7 +22,7 @@
 
 #include <sal/config.h>
 
-void pagein_execute(char const * path, char const * file);
+void pagein_execute(char const* path, char const* file);
 
 #endif
 
diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx
index 66ad4ebfde7a..de6b77d4cda7 100644
--- a/embeddedobj/source/msole/olewrapclient.hxx
+++ b/embeddedobj/source/msole/olewrapclient.hxx
@@ -42,8 +42,8 @@ public:
     STDMETHODIMP_(ULONG) Release() override;
 
     STDMETHODIMP SaveObject() override;
-    STDMETHODIMP GetMoniker(DWORD, DWORD, IMoniker **) override;
-    STDMETHODIMP GetContainer(IOleContainer **) override;
+    STDMETHODIMP GetMoniker(DWORD, DWORD, IMoniker**) override;
+    STDMETHODIMP GetContainer(IOleContainer**) override;
     STDMETHODIMP ShowObject() override;
     STDMETHODIMP OnShowWindow(BOOL) override;
     STDMETHODIMP RequestNewObjectLayout() override;
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index b93afd79030c..81b121dde97b 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -24,7 +24,7 @@
 #define _ATL_APARTMENT_THREADED
 
 #if !defined WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <ole2.h>
diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx
index e121f248f979..5d3c3b772de5 100644
--- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx
@@ -35,10 +35,11 @@ class WmfTest : public test::BootstrapFixture, public XmlTestTools
     }
 
 public:
-    WmfTest() :
-        BootstrapFixture(true, false),
-        maDataUrl("/emfio/qa/cppunit/wmf/data/")
-    {}
+    WmfTest()
+        : BootstrapFixture(true, false)
+        , maDataUrl("/emfio/qa/cppunit/wmf/data/")
+    {
+    }
 
     void testNonPlaceableWmf();
     void testSine();
@@ -74,7 +75,7 @@ void WmfTest::testNonPlaceableWmf()
     dumper.filterActionType(MetaActionType::POLYLINE, false);
     xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile);
 
-    CPPUNIT_ASSERT (pDoc);
+    CPPUNIT_ASSERT(pDoc);
 
     assertXPath(pDoc, "/metafile/polyline[1]/point[1]", "x", "16798");
     assertXPath(pDoc, "/metafile/polyline[1]/point[1]", "y", "1003");
@@ -103,7 +104,7 @@ void WmfTest::testSine()
     dumper.filterActionType(MetaActionType::ISECTRECTCLIPREGION, false);
     xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile);
 
-    CPPUNIT_ASSERT (pDoc);
+    CPPUNIT_ASSERT(pDoc);
 
     assertXPath(pDoc, "/metafile/sectrectclipregion", 0);
 }
@@ -119,7 +120,7 @@ void WmfTest::testEmfProblem()
     dumper.filterActionType(MetaActionType::ISECTRECTCLIPREGION, false);
     xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile);
 
-    CPPUNIT_ASSERT (pDoc);
+    CPPUNIT_ASSERT(pDoc);
 
     assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "top", "427");
     assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "left", "740");
@@ -139,7 +140,7 @@ void WmfTest::testEmfLineStyles()
     dumper.filterActionType(MetaActionType::LINECOLOR, false);
     xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile);
 
-    CPPUNIT_ASSERT (pDoc);
+    CPPUNIT_ASSERT(pDoc);
 
     assertXPath(pDoc, "/metafile/line", 4);
     assertXPath(pDoc, "/metafile/linecolor", 5);
@@ -198,7 +199,7 @@ void WmfTest::testWorldTransformFontSize()
     dumper.filterActionType(MetaActionType::FONT, false);
     xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile);
 
-    CPPUNIT_ASSERT (pDoc);
+    CPPUNIT_ASSERT(pDoc);
 
     assertXPath(pDoc, "/metafile/font", 8);
 
@@ -226,7 +227,7 @@ void WmfTest::testTdf93750()
     MetafileXmlDump dumper;
     xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile);
 
-    CPPUNIT_ASSERT (pDoc);
+    CPPUNIT_ASSERT(pDoc);
 
     assertXPath(pDoc, "/metafile/push[1]/comment[2]", "datasize", "28");
     assertXPath(pDoc, "/metafile/push[1]/comment[3]", "datasize", "72");
@@ -256,7 +257,7 @@ void WmfTest::testTdf99402()
 void WmfTest::testTdf39894()
 {
     OUString files[] = { "tdf39894.wmf", "tdf39894.emf" };
-    for (const auto& file: files)
+    for (const auto& file : files)
     {
         SvFileStream aFileStream(getFullUrl(file), StreamMode::READ);
         GDIMetaFile aGDIMetaFile;
@@ -277,7 +278,7 @@ void WmfTest::testTdf39894()
 void WmfTest::testETO_PDY()
 {
     OUString files[] = { "ETO_PDY.wmf", "ETO_PDY.emf" };
-    for (const auto& file: files)
+    for (const auto& file : files)
     {
         SvFileStream aFileStream(getFullUrl(file), StreamMode::READ);
         GDIMetaFile aGDIMetaFile;
diff --git a/extensions/source/abpilot/moduleabp.cxx b/extensions/source/abpilot/moduleabp.cxx
index ce028b6d8d18..0a8f8fd4d291 100644
--- a/extensions/source/abpilot/moduleabp.cxx
+++ b/extensions/source/abpilot/moduleabp.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <componentmodule.cxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbpservices.hxx b/extensions/source/dbpilots/dbpservices.hxx
index 655c818501c7..2d135df17287 100644
--- a/extensions/source/dbpilots/dbpservices.hxx
+++ b/extensions/source/dbpilots/dbpservices.hxx
@@ -29,7 +29,6 @@ extern "C" {
 void createRegistryInfo_OGridWizard();
 void createRegistryInfo_OGroupBoxWizard();
 void createRegistryInfo_OListComboWizard();
-
 }
 
 #endif
diff --git a/extensions/source/dbpilots/moduledbp.cxx b/extensions/source/dbpilots/moduledbp.cxx
index ce028b6d8d18..0a8f8fd4d291 100644
--- a/extensions/source/dbpilots/moduledbp.cxx
+++ b/extensions/source/dbpilots/moduledbp.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <componentmodule.cxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index 99a3e7ae17e4..04e2823a7bc3 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -48,13 +48,13 @@ using namespace com::sun::star::beans;
 using namespace osl;
 using namespace std;
 
-VARTYPE getVarType( const Any& val);
+VARTYPE getVarType(const Any& val);
 /* creates a Type object for a given type name.
 
     The function returns false if the name does not represent
     a valid type.
 */
-bool getType( BSTR name, Type & type);
+bool getType(BSTR name, Type& type);
 void o2u_attachCurrentThread();
 
 class BridgeRuntimeError
@@ -67,7 +67,6 @@ public:
     OUString message;
 };
 
-
 Mutex* getBridgeMutex();
 
 #endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX
diff --git a/extensions/source/propctrlr/pcrservices.hxx b/extensions/source/propctrlr/pcrservices.hxx
index 73cd86b9487b..f6649cc39d09 100644
--- a/extensions/source/propctrlr/pcrservices.hxx
+++ b/extensions/source/propctrlr/pcrservices.hxx
@@ -45,7 +45,6 @@ void createRegistryInfo_ObjectInspectorModel();
 void createRegistryInfo_StringRepresentation();
 void createRegistryInfo_SubmissionPropertyHandler();
 void createRegistryInfo_XSDValidationPropertyHandler();
-
 }
 
 #endif
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 1f3a0f191cca..86f1a521c6e1 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -36,10 +36,10 @@ class GridDialog : public weld::GenericDialogController
     std::unique_ptr<weld::Button> m_xOKButton;
     std::unique_ptr<weld::ComboBox> m_xResetTypeBox;
     std::unique_ptr<weld::Button> m_xResetButton;
-    std::unique_ptr<GridWindow>     m_xGridWindow;
+    std::unique_ptr<GridWindow> m_xGridWindow;
     std::unique_ptr<weld::CustomWeld> m_xGridWindowWND;
 
-    DECL_LINK( ClickButtonHdl, weld::Button&, void );
+    DECL_LINK(ClickButtonHdl, weld::Button&, void);
 
 public:
     GridDialog(weld::Window* pParent, double* pXValues, double* pYValues, int nValues);
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index c8a66b73ade8..131cf5f50a1b 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -43,7 +43,6 @@
 
 namespace
 {
-
 enum TwainState
 {
     TWAIN_STATE_NONE = 0,
@@ -342,8 +341,7 @@ bool Twain::InitializeNewShim(ScannerManager& rMgr, const VclPtr<vcl::Window>& x
         return false; // Have a shim for another task already!
 
     // hold reference to ScannerManager, to prevent premature death
-    mxMgr.set(static_cast<OWeakObject*>(mpCurMgr = &rMgr),
-              css::uno::UNO_QUERY);
+    mxMgr.set(static_cast<OWeakObject*>(mpCurMgr = &rMgr), css::uno::UNO_QUERY);
 
     mpThread.set(new ShimListenerThread(xTopWindow));
     mpThread->launch();
@@ -595,8 +593,8 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan(
 
     VclPtr<vcl::Window> xTopWindow = ImplGetActiveFrameWindow();
     if (xTopWindow)
-        xTopWindow->IncModalCount(); // to avoid changes between the two operations that each
-                                     // block the window
+        xTopWindow
+            ->IncModalCount(); // to avoid changes between the two operations that each block the window
     comphelper::ScopeGuard aModalGuard([xTopWindow]() {
         if (xTopWindow)
             xTopWindow->DecModalCount();
diff --git a/extensions/test/ole/MfcControl/StdAfx.h b/extensions/test/ole/MfcControl/StdAfx.h
index 8ca3f5f4281c..6e8059a1bec3 100644
--- a/extensions/test/ole/MfcControl/StdAfx.h
+++ b/extensions/test/ole/MfcControl/StdAfx.h
@@ -27,7 +27,7 @@
 //      or project specific include files that are used frequently,
 //      but are changed infrequently
 
-#define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
 
 #include <afxctl.h>
 #include <afxext.h>
diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
index e60a425b2502..0274335ced46 100644
--- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
+++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
@@ -20,7 +20,6 @@
 //  or project specific include files that are used frequently, but
 //      are changed infrequently
 
-
 #if !defined(AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_)
 #define AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_
 
@@ -28,7 +27,7 @@
 #pragma once
 #endif
 
-#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 
 #include <stdio.h>
 #include <windows.h>
diff --git a/external/bluez_bluetooth/inc/bluetooth/l2cap.h b/external/bluez_bluetooth/inc/bluetooth/l2cap.h
index d6a0dbbf3506..514c16eb285b 100644
--- a/external/bluez_bluetooth/inc/bluetooth/l2cap.h
+++ b/external/bluez_bluetooth/inc/bluetooth/l2cap.h
@@ -80,8 +80,8 @@
 #endif
 struct sockaddr_l2
 {
-  sa_family_t l2_family;
-  unsigned short l2_psm;
-  bdaddr_t l2_bdaddr;
+    sa_family_t l2_family;
+    unsigned short l2_psm;
+    bdaddr_t l2_bdaddr;
 };
 #endif
diff --git a/external/mariadb-connector-c/configs/mysql_version.h b/external/mariadb-connector-c/configs/mysql_version.h
index 050e861b7b91..dfa39c7152b0 100644
--- a/external/mariadb-connector-c/configs/mysql_version.h
+++ b/external/mariadb-connector-c/configs/mysql_version.h
@@ -25,4 +25,3 @@
 #define MYSQL_CHARSET ""
 #endif
 #endif
-
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h
index 6f90ac834a17..00252d0abf9e 100644
--- a/external/neon/configs/config.h
+++ b/external/neon/configs/config.h
@@ -216,7 +216,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define to 1 if you have the `setsockopt' function. */
-#if defined (LINUX) || defined (_WIN32)
+#if defined(LINUX) || defined(_WIN32)
 #define HAVE_SETSOCKOPT 1
 #endif
 
@@ -235,7 +235,7 @@
 #define HAVE_SIGNAL_H 1
 
 /* Define to 1 if you have the `snprintf' function. */
-#if defined( UNX ) || defined(_MSC_VER)
+#if defined(UNX) || defined(_MSC_VER)
 #define HAVE_SNPRINTF 1
 #endif
 
@@ -500,29 +500,28 @@
 
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
+#undef _ALL_SOURCE
 #endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
+#undef _GNU_SOURCE
 #endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
+#undef _POSIX_PTHREAD_SEMANTICS
 #endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
+#undef _TANDEM_SOURCE
 #endif
 /* Enable general extensions on Solaris.  */
 #ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+#undef __EXTENSIONS__
 #endif
 
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined (__sun) && defined (SPARC)
+#if defined(__sun) && defined(SPARC)
 #define WORDS_BIGENDIAN 1
 #endif
 
@@ -548,7 +547,7 @@
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
-#if defined (__sun) && defined (__SUNPRO_C)
+#if defined(__sun) && defined(__SUNPRO_C)
 #define inline
 #endif
 #endif
@@ -570,14 +569,13 @@
 /* beast we need a workaround */
 #define IIS_LOCK_BUG_WORKAROUND 1
 
-
 /* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */
 #ifdef NEON_MEMLEAK
-# include "memleak.h"
+#include "memleak.h"
 #endif
 
 #if defined(HAVE_STPCPY) && defined(HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY && !defined(stpcpy)
-char *stpcpy(char *, const char *);
+char* stpcpy(char*, const char*);
 #endif
 
 #ifdef _WIN32
@@ -587,7 +585,7 @@ char *stpcpy(char *, const char *);
 #define HAVE_MEMCPY 1
 
 #define strncasecmp strnicmp
-#define inline      __inline
+#define inline __inline
 #define WIN32_LEAN_AND_MEAN
 #define NOUSER
 #define NOGDI
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 63a238e112fe..8df1cac9df0c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -1520,7 +1520,6 @@ comphelper/qa/string/test_string.cxx
 comphelper/qa/unit/base64_test.cxx
 comphelper/qa/unit/syntaxhighlighttest.cxx
 comphelper/qa/unit/test_hash.cxx
-comphelper/qa/unit/threadpooltest.cxx
 comphelper/qa/unit/variadictemplates.cxx
 comphelper/qa/weakbag/test_weakbag.cxx
 comphelper/source/compare/AnyCompareFactory.cxx
@@ -2507,7 +2506,6 @@ connectivity/source/sdbcx/VView.cxx
 connectivity/workben/iniParser/main.cxx
 connectivity/workben/little/main.cxx
 connectivity/workben/skeleton/SResultSet.hxx
-cppcanvas/qa/extras/emfplus/emfplus.cxx
 cppcanvas/qa/unit/test.cxx
 cppcanvas/source/inc/action.hxx
 cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -2869,7 +2867,6 @@ dbaccess/qa/extras/empty-stdlib-save.cxx
 dbaccess/qa/extras/macros-test.cxx
 dbaccess/qa/extras/nolib-save.cxx
 dbaccess/qa/extras/rowsetclones.cxx
-dbaccess/qa/unit/dbaccess-dialogs-test.cxx
 dbaccess/qa/unit/dbtest_base.cxx
 dbaccess/qa/unit/embeddeddb_performancetest.cxx
 dbaccess/qa/unit/firebird-regression.cxx
@@ -3076,7 +3073,6 @@ dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
 dbaccess/source/filter/xml/xmlfilter.cxx
 dbaccess/source/filter/xml/xmlfilter.hxx
 dbaccess/source/filter/xml/xmlservices.cxx
-dbaccess/source/filter/xml/xmlservices.hxx
 dbaccess/source/inc/OAuthenticationContinuation.hxx
 dbaccess/source/inc/apitools.hxx
 dbaccess/source/inc/dbu_reghelper.hxx
@@ -3149,7 +3145,6 @@ dbaccess/source/ui/control/marktree.cxx
 dbaccess/source/ui/control/opendoccontrols.cxx
 dbaccess/source/ui/control/sqledit.cxx
 dbaccess/source/ui/control/tabletree.cxx
-dbaccess/source/ui/control/undosqledit.cxx
 dbaccess/source/ui/dlg/CollectionView.cxx
 dbaccess/source/ui/dlg/ConnectionHelper.cxx
 dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -3175,7 +3170,6 @@ dbaccess/source/ui/dlg/admincontrols.hxx
 dbaccess/source/ui/dlg/adminpages.cxx
 dbaccess/source/ui/dlg/adminpages.hxx
 dbaccess/source/ui/dlg/adodatalinks.cxx
-dbaccess/source/ui/dlg/adodatalinks.hxx
 dbaccess/source/ui/dlg/adtabdlg.cxx
 dbaccess/source/ui/dlg/advancedsettings.cxx
 dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -3328,7 +3322,6 @@ dbaccess/source/ui/inc/sqlmessage.hxx
 dbaccess/source/ui/inc/stringlistitem.hxx
 dbaccess/source/ui/inc/tabletree.hxx
 dbaccess/source/ui/inc/textconnectionsettings.hxx
-dbaccess/source/ui/inc/uiservices.hxx
 dbaccess/source/ui/inc/undosqledit.hxx
 dbaccess/source/ui/inc/unoadmin.hxx
 dbaccess/source/ui/inc/unodatbr.hxx
@@ -3473,7 +3466,6 @@ desktop/inc/migration.hxx
 desktop/qa/deployment_misc/test_dp_version.cxx
 desktop/qa/desktop_app/test_desktop_app.cxx
 desktop/qa/desktop_lib/test_desktop_lib.cxx
-desktop/qa/unit/desktop-dialogs-test.cxx
 desktop/source/app/app.cxx
 desktop/source/app/appinit.cxx
 desktop/source/app/check_ext_deps.cxx
@@ -3495,7 +3487,6 @@ desktop/source/app/officeipcthread.hxx
 desktop/source/app/opencl.cxx
 desktop/source/app/sofficemain.cxx
 desktop/source/app/updater.cxx
-desktop/source/app/updater.hxx
 desktop/source/app/userinstall.cxx
 desktop/source/app/userinstall.hxx
 desktop/source/deployment/dp_log.cxx
@@ -3626,7 +3617,6 @@ desktop/unx/source/args.h
 desktop/unx/source/file_image.h
 desktop/unx/source/file_image_unx.c
 desktop/unx/source/pagein.c
-desktop/unx/source/pagein.h
 desktop/unx/source/splashx.c
 desktop/unx/source/start.c
 desktop/win32/source/QuickStart/QuickStart.cxx
@@ -4019,10 +4009,8 @@ embeddedobj/source/msole/olepersist.hxx
 embeddedobj/source/msole/oleregister.cxx
 embeddedobj/source/msole/olevisual.cxx
 embeddedobj/source/msole/olewrapclient.cxx
-embeddedobj/source/msole/olewrapclient.hxx
 embeddedobj/source/msole/ownview.cxx
 embeddedobj/source/msole/ownview.hxx
-embeddedobj/source/msole/platform.h
 embeddedobj/source/msole/xdialogcreator.cxx
 embeddedobj/source/msole/xdialogcreator.hxx
 embeddedobj/source/msole/xolefactory.cxx
@@ -4071,7 +4059,6 @@ emfio/inc/emfreader.hxx
 emfio/inc/mtftools.hxx
 emfio/inc/wmfreader.hxx
 emfio/qa/cppunit/emf/EmfImportTest.cxx
-emfio/qa/cppunit/wmf/wmfimporttest.cxx
 emfio/source/emfuno/emfuno.cxx
 emfio/source/emfuno/xemfparser.cxx
 emfio/source/emfuno/xemfparser.hxx
@@ -4100,7 +4087,6 @@ extensions/source/abpilot/fieldmappingimpl.cxx
 extensions/source/abpilot/fieldmappingimpl.hxx
 extensions/source/abpilot/fieldmappingpage.cxx
 extensions/source/abpilot/fieldmappingpage.hxx
-extensions/source/abpilot/moduleabp.cxx
 extensions/source/abpilot/tableselectionpage.cxx
 extensions/source/abpilot/tableselectionpage.hxx
 extensions/source/abpilot/typeselectionpage.cxx
@@ -4154,7 +4140,6 @@ extensions/source/dbpilots/commonpagesdbp.hxx
 extensions/source/dbpilots/controlwizard.cxx
 extensions/source/dbpilots/controlwizard.hxx
 extensions/source/dbpilots/dbpservices.cxx
-extensions/source/dbpilots/dbpservices.hxx
 extensions/source/dbpilots/dbptools.cxx
 extensions/source/dbpilots/dbptools.hxx
 extensions/source/dbpilots/dbptypes.hxx
@@ -4164,7 +4149,6 @@ extensions/source/dbpilots/groupboxwiz.cxx
 extensions/source/dbpilots/groupboxwiz.hxx
 extensions/source/dbpilots/listcombowizard.cxx
 extensions/source/dbpilots/listcombowizard.hxx
-extensions/source/dbpilots/moduledbp.cxx
 extensions/source/dbpilots/optiongrouplayouter.cxx
 extensions/source/dbpilots/optiongrouplayouter.hxx
 extensions/source/dbpilots/unoautopilot.hxx
@@ -4193,7 +4177,6 @@ extensions/source/ole/comifaces.hxx
 extensions/source/ole/jscriptclasses.cxx
 extensions/source/ole/jscriptclasses.hxx
 extensions/source/ole/ole2uno.cxx
-extensions/source/ole/ole2uno.hxx
 extensions/source/ole/oledll.cxx
 extensions/source/ole/oleobjw.cxx
 extensions/source/ole/oleobjw.hxx
@@ -4278,7 +4261,6 @@ extensions/source/propctrlr/pcrcommon.cxx
 extensions/source/propctrlr/pcrcommon.hxx
 extensions/source/propctrlr/pcrcommontypes.hxx
 extensions/source/propctrlr/pcrservices.cxx
-extensions/source/propctrlr/pcrservices.hxx
 extensions/source/propctrlr/pcrstrings.hxx
 extensions/source/propctrlr/pcrunodialogs.cxx
 extensions/source/propctrlr/pcrunodialogs.hxx
@@ -4321,7 +4303,6 @@ extensions/source/propctrlr/xsdvalidationhelper.hxx
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
 extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
 extensions/source/scanner/grid.cxx
-extensions/source/scanner/grid.hxx
 extensions/source/scanner/sane.cxx
 extensions/source/scanner/sane.hxx
 extensions/source/scanner/sanedlg.cxx
@@ -4329,7 +4310,6 @@ extensions/source/scanner/sanedlg.hxx
 extensions/source/scanner/scanner.cxx
 extensions/source/scanner/scanner.hxx
 extensions/source/scanner/scanunx.cxx
-extensions/source/scanner/scanwin.cxx
 extensions/source/scanner/scnserv.cxx
 extensions/source/update/check/actionlistener.hxx
 extensions/source/update/check/download.cxx
@@ -4366,7 +4346,6 @@ extensions/test/ole/MfcControl/MfcControlCtl.h
 extensions/test/ole/MfcControl/MfcControlPpg.cpp
 extensions/test/ole/MfcControl/MfcControlPpg.h
 extensions/test/ole/MfcControl/Resource.h
-extensions/test/ole/MfcControl/StdAfx.h
 extensions/test/ole/OleClient/axhost.cxx
 extensions/test/ole/OleClient/axhost.hxx
 extensions/test/ole/OleClient/clientTest.cxx
@@ -4377,7 +4356,6 @@ extensions/test/ole/cpnt/cpnt.cxx
 extensions/test/ole/cppToUno/testcppuno.cxx
 extensions/test/ole/cpptest/cpptest.cxx
 extensions/test/ole/unloading/unloadTest.cxx
-extensions/test/ole/unoTocomCalls/Test/StdAfx.h
 extensions/test/ole/unoTocomCalls/Test/Test.cpp
 extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp
 extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
@@ -4388,7 +4366,6 @@ extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h
 external/bluez_bluetooth/inc/bluetooth/bluetooth.h
 external/bluez_bluetooth/inc/bluetooth/hci.h
 external/bluez_bluetooth/inc/bluetooth/hci_lib.h
-external/bluez_bluetooth/inc/bluetooth/l2cap.h
 external/bluez_bluetooth/inc/bluetooth/rfcomm.h
 external/bluez_bluetooth/inc/bluetooth/sco.h
 external/clew/source/clew.c
@@ -4401,8 +4378,6 @@ external/clucene/configs/clucene-config-MSVC.h
 external/clucene/configs/clucene-config-generic.h
 external/mariadb-connector-c/configs/linux_my_config.h
 external/mariadb-connector-c/configs/mac_my_config.h
-external/mariadb-connector-c/configs/mysql_version.h
-external/neon/configs/config.h
 external/redland/raptor/raptor2.h
 external/redland/raptor/raptor_config.h
 external/redland/rasqal/rasqal.h