diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/ClassificationDialog.hxx | 2 | ||||
-rw-r--r-- | include/svx/charmap.hxx | 2 | ||||
-rw-r--r-- | include/svx/dlgctrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/fntctrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/hexcolorcontrol.hxx | 2 | ||||
-rw-r--r-- | include/svx/pagectrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdgmoitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdtaditm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdtaitm.hxx | 4 | ||||
-rw-r--r-- | include/svx/sdtakitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdtfsitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sxcecitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sxctitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sxekitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sxmtpitm.hxx | 4 | ||||
-rw-r--r-- | include/svx/sxmuitm.hxx | 2 |
16 files changed, 18 insertions, 18 deletions
diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 607f6565bdbc..3efa8fbc7a8b 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -69,7 +69,7 @@ private: DECL_LINK(SelectRecentlyUsedHdl, ListBox&, void); DECL_LINK(SelectIPPartHdl, ListBox&, void); DECL_LINK(EditWindowModifiedHdl, LinkParamNone*, void); - DECL_LINK(ExpandedHdl, VclExpander&, void); + DECL_STATIC_LINK(ClassificationDialog, ExpandedHdl, VclExpander&, void); void insertField(ClassificationType eType, OUString const & rString, OUString const & rFullString, OUString const & rIdentifier = OUString()); void insertCategoryField(sal_Int32 nID); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 6871aae3dea7..21f81b9bfb91 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -94,7 +94,7 @@ public: virtual void SelectIndex( int index, bool bFocus = false ); void OutputIndex( int index ); void DeSelect(); - void CopyToClipboard(const OUString& str); + static void CopyToClipboard(const OUString& str); bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } static sal_uInt16 GetRowPos(sal_uInt16 _nPos); diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 52c1f4f20ca7..64205752626e 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -79,7 +79,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRectCtl : public weld::CustomWidgetContro private: VclPtr<SvxTabPage> m_pPage; - SVX_DLLPRIVATE void InitSettings(vcl::RenderContext& rRenderContext); + SVX_DLLPRIVATE static void InitSettings(vcl::RenderContext& rRenderContext); SVX_DLLPRIVATE void InitRectBitmap(); SVX_DLLPRIVATE BitmapEx& GetRectBitmap(); SVX_DLLPRIVATE void Resize_Impl(const Size& rSize); diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index c122c98943d6..df12355ef42a 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -88,7 +88,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public weld::CustomWidgetCo private: std::unique_ptr<FontPrevWin_Impl> pImpl; - SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext); + SVX_DLLPRIVATE static void ApplySettings(vcl::RenderContext& rRenderContext); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; SVX_DLLPRIVATE static void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx index 675948751c75..91960d9f7f9b 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/svx/hexcolorcontrol.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC HexColorControl private: std::unique_ptr<weld::Entry> m_xEntry; - DECL_LINK(ImplProcessInputHdl, OUString&, bool); + DECL_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, bool); public: HexColorControl(std::unique_ptr<weld::Entry> pEdit); diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index 22cd0576a23c..3da3950ec9ef 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -71,7 +71,7 @@ protected: virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, const bool bEnabled); - void drawFillAttributes(vcl::RenderContext& rRenderContext, + static void drawFillAttributes(vcl::RenderContext& rRenderContext, const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes, const tools::Rectangle& rPaintRange, const tools::Rectangle& rDefineRange); diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 3ce9d7d581c0..d070868b432b 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -40,7 +40,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; - OUString GetValueTextByPos( sal_uInt16 nPos ) const; + static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 7a0b939e4fa0..f786fd1681b6 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -41,7 +41,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index c56952cbf86a..823812b50194 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -43,7 +43,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; @@ -67,7 +67,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 09f990abcb9a..bfe0129a48a7 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -85,7 +85,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 939e2ab9cdc9..ac5b71cec722 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -44,7 +44,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual bool HasBoolValue() const override; virtual bool GetBoolValue() const override; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 3f5d980b86af..d3617f94bbd6 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 3; } - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 9ca7f5be2a8e..72db35e6f911 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -33,7 +33,7 @@ public: SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index b779dedf029e..bfb5b60299f9 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -38,7 +38,7 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index d16605ba17c4..22ad0ed12494 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; @@ -55,7 +55,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 3d62f15320b5..52c6e826be28 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -35,7 +35,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - OUString GetValueTextByPos(sal_uInt16 nPos) const; + static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; |