diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:19:58 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-11-16 11:42:31 +0100 |
commit | 69397a13d9458174ea3d0160cb65d77ac83c205c (patch) | |
tree | 5511df93af26e29d91db5ce7934d76b6a1be55fe /svx/source/inc | |
parent | 81a11c6f1c2caec8c177cb4e061631561a4d102e (diff) |
tdf#123936 Formatting files in module svx with clang-format
Change-Id: I482a00c9f65fd08be03f101c0e18f044c9323137
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105716
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx/source/inc')
-rw-r--r-- | svx/source/inc/celltypes.hxx | 36 | ||||
-rw-r--r-- | svx/source/inc/fmslotinvalidator.hxx | 3 | ||||
-rw-r--r-- | svx/source/inc/tbxform.hxx | 35 |
3 files changed, 34 insertions, 40 deletions
diff --git a/svx/source/inc/celltypes.hxx b/svx/source/inc/celltypes.hxx index 7f8a9d87fc4c..39edf2c5a81e 100644 --- a/svx/source/inc/celltypes.hxx +++ b/svx/source/inc/celltypes.hxx @@ -23,21 +23,21 @@ #include <rtl/ref.hxx> #include <vector> -namespace sdr::table { - +namespace sdr::table +{ class Cell; class TableModel; class TableRow; class TableColumn; class TableRows; class TableColumns; -typedef rtl::Reference< Cell > CellRef; -typedef rtl::Reference< TableModel > TableModelRef; -typedef rtl::Reference< TableRow > TableRowRef; -typedef rtl::Reference< TableColumn > TableColumnRef; -typedef std::vector< CellRef > CellVector; -typedef std::vector< TableRowRef > RowVector; -typedef std::vector< TableColumnRef > ColumnVector; +typedef rtl::Reference<Cell> CellRef; +typedef rtl::Reference<TableModel> TableModelRef; +typedef rtl::Reference<TableRow> TableRowRef; +typedef rtl::Reference<TableColumn> TableColumnRef; +typedef std::vector<CellRef> CellVector; +typedef std::vector<TableRowRef> RowVector; +typedef std::vector<TableColumnRef> ColumnVector; class TableDesignUser { @@ -48,37 +48,36 @@ protected: ~TableDesignUser() {} }; -template< typename T > -class RangeIterator +template <typename T> class RangeIterator { public: /** creates an iterator from rStart (including) to rEnd (excluding) if bForward is true or from nEnd (excluding to nStart (including). rStart must be <= rEnd. */ - RangeIterator( const T& rStart, const T& rEnd, bool bForward ) + RangeIterator(const T& rStart, const T& rEnd, bool bForward) { - if( bForward ) + if (bForward) { maIter = rStart; maEnd = rEnd; } else { - maIter = rEnd-1; - maEnd = rStart-1; + maIter = rEnd - 1; + maEnd = rStart - 1; } } /* iterates in the configured direction and returns true if rValue now contains a valid position in the range of this iterator */ - bool next( T& rValue ) + bool next(T& rValue) { - if( maIter == maEnd ) + if (maIter == maEnd) return false; rValue = maIter; - if( maIter < maEnd ) + if (maIter < maEnd) ++maIter; else --maIter; @@ -89,7 +88,6 @@ private: T maEnd; T maIter; }; - } #endif diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx index aa000a4eac60..4027b63fa757 100644 --- a/svx/source/inc/fmslotinvalidator.hxx +++ b/svx/source/inc/fmslotinvalidator.hxx @@ -24,10 +24,9 @@ namespace svx { - typedef sal_uInt16 SfxSlotId; +typedef sal_uInt16 SfxSlotId; } #endif // INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index cd8f7e037502..0850082ab55a 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -25,12 +25,12 @@ class SvxFmAbsRecWin final : public RecordItemWindow { public: - SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController ); + SvxFmAbsRecWin(vcl::Window* _pParent, SfxToolBoxControl* _pController); private: virtual void PositionFired(sal_Int64 nRecord) override; - SfxToolBoxControl* m_pController; + SfxToolBoxControl* m_pController; }; class SvxFmTbxCtlAbsRec : public SfxToolBoxControl @@ -38,13 +38,13 @@ class SvxFmTbxCtlAbsRec : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); + SvxFmTbxCtlAbsRec(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); virtual ~SvxFmTbxCtlAbsRec() override; - virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; }; class SvxFmTbxCtlRecText : public SfxToolBoxControl @@ -52,10 +52,10 @@ class SvxFmTbxCtlRecText : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); + SvxFmTbxCtlRecText(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); virtual ~SvxFmTbxCtlRecText() override; - virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; }; class SvxFmTbxCtlRecFromText : public SfxToolBoxControl @@ -63,10 +63,10 @@ class SvxFmTbxCtlRecFromText : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); + SvxFmTbxCtlRecFromText(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); virtual ~SvxFmTbxCtlRecFromText() override; - virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; }; class LabelItemWindow; @@ -78,31 +78,28 @@ class SvxFmTbxCtlRecTotal : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); + SvxFmTbxCtlRecTotal(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); virtual ~SvxFmTbxCtlRecTotal() override; - virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window* pParent ) override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; }; - class SvxFmTbxNextRec : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); + SvxFmTbxNextRec(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); }; - class SvxFmTbxPrevRec : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); + SvxFmTbxPrevRec(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |