diff options
author | Muhammet Kara <muhammet.kara@collabora.com> | 2020-03-07 12:57:44 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-03-07 15:27:45 +0100 |
commit | f31af3ed40fba2376eb19238d3e158e91b6d1b29 (patch) | |
tree | 3b12b19cde68c7925d4fbb118f1fe01f9fb7f69b | |
parent | 615c086d40eeea1b47022ecff1168feeaae5ac2d (diff) |
clang-format toolkit, tools, uui 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: I4952f350f4d22913ea94689b902ffa26c223ff96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90152
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
-rw-r--r-- | solenv/clang-format/blacklist | 8 | ||||
-rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase_internal.hxx | 2 | ||||
-rw-r--r-- | tools/qa/cppunit/test_bigint.cxx | 8 | ||||
-rw-r--r-- | uui/source/authfallbackdlg.hxx | 3 | ||||
-rw-r--r-- | uui/source/filechanged.hxx | 1 | ||||
-rw-r--r-- | uui/source/lockcorrupt.hxx | 1 | ||||
-rw-r--r-- | uui/source/lockfailed.hxx | 1 |
7 files changed, 9 insertions, 15 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index b43214b3a6e3..c77925195833 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -15859,7 +15859,6 @@ toolkit/inc/helper/accessibilityclient.hxx toolkit/inc/helper/btndlg.hxx toolkit/inc/helper/imagealign.hxx toolkit/inc/helper/scrollabledialog.hxx -toolkit/inc/helper/servicenames.hxx toolkit/inc/helper/tkresmgr.hxx toolkit/inc/helper/unopropertyarrayhelper.hxx toolkit/inc/helper/unowrapper.hxx @@ -15890,7 +15889,6 @@ toolkit/source/awt/vclxwindows_internal.hxx toolkit/source/controls/accessiblecontrolcontext.cxx toolkit/source/controls/animatedimages.cxx toolkit/source/controls/controlmodelcontainerbase.cxx -toolkit/source/controls/controlmodelcontainerbase_internal.hxx toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/eventcontainer.cxx toolkit/source/controls/filectrl.cxx @@ -15930,13 +15928,11 @@ toolkit/source/helper/formpdfexport.cxx toolkit/source/helper/imagealign.cxx toolkit/source/helper/listenermultiplexer.cxx toolkit/source/helper/property.cxx -toolkit/source/helper/servicenames.cxx toolkit/source/helper/tkresmgr.cxx toolkit/source/helper/unopropertyarrayhelper.cxx toolkit/source/helper/unowrapper.cxx toolkit/source/helper/vclunohelper.cxx tools/inc/poly.h -tools/qa/cppunit/test_bigint.cxx tools/qa/cppunit/test_color.cxx tools/qa/cppunit/test_date.cxx tools/qa/cppunit/test_fract.cxx @@ -16512,9 +16508,7 @@ uui/qa/unit/uui-dialogs-test.cxx uui/source/alreadyopen.cxx uui/source/alreadyopen.hxx uui/source/authfallbackdlg.cxx -uui/source/authfallbackdlg.hxx uui/source/filechanged.cxx -uui/source/filechanged.hxx uui/source/fltdlg.cxx uui/source/fltdlg.hxx uui/source/getcontinuations.hxx @@ -16528,9 +16522,7 @@ uui/source/iahndl.cxx uui/source/iahndl.hxx uui/source/interactionhandler.cxx uui/source/lockcorrupt.cxx -uui/source/lockcorrupt.hxx uui/source/lockfailed.cxx -uui/source/lockfailed.hxx uui/source/logindlg.cxx uui/source/logindlg.hxx uui/source/loginerr.hxx diff --git a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx index 2a70aaa9d2ad..c65cabc8ad34 100644 --- a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx +++ b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/uno/Any.hxx> ////HELPER -OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& rUrl ); +OUString getPhysicalLocation(const css::uno::Any& rbase, const css::uno::Any& rUrl); #endif // INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX diff --git a/tools/qa/cppunit/test_bigint.cxx b/tools/qa/cppunit/test_bigint.cxx index ef147961dbf4..ed3ab3cc3b63 100644 --- a/tools/qa/cppunit/test_bigint.cxx +++ b/tools/qa/cppunit/test_bigint.cxx @@ -24,7 +24,6 @@ namespace tools { - class BigIntTest : public CppUnit::TestFixture { public: @@ -80,7 +79,8 @@ void BigIntTest::testConstructionFromLongLong() // positive number not fitting to long { - BigInt bi(static_cast<sal_Int64>(std::numeric_limits<long>::max()) + static_cast<sal_Int64>(1)); + BigInt bi(static_cast<sal_Int64>(std::numeric_limits<long>::max()) + + static_cast<sal_Int64>(1)); CPPUNIT_ASSERT(bi.IsSet()); CPPUNIT_ASSERT(!bi.IsZero()); CPPUNIT_ASSERT(!bi.IsNeg()); @@ -89,7 +89,8 @@ void BigIntTest::testConstructionFromLongLong() // negative number not fitting to long { - BigInt bi(static_cast<sal_Int64>(std::numeric_limits<long>::min()) - static_cast<sal_Int64>(1)); + BigInt bi(static_cast<sal_Int64>(std::numeric_limits<long>::min()) + - static_cast<sal_Int64>(1)); CPPUNIT_ASSERT(bi.IsSet()); CPPUNIT_ASSERT(!bi.IsZero()); CPPUNIT_ASSERT(bi.IsNeg()); @@ -99,7 +100,6 @@ void BigIntTest::testConstructionFromLongLong() } CPPUNIT_TEST_SUITE_REGISTRATION(BigIntTest); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx index 206cd87274a7..b3482f70e85f 100644 --- a/uui/source/authfallbackdlg.hxx +++ b/uui/source/authfallbackdlg.hxx @@ -27,8 +27,7 @@ private: std::unique_ptr<weld::Widget> m_xOneDriveBox; public: - AuthFallbackDlg(weld::Window* pParent, const OUString& instructions, - const OUString& url); + AuthFallbackDlg(weld::Window* pParent, const OUString& instructions, const OUString& url); virtual ~AuthFallbackDlg() override; OUString GetCode() const; diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx index 6e73d17407ab..f68b793e997a 100644 --- a/uui/source/filechanged.hxx +++ b/uui/source/filechanged.hxx @@ -25,6 +25,7 @@ class FileChangedQueryBox { private: std::unique_ptr<weld::MessageDialog> m_xQueryBox; + public: FileChangedQueryBox(weld::Window* pParent, const std::locale& pResLocale); short run() { return m_xQueryBox->run(); } diff --git a/uui/source/lockcorrupt.hxx b/uui/source/lockcorrupt.hxx index 3d6a13f50658..146757f2708e 100644 --- a/uui/source/lockcorrupt.hxx +++ b/uui/source/lockcorrupt.hxx @@ -25,6 +25,7 @@ class LockCorruptQueryBox { private: std::unique_ptr<weld::MessageDialog> m_xQueryBox; + public: LockCorruptQueryBox(weld::Window* pParent, const std::locale& rResLocale); short run() { return m_xQueryBox->run(); } diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx index 62ac5f8528dc..d7c4c11f313c 100644 --- a/uui/source/lockfailed.hxx +++ b/uui/source/lockfailed.hxx @@ -25,6 +25,7 @@ class LockFailedQueryBox { private: std::unique_ptr<weld::MessageDialog> m_xQueryBox; + public: LockFailedQueryBox(weld::Window* pParent, const std::locale& rResLocale); short run() { return m_xQueryBox->run(); } |