diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:15:32 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-22 01:55:36 +0100 |
commit | b35232bdf56fbda34476cf537d53bbea31235a95 (patch) | |
tree | 05c7430cd896694dbf4fa795c2afb2049da59586 /sfx2/inc | |
parent | 58d98a08aee7bf027c109eeb94183d24351827fa (diff) |
tdf#123936 Formatting files in module sfx2 with clang-format
Change-Id: I0ddd7b531cbf9aed6a3834e3cd15c7fe3644736e
(cherry picked from commit 92daf140419e4539f6843e30428e786c3e655dcc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105706
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'sfx2/inc')
-rw-r--r-- | sfx2/inc/emojicontrol.hxx | 5 | ||||
-rw-r--r-- | sfx2/inc/emojiview.hxx | 20 | ||||
-rw-r--r-- | sfx2/inc/fwkhelper.hxx | 4 | ||||
-rw-r--r-- | sfx2/inc/sidebar/DeckDescriptor.hxx | 6 | ||||
-rw-r--r-- | sfx2/inc/sidebar/DeckTitleBar.hxx | 9 | ||||
-rw-r--r-- | sfx2/inc/strings.hxx | 28 | ||||
-rw-r--r-- | sfx2/inc/templatecontaineritem.hxx | 4 | ||||
-rw-r--r-- | sfx2/inc/templatedefaultview.hxx | 6 |
8 files changed, 40 insertions, 42 deletions
diff --git a/sfx2/inc/emojicontrol.hxx b/sfx2/inc/emojicontrol.hxx index eee551600da4..2e2ab150762f 100644 --- a/sfx2/inc/emojicontrol.hxx +++ b/sfx2/inc/emojicontrol.hxx @@ -14,7 +14,10 @@ #include <svtools/toolbarmenu.hxx> #include <vcl/customweld.hxx> -namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::frame +{ +class XFrame; +} class EmojiPopup; class EmojiView; diff --git a/sfx2/inc/emojiview.hxx b/sfx2/inc/emojiview.hxx index 223d38bbbb72..52bb47bf0bc0 100644 --- a/sfx2/inc/emojiview.hxx +++ b/sfx2/inc/emojiview.hxx @@ -34,21 +34,19 @@ enum class FILTER_CATEGORY class ViewFilter_Category final { public: - - ViewFilter_Category (FILTER_CATEGORY rCategory) + ViewFilter_Category(FILTER_CATEGORY rCategory) : mCategory(rCategory) - {} + { + } - bool operator () (const ThumbnailViewItem *pItem); + bool operator()(const ThumbnailViewItem* pItem); - static bool isFilteredCategory(FILTER_CATEGORY filter, const OUString &rCategory); + static bool isFilteredCategory(FILTER_CATEGORY filter, const OUString& rCategory); private: - FILTER_CATEGORY mCategory; }; - class EmojiView final : public ThumbnailView { public: @@ -59,16 +57,16 @@ public: // Fill view with emojis void Populate(); - void setInsertEmojiHdl (const Link<ThumbnailViewItem*, void> &rLink); + void setInsertEmojiHdl(const Link<ThumbnailViewItem*, void>& rLink); - void AppendItem(const OUString &rTitle, const OUString &rCategory, const OUString &rName ); + void AppendItem(const OUString& rTitle, const OUString& rCategory, const OUString& rName); private: - virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - virtual bool KeyInput( const KeyEvent& rKEvt ) override; + virtual bool KeyInput(const KeyEvent& rKEvt) override; std::string msJSONData; diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx index bd1aa5a8bfef..d206957c9d98 100644 --- a/sfx2/inc/fwkhelper.hxx +++ b/sfx2/inc/fwkhelper.hxx @@ -24,9 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/frame/XFrame.hpp> -void RefreshToolbars( - css::uno::Reference< css::frame::XFrame > const & rFrame -); +void RefreshToolbars(css::uno::Reference<css::frame::XFrame> const& rFrame); #endif diff --git a/sfx2/inc/sidebar/DeckDescriptor.hxx b/sfx2/inc/sidebar/DeckDescriptor.hxx index f1195cd0b324..5381b4ea2cd7 100644 --- a/sfx2/inc/sidebar/DeckDescriptor.hxx +++ b/sfx2/inc/sidebar/DeckDescriptor.hxx @@ -22,8 +22,8 @@ #include <sfx2/sidebar/Deck.hxx> -namespace sfx2::sidebar { - +namespace sfx2::sidebar +{ class DeckDescriptor { public: @@ -44,7 +44,7 @@ public: VclPtr<Deck> mpDeck; DeckDescriptor(); - DeckDescriptor (const DeckDescriptor& rOther); + DeckDescriptor(const DeckDescriptor& rOther); ~DeckDescriptor(); }; diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx b/sfx2/inc/sidebar/DeckTitleBar.hxx index 3b1451ab449c..5fcc7403f134 100644 --- a/sfx2/inc/sidebar/DeckTitleBar.hxx +++ b/sfx2/inc/sidebar/DeckTitleBar.hxx @@ -21,20 +21,19 @@ #include <sidebar/TitleBar.hxx> #include <vcl/customweld.hxx> -namespace sfx2::sidebar { - +namespace sfx2::sidebar +{ class GripWidget; class DeckTitleBar final : public TitleBar { public: - DeckTitleBar(const OUString& rsTitle, - vcl::Window* pParentWindow, + DeckTitleBar(const OUString& rsTitle, vcl::Window* pParentWindow, const std::function<void()>& rCloserAction); virtual void dispose() override; virtual ~DeckTitleBar() override; - virtual void SetTitle (const OUString& rsTitle) override; + virtual void SetTitle(const OUString& rsTitle) override; virtual OUString GetTitle() const override; void SetCloserVisible(const bool bIsCloserVisible); diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx index 386f3fdc3f23..6c826d2c3067 100644 --- a/sfx2/inc/strings.hxx +++ b/sfx2/inc/strings.hxx @@ -14,15 +14,15 @@ // Do not translate STR_TEMPLATE_NAME*_DEF names!! // STR_TEMPLATE_NAME*_DEF strings must EXACTLY fit dc:title tag in meta.xml of each template file -#define STR_TEMPLATE_NAME1_DEF "Alizarin" -#define STR_TEMPLATE_NAME2_DEF "Beehive" -#define STR_TEMPLATE_NAME3_DEF "Blue Curve" -#define STR_TEMPLATE_NAME4_DEF "Blueprint Plans" -#define STR_TEMPLATE_NAME5_DEF "Bright Blue" -#define STR_TEMPLATE_NAME6_DEF "Classy Red" -#define STR_TEMPLATE_NAME7_DEF "DNA" -#define STR_TEMPLATE_NAME8_DEF "Focus" -#define STR_TEMPLATE_NAME9_DEF "Forestbird" +#define STR_TEMPLATE_NAME1_DEF "Alizarin" +#define STR_TEMPLATE_NAME2_DEF "Beehive" +#define STR_TEMPLATE_NAME3_DEF "Blue Curve" +#define STR_TEMPLATE_NAME4_DEF "Blueprint Plans" +#define STR_TEMPLATE_NAME5_DEF "Bright Blue" +#define STR_TEMPLATE_NAME6_DEF "Classy Red" +#define STR_TEMPLATE_NAME7_DEF "DNA" +#define STR_TEMPLATE_NAME8_DEF "Focus" +#define STR_TEMPLATE_NAME9_DEF "Forestbird" #define STR_TEMPLATE_NAME10_DEF "Impress" #define STR_TEMPLATE_NAME11_DEF "Inspiration" #define STR_TEMPLATE_NAME12_DEF "Lights" @@ -47,11 +47,11 @@ #define STR_TEMPLATE_NAME31_DEF "Simple" #define STR_TEMPLATE_NAME32_DEF "BPMN" -#define CMIS_TYPE_STRING "String" -#define CMIS_TYPE_INTEGER "Integer" -#define CMIS_TYPE_DECIMAL "Decimal" -#define CMIS_TYPE_DATETIME "Datetime" -#define CMIS_TYPE_BOOL "Bool" +#define CMIS_TYPE_STRING "String" +#define CMIS_TYPE_INTEGER "Integer" +#define CMIS_TYPE_DECIMAL "Decimal" +#define CMIS_TYPE_DATETIME "Datetime" +#define CMIS_TYPE_BOOL "Bool" #endif diff --git a/sfx2/inc/templatecontaineritem.hxx b/sfx2/inc/templatecontaineritem.hxx index e11e2bd215a6..019c1b909762 100644 --- a/sfx2/inc/templatecontaineritem.hxx +++ b/sfx2/inc/templatecontaineritem.hxx @@ -19,9 +19,9 @@ public: OUString maTitle; std::vector<TemplateItemProperties> maTemplates; - TemplateContainerItem (sal_uInt16 nId); + TemplateContainerItem(sal_uInt16 nId); - ~TemplateContainerItem (); + ~TemplateContainerItem(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/templatedefaultview.hxx b/sfx2/inc/templatedefaultview.hxx index 3e6a46e99cf7..e53910044176 100644 --- a/sfx2/inc/templatedefaultview.hxx +++ b/sfx2/inc/templatedefaultview.hxx @@ -17,11 +17,11 @@ public: TemplateDefaultView(std::unique_ptr<weld::ScrolledWindow> xWindow, std::unique_ptr<weld::Menu> xMenu); - virtual void showAllTemplates () override; + virtual void showAllTemplates() override; - virtual bool KeyInput( const KeyEvent& rKEvt ) override; + virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; void createContextMenu(); }; |