summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/float3d.hxx2
-rw-r--r--include/svx/fntctrl.hxx4
-rw-r--r--include/svx/galtheme.hxx2
-rw-r--r--include/svx/numfmtsh.hxx4
-rw-r--r--include/svx/svdhdl.hxx2
-rw-r--r--include/svx/svdocapt.hxx10
-rw-r--r--include/svx/svdocirc.hxx2
-rw-r--r--include/svx/xmlgrhlp.hxx4
-rw-r--r--svx/source/form/formtoolbars.cxx2
-rw-r--r--svx/source/gallery2/galtheme.cxx2
-rw-r--r--svx/source/inc/formtoolbars.hxx4
-rw-r--r--svx/source/items/numfmtsh.cxx4
-rw-r--r--svx/source/svdraw/svdocapt.cxx10
-rw-r--r--svx/source/svdraw/svdocirc.cxx2
-rw-r--r--svx/source/table/cell.hxx2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx2
-rw-r--r--svx/source/xml/xmlxtexp.cxx2
-rw-r--r--svx/source/xml/xmlxtimp.cxx2
18 files changed, 31 insertions, 31 deletions
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index d385b1fdc8f2..c9a9f957701c 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -199,7 +199,7 @@ private:
SVX_DLLPRIVATE void Construct();
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 ColorLB* GetLbByButton( const PushButton* pBtn = nullptr );
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index ff26909bea8e..46e294feff8c 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -41,8 +41,8 @@ private:
SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground);
SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext) override;
SVX_DLLPRIVATE void Init ();
- SVX_DLLPRIVATE 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 SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
+ SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
public:
SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId);
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 6bf5ffbe1783..d1abb8be0cfd 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -104,7 +104,7 @@ private:
return i;
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 void ImplSetModified( bool bModified );
SAL_DLLPRIVATE void ImplBroadcast( sal_uIntPtr nUpdatePos );
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 68053d4d6af8..c8601d022953 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -215,8 +215,8 @@ private:
SVX_DLLPRIVATE void GetPreviewString_Impl( OUString& rString,
Color*& rpColor );
- SVX_DLLPRIVATE void PosToCategory_Impl(sal_uInt16 nPos, short& rCategory) const;
- SVX_DLLPRIVATE void CategoryToPos_Impl(short nCategory, sal_uInt16& rPos) const;
+ SVX_DLLPRIVATE static void PosToCategory_Impl(sal_uInt16 nPos, short& rCategory);
+ SVX_DLLPRIVATE static void CategoryToPos_Impl(short nCategory, sal_uInt16& rPos);
};
#endif
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 0a001b065bee..553237d596b0 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -260,7 +260,7 @@ private:
// help functions
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();
public:
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 6bbdbb8d417e..5cca473d9479 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -66,11 +66,11 @@ private:
private:
SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const;
- SVX_DLLPRIVATE void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
+ SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpRecalcTail();
public:
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index a713586ad70f..fc640860ec23 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -56,7 +56,7 @@ protected:
long nEndAngle;
private:
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 ImpSetCircInfoToAttr(); // copy values into pool
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 64b8e4929222..c2d9922c775a 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -63,7 +63,7 @@ private:
SvXMLGraphicHelperMode meCreateMode;
bool mbDirect;
- SVX_DLLPRIVATE bool ImplGetStreamNames( const OUString& rURLStr,
+ SVX_DLLPRIVATE static bool ImplGetStreamNames( const OUString& rURLStr,
OUString& rPictureStorageName,
OUString& rPictureStreamName );
SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage >
@@ -71,7 +71,7 @@ private:
SVX_DLLPRIVATE SvxGraphicHelperStream_Impl
ImplGetGraphicStream( const OUString& rPictureStorageName,
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,
const OUString& rPictureStreamName );
SVX_DLLPRIVATE bool ImplWriteGraphic( const OUString& rPictureStorageName,
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index b7dcb073da7b..1acfbfd5b1b8 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -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 ),
"FormToolboxes::getToolboxResourceName: unsupported slot!" );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 45969cb56e34..4829fb3c06bb 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -226,7 +226,7 @@ const GalleryObject* GalleryTheme::ImplGetGalleryObject( const INetURLObject& rU
return nullptr;
}
-INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
+INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject )
{
INetURLObject aURL;
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 075e4e0d6cf3..9887404aa999 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -44,8 +44,8 @@ namespace svxform
/** retrieves the URI for the toolbox associated with the given slot, depending
on the type of our document
*/
- SVX_DLLPUBLIC OUString
- getToolboxResourceName( sal_uInt16 _nSlotId ) const;
+ SVX_DLLPUBLIC static OUString
+ getToolboxResourceName( sal_uInt16 _nSlotId );
/** toggles the toolbox associated with the given slot
*/
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 150a904dc4d3..aba7875ed81c 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1154,7 +1154,7 @@ bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey )
}
// 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)
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)
switch ( nCategory )
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index d660e8751465..0a032ed56f6e 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -449,7 +449,7 @@ void SdrCaptionObj::ImpRecalcTail()
// 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
// 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);
Point aTl(rPoly[0]);
@@ -475,7 +475,7 @@ void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPo
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
tools::Polygon aPol(2);
Point aTl(rPoly[0]);
@@ -492,7 +492,7 @@ void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPo
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
tools::Polygon aPol(3);
Point aTl(rPoly[0]);
@@ -525,12 +525,12 @@ void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPo
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);
}
-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) {
case SdrCaptionType::Type1: ImpCalcTail1(rPara,rPoly,rRect); break;
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index e00783e753dd..e4b3a01d49f0 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -663,7 +663,7 @@ void ImpCircUser::SetCreateParams(SdrDragStat& rStat)
} else aP2=aCenter;
}
-void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) const
+void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat)
{
ImpCircUser* pU=static_cast<ImpCircUser*>(rStat.GetUser());
if (pU==nullptr) {
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 81bad8fe52f0..72f4a15f4eac 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -195,7 +195,7 @@ protected:
SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() 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:
SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException);
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 22df739dda91..6ac0f44d5701 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -458,7 +458,7 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt
return aRet;
}
-OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName ) const
+OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName )
{
struct XMLGraphicMimeTypeMapper
{
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 0b7cf51dd5ff..e7a7962b2f60 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -521,7 +521,7 @@ SvxXMLBitmapEntryExporter::~SvxXMLBitmapEntryExporter()
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: */
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 2307e6929f13..186b00c520b0 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -301,7 +301,7 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r
try
{
XMLImageStyle aImageStyle;
- aImageStyle.importXML( xAttrList, rAny, rName, GetImport() );
+ XMLImageStyle::importXML( xAttrList, rAny, rName, GetImport() );
}
catch (const Exception&)
{
generated by cgit (git 2.34.1) at 2024-12-27 00:55:22 +0000