loplugin:staticmethods: svx

Change-Id: If03d9797fddd88662cf7d0ba2a70c2841983b37b
This commit is contained in:
Stephan Bergmann
2016-10-07 11:59:50 +02:00
parent b9589f237b
commit 358d88d08b
18 changed files with 31 additions and 31 deletions

View File

@@ -199,7 +199,7 @@ private:
SVX_DLLPRIVATE void Construct(); SVX_DLLPRIVATE void Construct();
SVX_DLLPRIVATE void Reset(); SVX_DLLPRIVATE void Reset();
SVX_DLLPRIVATE bool LBSelectColor( ColorLB* pLb, const Color& rColor ); SVX_DLLPRIVATE static bool LBSelectColor( ColorLB* pLb, const Color& rColor );
SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn ); SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn );
SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = nullptr ); SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = nullptr );

View File

@@ -41,8 +41,8 @@ private:
SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground); SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground);
SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext) override; SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext) override;
SVX_DLLPRIVATE void Init (); SVX_DLLPRIVATE void Init ();
SVX_DLLPRIVATE void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); SVX_DLLPRIVATE static void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
public: public:
SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId); SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId);

View File

@@ -104,7 +104,7 @@ private:
return i; return i;
return size_t(-1); return size_t(-1);
} }
SAL_DLLPRIVATE INetURLObject ImplGetURL( const GalleryObject* pObject ) const; SAL_DLLPRIVATE static INetURLObject ImplGetURL( const GalleryObject* pObject );
SAL_DLLPRIVATE INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDataFormat nFormat = ConvertDataFormat::Unknown ); SAL_DLLPRIVATE INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDataFormat nFormat = ConvertDataFormat::Unknown );
SAL_DLLPRIVATE void ImplSetModified( bool bModified ); SAL_DLLPRIVATE void ImplSetModified( bool bModified );
SAL_DLLPRIVATE void ImplBroadcast( sal_uIntPtr nUpdatePos ); SAL_DLLPRIVATE void ImplBroadcast( sal_uIntPtr nUpdatePos );

View File

@@ -215,8 +215,8 @@ private:
SVX_DLLPRIVATE void GetPreviewString_Impl( OUString& rString, SVX_DLLPRIVATE void GetPreviewString_Impl( OUString& rString,
Color*& rpColor ); Color*& rpColor );
SVX_DLLPRIVATE void PosToCategory_Impl(sal_uInt16 nPos, short& rCategory) const; SVX_DLLPRIVATE static void PosToCategory_Impl(sal_uInt16 nPos, short& rCategory);
SVX_DLLPRIVATE void CategoryToPos_Impl(short nCategory, sal_uInt16& rPos) const; SVX_DLLPRIVATE static void CategoryToPos_Impl(short nCategory, sal_uInt16& rPos);
}; };
#endif #endif

View File

@@ -260,7 +260,7 @@ private:
// help functions // help functions
SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol); SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol);
SVX_DLLPRIVATE Color GetLuminance(const Color& rCol); SVX_DLLPRIVATE static Color GetLuminance(const Color& rCol);
SVX_DLLPRIVATE void CallColorChangeLink(); SVX_DLLPRIVATE void CallColorChangeLink();
public: public:

View File

@@ -66,11 +66,11 @@ private:
private: private:
SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const; SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const;
SVX_DLLPRIVATE void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const; SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const; SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const; SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const; SVX_DLLPRIVATE static void ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const; SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpRecalcTail(); SVX_DLLPRIVATE void ImpRecalcTail();
public: public:

View File

@@ -56,7 +56,7 @@ protected:
long nEndAngle; long nEndAngle;
private: private:
SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind eKind, const Rectangle& rRect1, long nStart, long nEnd) const; SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind eKind, const Rectangle& rRect1, long nStart, long nEnd) const;
SVX_DLLPRIVATE void ImpSetCreateParams(SdrDragStat& rStat) const; SVX_DLLPRIVATE static void ImpSetCreateParams(SdrDragStat& rStat);
SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool
SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool

View File

@@ -63,7 +63,7 @@ private:
SvXMLGraphicHelperMode meCreateMode; SvXMLGraphicHelperMode meCreateMode;
bool mbDirect; bool mbDirect;
SVX_DLLPRIVATE bool ImplGetStreamNames( const OUString& rURLStr, SVX_DLLPRIVATE static bool ImplGetStreamNames( const OUString& rURLStr,
OUString& rPictureStorageName, OUString& rPictureStorageName,
OUString& rPictureStreamName ); OUString& rPictureStreamName );
SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage > SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage >
@@ -71,7 +71,7 @@ private:
SVX_DLLPRIVATE SvxGraphicHelperStream_Impl SVX_DLLPRIVATE SvxGraphicHelperStream_Impl
ImplGetGraphicStream( const OUString& rPictureStorageName, ImplGetGraphicStream( const OUString& rPictureStorageName,
const OUString& rPictureStreamName ); const OUString& rPictureStreamName );
SVX_DLLPRIVATE OUString ImplGetGraphicMimeType( const OUString& rFileName ) const; SVX_DLLPRIVATE static OUString ImplGetGraphicMimeType( const OUString& rFileName );
SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName, SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName,
const OUString& rPictureStreamName ); const OUString& rPictureStreamName );
SVX_DLLPRIVATE bool ImplWriteGraphic( const OUString& rPictureStorageName, SVX_DLLPRIVATE bool ImplWriteGraphic( const OUString& rPictureStorageName,

View File

@@ -77,7 +77,7 @@ namespace svxform
} }
OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId )
{ {
OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ), OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
"FormToolboxes::getToolboxResourceName: unsupported slot!" ); "FormToolboxes::getToolboxResourceName: unsupported slot!" );

View File

@@ -226,7 +226,7 @@ const GalleryObject* GalleryTheme::ImplGetGalleryObject( const INetURLObject& rU
return nullptr; return nullptr;
} }
INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject )
{ {
INetURLObject aURL; INetURLObject aURL;

View File

@@ -44,8 +44,8 @@ namespace svxform
/** retrieves the URI for the toolbox associated with the given slot, depending /** retrieves the URI for the toolbox associated with the given slot, depending
on the type of our document on the type of our document
*/ */
SVX_DLLPUBLIC OUString SVX_DLLPUBLIC static OUString
getToolboxResourceName( sal_uInt16 _nSlotId ) const; getToolboxResourceName( sal_uInt16 _nSlotId );
/** toggles the toolbox associated with the given slot /** toggles the toolbox associated with the given slot
*/ */

View File

@@ -1154,7 +1154,7 @@ bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey )
} }
// Konvertierungs-Routinen: // Konvertierungs-Routinen:
void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short& rCategory) const void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short& rCategory)
{ {
// Kategorie css::form-Positionen abbilden (->Resource) // Kategorie css::form-Positionen abbilden (->Resource)
switch ( nPos ) switch ( nPos )
@@ -1174,7 +1174,7 @@ void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short& rCategory)
} }
} }
void SvxNumberFormatShell::CategoryToPos_Impl(short nCategory, sal_uInt16& rPos) const void SvxNumberFormatShell::CategoryToPos_Impl(short nCategory, sal_uInt16& rPos)
{ {
// Kategorie auf css::form-Positionen abbilden (->Resource) // Kategorie auf css::form-Positionen abbilden (->Resource)
switch ( nCategory ) switch ( nCategory )

View File

@@ -449,7 +449,7 @@ void SdrCaptionObj::ImpRecalcTail()
// tail end pos for SdrCaptionType::Type1. This sure was the simplest method // tail end pos for SdrCaptionType::Type1. This sure was the simplest method
// to achieve this, at the cost of making a whole group of const methods // to achieve this, at the cost of making a whole group of const methods
// of this object implicitly change the object's position. // of this object implicitly change the object's position.
void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
{ {
tools::Polygon aPol(2); tools::Polygon aPol(2);
Point aTl(rPoly[0]); Point aTl(rPoly[0]);
@@ -475,7 +475,7 @@ void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPo
rPoly = aPol; rPoly = aPol;
} }
void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
{ // Gap/EscDir/EscPos/Angle { // Gap/EscDir/EscPos/Angle
tools::Polygon aPol(2); tools::Polygon aPol(2);
Point aTl(rPoly[0]); Point aTl(rPoly[0]);
@@ -492,7 +492,7 @@ void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPo
rPoly=aPol; rPoly=aPol;
} }
void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
{ // Gap/EscDir/EscPos/Angle/LineLen { // Gap/EscDir/EscPos/Angle/LineLen
tools::Polygon aPol(3); tools::Polygon aPol(3);
Point aTl(rPoly[0]); Point aTl(rPoly[0]);
@@ -525,12 +525,12 @@ void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPo
rPoly=aPol; rPoly=aPol;
} }
void SdrCaptionObj::ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const void SdrCaptionObj::ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
{ {
ImpCalcTail3(rPara,rPoly,rRect); ImpCalcTail3(rPara,rPoly,rRect);
} }
void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
{ {
switch (rPara.eType) { switch (rPara.eType) {
case SdrCaptionType::Type1: ImpCalcTail1(rPara,rPoly,rRect); break; case SdrCaptionType::Type1: ImpCalcTail1(rPara,rPoly,rRect); break;

View File

@@ -663,7 +663,7 @@ void ImpCircUser::SetCreateParams(SdrDragStat& rStat)
} else aP2=aCenter; } else aP2=aCenter;
} }
void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) const void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat)
{ {
ImpCircUser* pU=static_cast<ImpCircUser*>(rStat.GetUser()); ImpCircUser* pU=static_cast<ImpCircUser*>(rStat.GetUser());
if (pU==nullptr) { if (pU==nullptr) {

View File

@@ -195,7 +195,7 @@ protected:
SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override; SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override;
SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem) override; SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem) override;
SVX_DLLPRIVATE css::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ); SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap );
private: private:
SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException); SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException);

View File

@@ -458,7 +458,7 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt
return aRet; return aRet;
} }
OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName ) const OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName )
{ {
struct XMLGraphicMimeTypeMapper struct XMLGraphicMimeTypeMapper
{ {

View File

@@ -521,7 +521,7 @@ SvxXMLBitmapEntryExporter::~SvxXMLBitmapEntryExporter()
void SvxXMLBitmapEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue ) void SvxXMLBitmapEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue )
{ {
maImageStyle.exportXML( rStrName, rValue, mrExport ); XMLImageStyle::exportXML( rStrName, rValue, mrExport );
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@@ -301,7 +301,7 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r
try try
{ {
XMLImageStyle aImageStyle; XMLImageStyle aImageStyle;
aImageStyle.importXML( xAttrList, rAny, rName, GetImport() ); XMLImageStyle::importXML( xAttrList, rAny, rName, GetImport() );
} }
catch (const Exception&) catch (const Exception&)
{ {