From f198072e38f6e3f6a52d9b8662c04b63d2a51fc3 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Thu, 20 Aug 2026 12:28:47 +0200 Subject: [PATCH] formula: clang-format parawin.hxx This in particular gets rid of an extra indentation level. Change-Id: Ie7b1b80be12e70266081fa2da284a4bae2b25a08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209389 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- formula/source/ui/dlg/parawin.hxx | 153 +++++++++++++++--------------- solenv/clang-format/excludelist | 1 - 2 files changed, 75 insertions(+), 79 deletions(-) diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index e5a5641858db..e0a956eb1c8c 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -32,7 +32,6 @@ namespace formula { - #define NOT_FOUND 0xffff class IFunctionDescription; @@ -41,111 +40,109 @@ class IControlReferenceHandler; class ParaWin { private: - Link aFxLink; - Link aArgModifiedLink; + Link aFxLink; + Link aArgModifiedLink; - ::std::vector aVisibleArgMapping; - const IFunctionDescription* pFuncDesc; - IControlReferenceHandler* pMyParent; - sal_uInt16 nArgs; // unsuppressed arguments, may be >= VAR_ARGS to indicate repeating parameters - sal_uInt16 nMaxArgs; // max arguments, limited to supported number of arguments - vcl::Font aFntBold; - vcl::Font aFntLight; + ::std::vector aVisibleArgMapping; + const IFunctionDescription* pFuncDesc; + IControlReferenceHandler* pMyParent; + sal_uInt16 nArgs; // unsuppressed arguments, may be >= VAR_ARGS to indicate repeating parameters + sal_uInt16 nMaxArgs; // max arguments, limited to supported number of arguments + vcl::Font aFntBold; + vcl::Font aFntLight; - OUString m_sOptional; - OUString m_sRequired; + OUString m_sOptional; + OUString m_sRequired; - sal_uInt16 nEdFocus; - sal_uInt16 nActiveLine; + sal_uInt16 nEdFocus; + sal_uInt16 nActiveLine; - ArgInput aArgInput[4]; - OUString aDefaultString; - ::std::vector aParaArray; + ArgInput aArgInput[4]; + OUString aDefaultString; + ::std::vector aParaArray; - std::unique_ptr m_xBuilder; - std::unique_ptr m_xContainer; + std::unique_ptr m_xBuilder; + std::unique_ptr m_xContainer; - std::unique_ptr m_xSlider; - std::unique_ptr m_xParamGrid; - std::unique_ptr m_xGrid; + std::unique_ptr m_xSlider; + std::unique_ptr m_xParamGrid; + std::unique_ptr m_xGrid; - std::unique_ptr m_xFtEditDesc; - std::unique_ptr m_xFtArgName; - std::unique_ptr m_xFtArgDesc; + std::unique_ptr m_xFtEditDesc; + std::unique_ptr m_xFtArgName; + std::unique_ptr m_xFtArgDesc; - std::unique_ptr m_xBtnFx1; - std::unique_ptr m_xBtnFx2; - std::unique_ptr m_xBtnFx3; - std::unique_ptr m_xBtnFx4; + std::unique_ptr m_xBtnFx1; + std::unique_ptr m_xBtnFx2; + std::unique_ptr m_xBtnFx3; + std::unique_ptr m_xBtnFx4; - std::unique_ptr m_xFtArg1; - std::unique_ptr m_xFtArg2; - std::unique_ptr m_xFtArg3; - std::unique_ptr m_xFtArg4; + std::unique_ptr m_xFtArg1; + std::unique_ptr m_xFtArg2; + std::unique_ptr m_xFtArg3; + std::unique_ptr m_xFtArg4; - std::unique_ptr m_xEdArg1; - std::unique_ptr m_xEdArg2; - std::unique_ptr m_xEdArg3; - std::unique_ptr m_xEdArg4; + std::unique_ptr m_xEdArg1; + std::unique_ptr m_xEdArg2; + std::unique_ptr m_xEdArg3; + std::unique_ptr m_xEdArg4; - std::unique_ptr m_xRefBtn1; - std::unique_ptr m_xRefBtn2; - std::unique_ptr m_xRefBtn3; - std::unique_ptr m_xRefBtn4; + std::unique_ptr m_xRefBtn1; + std::unique_ptr m_xRefBtn2; + std::unique_ptr m_xRefBtn3; + std::unique_ptr m_xRefBtn4; - DECL_LINK( ScrollHdl, weld::ScrolledWindow&, void); - DECL_LINK( ModifyHdl, ArgInput&, void ); - DECL_LINK( GetEdFocusHdl, ArgInput&, void ); - DECL_LINK( GetFxFocusHdl, ArgInput&, void ); - DECL_LINK( GetFxHdl, ArgInput&, void ); + DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void); + DECL_LINK(ModifyHdl, ArgInput&, void); + DECL_LINK(GetEdFocusHdl, ArgInput&, void); + DECL_LINK(GetFxFocusHdl, ArgInput&, void); + DECL_LINK(GetFxHdl, ArgInput&, void); - void ArgumentModified(); + void ArgumentModified(); - void InitArgInput(sal_uInt16 nPos, weld::Label& rFtArg, weld::Button& rBtnFx, - ArgEdit& rEdArg, RefButton& rRefBtn); + void InitArgInput(sal_uInt16 nPos, weld::Label& rFtArg, weld::Button& rBtnFx, ArgEdit& rEdArg, + RefButton& rRefBtn); - void SetArgumentDesc(const OUString& aText); - void SetArgumentText(const OUString& aText); + void SetArgumentDesc(const OUString& aText); + void SetArgumentText(const OUString& aText); + void SetArgName(sal_uInt16 no, const OUString& aArg); + void SetArgNameFont(sal_uInt16 no, const vcl::Font&); - void SetArgName (sal_uInt16 no,const OUString &aArg); - void SetArgNameFont (sal_uInt16 no,const vcl::Font&); - - void UpdateArgDesc( sal_uInt16 nArg ); - void UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ); + void UpdateArgDesc(sal_uInt16 nArg); + void UpdateArgInput(sal_uInt16 nOffset, sal_uInt16 i); public: - ParaWin(weld::Container* pParent, IControlReferenceHandler* _pDlg); - ~ParaWin(); + ParaWin(weld::Container* pParent, IControlReferenceHandler* _pDlg); + ~ParaWin(); - void SetFunctionDesc(const IFunctionDescription* pFDesc); - void SetArgumentOffset(sal_uInt16 nOffset); - void SetEditDesc(const OUString& aText); - void UpdateParas(); - void ClearAll(); + void SetFunctionDesc(const IFunctionDescription* pFDesc); + void SetArgumentOffset(sal_uInt16 nOffset); + void SetEditDesc(const OUString& aText); + void UpdateParas(); + void ClearAll(); - sal_uInt16 GetActiveLine() const { return nActiveLine;} - void SetActiveLine(sal_uInt16 no); - RefEdit* GetActiveEdit(); - OUString GetActiveArgName() const; + sal_uInt16 GetActiveLine() const { return nActiveLine; } + void SetActiveLine(sal_uInt16 no); + RefEdit* GetActiveEdit(); + OUString GetActiveArgName() const; - OUString GetArgument(sal_uInt16 no); - void SetArgument(sal_uInt16 no, std::u16string_view aString); - void SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont); + OUString GetArgument(sal_uInt16 no); + void SetArgument(sal_uInt16 no, std::u16string_view aString); + void SetArgumentFonts(const vcl::Font& aBoldFont, const vcl::Font& aLightFont); - void SetEdFocus(); // visible edit lines - sal_uInt16 GetSliderPos() const; - void SetSliderPos(sal_uInt16 nSliderPos); + void SetEdFocus(); // visible edit lines + sal_uInt16 GetSliderPos() const; + void SetSliderPos(sal_uInt16 nSliderPos); - void SetArgModifiedHdl( const Link& rLink ) { aArgModifiedLink = rLink; } - void SetFxHdl( const Link& rLink ) { aFxLink = rLink; } + void SetArgModifiedHdl(const Link& rLink) { aArgModifiedLink = rLink; } + void SetFxHdl(const Link& rLink) { aFxLink = rLink; } - void SliderMoved(); + void SliderMoved(); - void Show() { m_xContainer->show(); } + void Show() { m_xContainer->show(); } }; - } // formula /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 8e8725ff7d09..a7a2557cc48a 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3954,7 +3954,6 @@ formula/source/ui/dlg/formula.cxx formula/source/ui/dlg/funcpage.hxx formula/source/ui/dlg/funcutl.cxx formula/source/ui/dlg/parawin.cxx -formula/source/ui/dlg/parawin.hxx formula/source/ui/dlg/structpg.cxx formula/source/ui/dlg/structpg.hxx fpicker/source/aqua/ControlHelper.hxx