Kaydet (Commit) 8c4c1abc authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:staticmethods in svx

Change-Id: I94df3aa40fa79877ccebf1ed8709bd7cc47748d9
Reviewed-on: https://gerrit.libreoffice.org/63398
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4ddd6f32
......@@ -415,7 +415,7 @@ void SvxConnectionPage::FillTypeLB()
const sal_uInt16 nCount = pEdgeKindItem->GetValueCount();
for (sal_uInt16 i = 0; i < nCount; i++)
{
OUString aStr = pEdgeKindItem->GetValueTextByPos(i);
OUString aStr = SdrEdgeKindItem::GetValueTextByPos(i);
m_xLbType->append_text(aStr);
}
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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,
......
......@@ -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;
};
......
......@@ -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;
};
......
......@@ -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;
};
......
......@@ -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;
......
......@@ -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;
};
......
......@@ -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;
};
......
......@@ -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;
};
......
......@@ -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;
};
......
......@@ -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;
};
......
......@@ -36,7 +36,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;
};
......
......@@ -36,7 +36,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;
};
......
......@@ -697,7 +697,7 @@ IMPL_LINK_NOARG(ClassificationDialog, EditWindowModifiedHdl, LinkParamNone*, voi
toggleWidgetsDependingOnCategory();
}
IMPL_LINK(ClassificationDialog, ExpandedHdl, VclExpander&, rExpander, void)
IMPL_STATIC_LINK(ClassificationDialog, ExpandedHdl, VclExpander&, rExpander, void)
{
std::shared_ptr<comphelper::ConfigurationChanges> aConfigurationChanges(comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::set(rExpander.get_expanded(), aConfigurationChanges);
......
......@@ -63,7 +63,7 @@ Color HexColorControl::GetColor()
return Color(nColor);
}
IMPL_LINK(HexColorControl, ImplProcessInputHdl, OUString&, rTest, bool)
IMPL_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, rTest, bool)
{
const sal_Unicode* pTest = rTest.getStr();
sal_Int32 nLen = rTest.getLength();
......
......@@ -884,7 +884,7 @@ SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; }
OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALCAPTIONTYPES[] =
{
......@@ -915,7 +915,7 @@ SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; }
OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALCAPTIONTYPES[] =
{
......@@ -952,7 +952,7 @@ SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALFITTISIZETYPES[] =
{
......@@ -1017,7 +1017,7 @@ SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; }
OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALTEXTVADJTYPES[] =
{
......@@ -1079,7 +1079,7 @@ SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALTEXTHADJTYPES[] =
{
......@@ -1134,7 +1134,7 @@ SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; }
OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALTEXTANITYPES[] =
{
......@@ -1188,7 +1188,7 @@ SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; }
OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALTEXTANITYPES[] =
{
......@@ -1357,7 +1357,7 @@ SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { r
sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; }
OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALEDGES[] =
{
......@@ -1528,7 +1528,7 @@ SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; }
OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALMEASURETYPES[] =
{
......@@ -1579,7 +1579,7 @@ SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALMEASURETEXTTYPES[] =
{
......@@ -1632,7 +1632,7 @@ SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALMEASURETEXTTYPES[] =
{
......@@ -1685,7 +1685,7 @@ SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const
sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; }
OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos)
{
OUString aRetval;
......@@ -1731,7 +1731,7 @@ SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { ret
sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; }
OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
static const char* ITEMVALCIRCTYPES[] =
{
......@@ -1881,7 +1881,7 @@ sal_uInt16 SdrGrafModeItem::GetValueCount() const
return 4;
}
OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos)
{
OUString aStr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment