diff options
Diffstat (limited to 'include/svx/sidebar')
-rw-r--r-- | include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 8 | ||||
-rw-r--r-- | include/svx/sidebar/LinePropertyPanelBase.hxx | 18 | ||||
-rw-r--r-- | include/svx/sidebar/LineWidthPopup.hxx | 10 | ||||
-rw-r--r-- | include/svx/sidebar/ValueSetWithTextControl.hxx | 12 |
4 files changed, 21 insertions, 27 deletions
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 29e6b4f841a1..2f5dcedec5c6 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -23,8 +23,8 @@ class XFillFloatTransparenceItem; -namespace svx::sidebar { - +namespace svx::sidebar +{ class AreaTransparencyGradientControl; class AreaPropertyPanelBase; @@ -45,7 +45,7 @@ private: std::unique_ptr<weld::MetricSpinButton> mxMtrTrgrEndValue; std::unique_ptr<weld::MetricSpinButton> mxMtrTrgrBorder; - void InitStatus(XFillFloatTransparenceItem const * pGradientItem); + void InitStatus(XFillFloatTransparenceItem const* pGradientItem); void ExecuteValueModify(sal_uInt8 nStartCol, sal_uInt8 nEndCol); DECL_LINK(ModifiedTrgrHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(Left_Click45_Impl, const OString&, void); @@ -58,7 +58,7 @@ public: weld::Container* getTopLevel() const { return mxTopLevel.get(); } - void Rearrange(XFillFloatTransparenceItem const * pItem); + void Rearrange(XFillFloatTransparenceItem const* pItem); }; } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 0442510d7537..1905e66d7c2c 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -40,7 +40,6 @@ class XDashList; namespace svx::sidebar { - class DisableArrowsWrapper; class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout @@ -56,9 +55,8 @@ public: void EndLineWidthPopup(); // constructor/destructor - LinePropertyPanelBase( - vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + LinePropertyPanelBase(vcl::Window* pParent, + const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual void setLineWidth(const XLineWidthItem& rItem) = 0; @@ -72,7 +70,6 @@ public: } protected: - void ActivateControls(); virtual void setLineTransparency(const XLineTransparenceItem& rItem) = 0; @@ -90,7 +87,6 @@ protected: void disableArrowHead(); protected: - std::unique_ptr<weld::Toolbar> mxTBColor; std::unique_ptr<ToolbarUnoDispatcher> mxColorDispatch; @@ -114,9 +110,9 @@ private: std::unique_ptr<DisableArrowsWrapper> mxDisableArrowsWrapper; - sal_uInt16 mnTrans; - MapUnit meMapUnit; - sal_Int32 mnWidthCoreValue; + sal_uInt16 mnTrans; + MapUnit meMapUnit; + sal_Int32 mnWidthCoreValue; // images from resource OUString maIMGNone; @@ -124,14 +120,14 @@ private: // multi-images OUString maIMGWidthIcon[8]; - bool mbWidthValuable : 1; + bool mbWidthValuable : 1; bool mbArrowSupported; bool mbNoneLineStyle; void Initialize(); DECL_LINK(ToolboxWidthSelectHdl, const OString&, void); - DECL_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void ); + DECL_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void); DECL_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void); DECL_LINK(ChangeCapStyleHdl, weld::ComboBox&, void); }; diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index 718ff68ce24a..d16f49b60389 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -27,8 +27,8 @@ class ValueSet; -namespace svx::sidebar { - +namespace svx::sidebar +{ class LinePropertyPanelBase; class LineWidthValueSet; @@ -38,19 +38,19 @@ public: LineWidthPopup(weld::Widget* pParent, LinePropertyPanelBase& rParent); ~LineWidthPopup(); - void SetWidthSelect (tools::Long lValue, bool bValuable, MapUnit eMapUnit); + void SetWidthSelect(tools::Long lValue, bool bValuable, MapUnit eMapUnit); weld::Container* getTopLevel() const { return m_xTopLevel.get(); } private: LinePropertyPanelBase& m_rParent; - std::array<OUString,9> maStrUnits; + std::array<OUString, 9> maStrUnits; OUString m_sPt; MapUnit m_eMapUnit; bool m_bVSFocus; bool m_bCustom; tools::Long m_nCustomWidth; - Image m_aIMGCus; + Image m_aIMGCus; Image m_aIMGCusGray; std::unique_ptr<weld::Builder> m_xBuilder; diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 5dd075a28458..e45649b17624 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -25,8 +25,8 @@ #include <vector> -namespace svx::sidebar { - +namespace svx::sidebar +{ /** Specialization of class <ValueSet>. This specialization allows is a one-columned ValueSet which allow items containing an image and a text or a text and a second text. @@ -40,11 +40,9 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - void AddItem( - const OUString& rItemText, - const OUString& rItemText2 ); + void AddItem(const OUString& rItemText, const OUString& rItemText2); - virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; + virtual void UserDraw(const UserDrawEvent& rUDEvt) override; private: struct ValueSetWithTextItem @@ -53,7 +51,7 @@ private: OUString maItemText2; }; - ::std::vector< ValueSetWithTextItem > maItems; + ::std::vector<ValueSetWithTextItem> maItems; }; } // end of namespace svx::sidebar |