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>
This commit is contained in:
Muhammet Kara
2020-02-16 13:32:38 +03:00
parent 28b56c52f2
commit f99e765cb3
26 changed files with 51 additions and 92 deletions

View File

@@ -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.

View File

@@ -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();
};

View File

@@ -39,9 +39,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
DbaccessDialogsTest::DbaccessDialogsTest()
{
}
DbaccessDialogsTest::DbaccessDialogsTest() {}
void DbaccessDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
{

View File

@@ -32,7 +32,6 @@ void createRegistryInfo_ODBFilter();
void createRegistryInfo_ODBFilterExport();
void createRegistryInfo_OFullExport();
void createRegistryInfo_OSettingsExport();
}
#endif

View File

@@ -50,7 +50,6 @@ void createRegistryInfo_OTextConnectionSettingsDialog();
void createRegistryInfo_OUserSettingsDialog();
void createRegistryInfo_OViewControl();
void createRegistryInfo_SbaXGridControl();
}
#endif

View File

@@ -36,9 +36,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
DesktopDialogsTest::DesktopDialogsTest()
{
}
DesktopDialogsTest::DesktopDialogsTest() {}
void DesktopDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
{

View File

@@ -19,9 +19,7 @@ void update_checker();
class Updater
{
private:
public:
static OUString getUpdateInfoLog();
static OUString getPatchDirURL();
static OUString getUpdateFileURL();

View File

@@ -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();

View File

@@ -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: */

View File

@@ -29,7 +29,6 @@ extern "C" {
void createRegistryInfo_OGridWizard();
void createRegistryInfo_OGroupBoxWizard();
void createRegistryInfo_OListComboWizard();
}
#endif

View File

@@ -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: */

View File

@@ -67,7 +67,6 @@ public:
OUString message;
};
Mutex* getBridgeMutex();
#endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX

View File

@@ -45,7 +45,6 @@ void createRegistryInfo_ObjectInspectorModel();
void createRegistryInfo_StringRepresentation();
void createRegistryInfo_SubmissionPropertyHandler();
void createRegistryInfo_XSDValidationPropertyHandler();
}
#endif

View File

@@ -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();

View File

@@ -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_

View File

@@ -25,4 +25,3 @@
#define MYSQL_CHARSET ""
#endif
#endif

View File

@@ -519,7 +519,6 @@
#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)
@@ -570,7 +569,6 @@
/* 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"

View File

@@ -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