diff options
author | Muhammet Kara <muhammet.kara@collabora.com> | 2020-02-16 15:41:27 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-02-16 15:14:16 +0100 |
commit | 5c30117af73db865da11876c53de60bd613b2973 (patch) | |
tree | 5e151e15b636fa7e88def3810f77defc8b6ebed6 | |
parent | 0adc9b615f118ebb78f5f2edfe0c1c0e41270d57 (diff) |
clang-format sfx2 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: I6b2e99a6485031e33c781be896e9426fffd08edf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88779
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
-rw-r--r-- | sfx2/inc/arrdecl.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfxbasecontroller_internal.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/syspath.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/syspathw32.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/itemdel.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/preview.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/inc/sfxpicklist.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/notebookbar/DropdownBox.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/styles/StyleManager.cxx | 1 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 10 |
11 files changed, 10 insertions, 20 deletions
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx index 67387e0f071e..b777fad7aa48 100644 --- a/sfx2/inc/arrdecl.hxx +++ b/sfx2/inc/arrdecl.hxx @@ -23,7 +23,7 @@ #include <memory> class SfxFilter; -typedef ::std::vector< std::shared_ptr<const SfxFilter> > SfxFilterList_Impl; +typedef ::std::vector<std::shared_ptr<const SfxFilter>> SfxFilterList_Impl; #endif diff --git a/sfx2/inc/sfxbasecontroller_internal.hxx b/sfx2/inc/sfxbasecontroller_internal.hxx index 2f593414154d..0de26d5e98ad 100644 --- a/sfx2/inc/sfxbasecontroller_internal.hxx +++ b/sfx2/inc/sfxbasecontroller_internal.hxx @@ -14,7 +14,6 @@ extern sal_uInt32 Get10ThSec(); - #endif // INCLUDED_SFX2_INC_SFXBASECONTROLLER_INTERNAL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/objstor.hxx b/sfx2/source/doc/objstor.hxx index d4b8683682ef..4692dbf71f7a 100644 --- a/sfx2/source/doc/objstor.hxx +++ b/sfx2/source/doc/objstor.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/frame/XModel.hpp> -void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel); +void impl_addToModelCollection(const css::uno::Reference<css::frame::XModel>& xModel); #endif // INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx index 7837b03e20b0..9c135993cb63 100644 --- a/sfx2/source/doc/syspath.hxx +++ b/sfx2/source/doc/syspath.hxx @@ -24,7 +24,7 @@ namespace SystemPath { - bool GetUserTemplateLocation(sal_Unicode*, int nSize); +bool GetUserTemplateLocation(sal_Unicode*, int nSize); }; #endif diff --git a/sfx2/source/doc/syspathw32.hxx b/sfx2/source/doc/syspathw32.hxx index 5707a80cec00..7a06950c5f01 100644 --- a/sfx2/source/doc/syspathw32.hxx +++ b/sfx2/source/doc/syspathw32.hxx @@ -25,7 +25,7 @@ #include <sal/types.h> #if defined _WIN32 -bool GetUserTemplateLocation(sal_Unicode *, int nSize); +bool GetUserTemplateLocation(sal_Unicode*, int nSize); #endif #endif diff --git a/sfx2/source/inc/itemdel.hxx b/sfx2/source/inc/itemdel.hxx index 1884c83c38cc..b8ea325010e4 100644 --- a/sfx2/source/inc/itemdel.hxx +++ b/sfx2/source/inc/itemdel.hxx @@ -23,7 +23,7 @@ class SfxPoolItem; -void DeleteItemOnIdle( std::unique_ptr<SfxPoolItem> pItem ); +void DeleteItemOnIdle(std::unique_ptr<SfxPoolItem> pItem); #endif diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index 89dfa55b0e73..b3065831982b 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -29,9 +29,10 @@ class SfxPreviewWin_Impl : public weld::CustomWidgetController private: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; std::shared_ptr<GDIMetaFile> xMetaFile; + public: SfxPreviewWin_Impl(); - void SetObjectShell( SfxObjectShell const * pObj ); + void SetObjectShell(SfxObjectShell const* pObj); static void ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFile* pFile); }; diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 6a6e818a613b..b8af2310d467 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -22,7 +22,7 @@ #include <memory> -#define PICKLIST_MAXSIZE 100 +#define PICKLIST_MAXSIZE 100 class SfxApplication; class SfxPickListImpl; @@ -31,6 +31,7 @@ class SfxPickList { private: std::unique_ptr<SfxPickListImpl> mxImpl; + public: SfxPickList(SfxApplication& rApp); ~SfxPickList(); diff --git a/sfx2/source/notebookbar/DropdownBox.hxx b/sfx2/source/notebookbar/DropdownBox.hxx index d66d798d8d14..769cd2e42fae 100644 --- a/sfx2/source/notebookbar/DropdownBox.hxx +++ b/sfx2/source/notebookbar/DropdownBox.hxx @@ -32,7 +32,7 @@ private: VclPtr<NotebookbarPopup> m_pPopup; public: - explicit DropdownBox(vcl::Window *pParent); + explicit DropdownBox(vcl::Window* pParent); virtual ~DropdownBox() override; virtual void dispose() override; diff --git a/sfx2/source/styles/StyleManager.cxx b/sfx2/source/styles/StyleManager.cxx index 75ec9d9467a2..7d1525ebccac 100644 --- a/sfx2/source/styles/StyleManager.cxx +++ b/sfx2/source/styles/StyleManager.cxx @@ -12,7 +12,6 @@ namespace sfx2 { - SfxStyleSheetBase* StyleManager::Search(const OUString& rStyleName, SfxStyleFamily eFamily) { SfxStyleSheetBasePool* pPool = mrShell.GetStyleSheetPool(); diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 687fb0b32db8..da3c2da49188 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -12072,7 +12072,6 @@ setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx setup_native/source/win32/customactions/tools/checkversion.cxx setup_native/source/win32/customactions/tools/seterror.cxx setup_native/source/win32/customactions/tools/seterror.hxx -sfx2/inc/arrdecl.hxx sfx2/inc/bitset.hxx sfx2/inc/bluthsndapi.hxx sfx2/inc/charmapcontrol.hxx @@ -12084,7 +12083,6 @@ sfx2/inc/guisaveas.hxx sfx2/inc/inettbc.hxx sfx2/inc/preventduplicateinteraction.hxx sfx2/inc/recentdocsview.hxx -sfx2/inc/sfxbasecontroller_internal.hxx sfx2/inc/notebookbar/NotebookbarTabControl.hxx sfx2/inc/sidebar/Accessible.hxx sfx2/inc/sidebar/AccessibleTitleBar.hxx @@ -12277,7 +12275,6 @@ sfx2/source/doc/objitem.cxx sfx2/source/doc/objmisc.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/objstor.cxx -sfx2/source/doc/objstor.hxx sfx2/source/doc/objxtor.cxx sfx2/source/doc/oleprops.cxx sfx2/source/doc/oleprops.hxx @@ -12288,9 +12285,7 @@ sfx2/source/doc/saveastemplatedlg.cxx sfx2/source/doc/sfxbasemodel.cxx sfx2/source/doc/sfxmodelfactory.cxx sfx2/source/doc/syspath.cxx -sfx2/source/doc/syspath.hxx sfx2/source/doc/syspathw32.cxx -sfx2/source/doc/syspathw32.hxx sfx2/source/doc/templatedlg.cxx sfx2/source/doc/watermarkitem.cxx sfx2/source/doc/zoomitem.cxx @@ -12307,16 +12302,13 @@ sfx2/source/inc/fltoptint.hxx sfx2/source/inc/helper.hxx sfx2/source/inc/helpids.h sfx2/source/inc/hintpost.hxx -sfx2/source/inc/itemdel.hxx sfx2/source/inc/macroloader.hxx sfx2/source/inc/nochaos.hxx sfx2/source/inc/objshimp.hxx sfx2/source/inc/openflag.hxx sfx2/source/inc/openurlhint.hxx sfx2/source/inc/partwnd.hxx -sfx2/source/inc/preview.hxx sfx2/source/inc/recfloat.hxx -sfx2/source/inc/sfxpicklist.hxx sfx2/source/inc/sfxtypes.hxx sfx2/source/inc/sfxurlrelocator.hxx sfx2/source/inc/shellimpl.hxx @@ -12332,7 +12324,6 @@ sfx2/source/inc/workwin.hxx sfx2/source/inet/inettbc.cxx sfx2/source/notebookbar/ContextVBox.cxx sfx2/source/notebookbar/DropdownBox.cxx -sfx2/source/notebookbar/DropdownBox.hxx sfx2/source/notebookbar/NotebookbarTabControl.cxx sfx2/source/notebookbar/PriorityHBox.cxx sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -12382,7 +12373,6 @@ sfx2/source/sidebar/UnoPanel.cxx sfx2/source/sidebar/UnoPanels.cxx sfx2/source/sidebar/UnoSidebar.cxx sfx2/source/statbar/stbitem.cxx -sfx2/source/styles/StyleManager.cxx sfx2/source/toolbox/tbxitem.cxx sfx2/source/view/classificationcontroller.cxx sfx2/source/view/classificationhelper.cxx |