diff options
41 files changed, 77 insertions, 97 deletions
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 521bf62985f9..70ca02217f6c 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -271,7 +271,7 @@ public: getOrCreateChartRootShape( const css::uno::Reference< css::drawing::XDrawPage>& xPage ); - void setPageSize(const css::uno::Reference<css::drawing::XShapes>& xChartShapes, + static void setPageSize(const css::uno::Reference<css::drawing::XShapes>& xChartShapes, const css::awt::Size& rSize); static css::uno::Reference< css::drawing::XShapes > diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 56a439d48e37..02ad8a90720c 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2508,7 +2508,7 @@ void ChartView::createShapes() { OSL_FAIL("could not set page size correctly"); } - pShapeFactory->setPageSize(mxRootShape, aPageSize); + ShapeFactory::setPageSize(mxRootShape, aPageSize); createShapes2D(aPageSize); diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index 7d9b28d956da..157c2190a3ec 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -83,9 +83,8 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) if (isInUnoIncludeFile(pCXXMethodDecl)) { return true; } - if ( pCXXMethodDecl != pCXXMethodDecl->getCanonicalDecl() ) { + if (pCXXMethodDecl->getTemplateSpecializationKind() == TSK_ExplicitSpecialization) return true; - } // the CppUnit stuff uses macros and methods that can't be changed if (isDerivedFromTestFixture(pCXXMethodDecl->getParent())) { diff --git a/cui/source/inc/SignatureLineDialogBase.hxx b/cui/source/inc/SignatureLineDialogBase.hxx index 2701be29035c..2e046d945d80 100644 --- a/cui/source/inc/SignatureLineDialogBase.hxx +++ b/cui/source/inc/SignatureLineDialogBase.hxx @@ -24,9 +24,9 @@ public: protected: css::uno::Reference<css::frame::XModel> m_xModel; - OUString getSignatureImage(); + static OUString getSignatureImage(); virtual void Apply() = 0; - OUString getCDataString(const OUString& rString); + static OUString getCDataString(const OUString& rString); }; #endif diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index eba4a7fda42e..91adbf17cda3 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -43,7 +43,7 @@ public: void remove( size_t _nIndex ); void replace( size_t _nIndex, const XColorEntry & _rEntry ); void useDefault(); - OUString getDefaultName(size_t _nIndex); + static OUString getDefaultName(size_t _nIndex); // comparison bool operator==( const SvxChartColorTable & _rOther ) const; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 3fd6630afeaf..420b94f3f573 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -267,7 +267,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor, Button*, void) { Color const black( 0x00, 0x00, 0x00 ); - pColorConfig->GetColorList().append (XColorEntry ( black, pColorConfig->GetColorList().getDefaultName(pColorConfig->GetColorList().size()))); + pColorConfig->GetColorList().append (XColorEntry ( black, SvxChartColorTable::getDefaultName(pColorConfig->GetColorList().size()))); FillBoxChartColorLB(); diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 5a2836fa124c..61299f336cdf 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -46,7 +46,7 @@ namespace dbaui bool IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } bool IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } - OConnectionLineDataRef CreateLineDataObj(); + static OConnectionLineDataRef CreateLineDataObj(); ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData ); public: diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx index 281a5f7ebbba..d63301f50f5f 100644 --- a/drawinglayer/source/tools/emfphelperdata.hxx +++ b/drawinglayer/source/tools/emfphelperdata.hxx @@ -209,7 +209,7 @@ namespace emfplushelper // readers static void ReadRectangle(SvStream& s, float& x, float& y, float &width, float& height, bool bCompressed = false); static bool readXForm(SvStream& rIn, basegfx::B2DHomMatrix& rTarget); - ::basegfx::B2DPolyPolygon const combineClip(::basegfx::B2DPolyPolygon const & leftPolygon, int combineMode, ::basegfx::B2DPolyPolygon const & rightPolygon); + static ::basegfx::B2DPolyPolygon const combineClip(::basegfx::B2DPolyPolygon const & leftPolygon, int combineMode, ::basegfx::B2DPolyPolygon const & rightPolygon); static float getUnitToPixelMultiplier(const UnitType aUnitType); }; diff --git a/drawinglayer/source/tools/emfpregion.cxx b/drawinglayer/source/tools/emfpregion.cxx index e5a9ed9e81e3..ba78503c2826 100644 --- a/drawinglayer/source/tools/emfpregion.cxx +++ b/drawinglayer/source/tools/emfpregion.cxx @@ -60,7 +60,7 @@ namespace emfplushelper { ::basegfx::B2DPolyPolygon leftPolygon = ReadRegionNode(s, rR); ::basegfx::B2DPolyPolygon rightPolygon = ReadRegionNode(s, rR); - polygon = rR.combineClip(leftPolygon, dataType, rightPolygon); + polygon = EmfPlusHelperData::combineClip(leftPolygon, dataType, rightPolygon); break; } case RegionNodeDataTypeRect: diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index cc3b13963a31..2c8489a14d0f 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -833,7 +833,7 @@ struct MailMerge: public HBox MailMerge(); virtual bool Read(HWPFile &hwpf) override; - hchar_string GetString(); + static hchar_string GetString(); }; // char composition(23) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 49e819b84cd2..dea71b5ea4e9 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -4758,9 +4758,9 @@ void HwpReader::makeShowPageNum() * mail merge operation using hwp addressbook and hwp data form. * not support operation in OO writer. */ -void HwpReader::makeMailMerge(MailMerge * hbox) +void HwpReader::makeMailMerge(MailMerge *) { - hchar_string const boxstr = hbox->GetString(); + hchar_string const boxstr = MailMerge::GetString(); rchars(reinterpret_cast<sal_Unicode const *>(hconv(boxstr.c_str()))); } diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 5e784ca2663f..24adf475be16 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -257,7 +257,7 @@ public: void WriteShape3DEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WriteArtisticEffect( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); OString WriteWdpPicture( const OUString& rFileId, const css::uno::Sequence< sal_Int8 >& rPictureData ); - bool IsGroupShape( const css::uno::Reference< css::drawing::XShape >& rXShape ) const; + static bool IsGroupShape( const css::uno::Reference< css::drawing::XShape >& rXShape ); sal_Int32 getBulletMarginIndentation (const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,sal_Int16 nLevel, const OUString& propName); static void ResetCounters(); diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 7e1a302c421b..adef4696901c 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -50,7 +50,7 @@ class DetailsContainer protected: void notifyChange( ); DECL_LINK(ValueChangeHdl, weld::Entry&, void); - DECL_LINK(FormatPortHdl, weld::SpinButton&, void); + DECL_STATIC_LINK(DetailsContainer, FormatPortHdl, weld::SpinButton&, void); }; class HostDetailsContainer : public DetailsContainer diff --git a/include/test/sheet/xdocumentauditing.hxx b/include/test/sheet/xdocumentauditing.hxx index 71fe119980cf..5c19446ca252 100644 --- a/include/test/sheet/xdocumentauditing.hxx +++ b/include/test/sheet/xdocumentauditing.hxx @@ -36,8 +36,8 @@ protected: private: bool hasRightAmountOfShapes(const css::uno::Reference<css::drawing::XDrawPage>& xDrawPage, sal_Int32 nElementCount, sal_Int32 nShapes); - void dispatch(const css::uno::Reference<css::frame::XFrame>& xFrame, - const css::uno::Sequence<css::beans::PropertyValue>& rArguments); + static void dispatch(const css::uno::Reference<css::frame::XFrame>& xFrame, + const css::uno::Sequence<css::beans::PropertyValue>& rArguments); css::awt::Point m_Position; }; } // namespace apitest diff --git a/include/test/sheet/xmultipleoperation.hxx b/include/test/sheet/xmultipleoperation.hxx index b775ddfcb324..107902da1ae7 100644 --- a/include/test/sheet/xmultipleoperation.hxx +++ b/include/test/sheet/xmultipleoperation.hxx @@ -30,7 +30,7 @@ protected: ~XMultipleOperation() {} private: - void fillCells(css::uno::Reference<css::sheet::XSpreadsheet> const&); + static void fillCells(css::uno::Reference<css::sheet::XSpreadsheet> const&); }; } diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx b/include/test/sheet/xsheetcellrangecontainer.hxx index 8164da251975..734c2c4e2fc1 100644 --- a/include/test/sheet/xsheetcellrangecontainer.hxx +++ b/include/test/sheet/xsheetcellrangecontainer.hxx @@ -30,7 +30,7 @@ public: protected: ~XSheetCellRangeContainer() {} - css::uno::Sequence<com::sun::star::table::CellRangeAddress> createCellRangeAddresses(); + static css::uno::Sequence<com::sun::star::table::CellRangeAddress> createCellRangeAddresses(); }; } diff --git a/include/test/sheet/xspreadsheets2.hxx b/include/test/sheet/xspreadsheets2.hxx index 345fa8b37eb7..e3928d349efb 100644 --- a/include/test/sheet/xspreadsheets2.hxx +++ b/include/test/sheet/xspreadsheets2.hxx @@ -49,7 +49,7 @@ private: css::uno::Reference< css::sheet::XSpreadsheetDocument> getDoc(const OUString&, css::uno::Reference< css::lang::XComponent >&); static css::uno::Reference< css::sheet::XNamedRanges> getNamedRanges(css::uno::Reference< css::sheet::XSpreadsheetDocument > const &); void importSheetToCopy(); - bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ); + static bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ); css::uno::Reference< css::sheet::XSpreadsheetDocument> xDestDoc; css::uno::Reference< css::sheet::XSpreadsheet > xDestSheet; diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx index 8822dce490fd..78c23e416c66 100644 --- a/include/xmloff/animexp.hxx +++ b/include/xmloff/animexp.hxx @@ -36,7 +36,7 @@ public: XMLAnimationsExporter( XMLShapeExport* pShapeExp ); virtual ~XMLAnimationsExporter() override; - void prepare( const css::uno::Reference< css::drawing::XShape >& xShape ); + static void prepare( const css::uno::Reference< css::drawing::XShape >& xShape ); void collect( const css::uno::Reference< css::drawing::XShape >& xShape, SvXMLExport& rExport ); void exportAnimations( SvXMLExport& rExport ); }; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 802091a7c5f3..58164ba4065a 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2173,7 +2173,7 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS } } -bool DrawingML::IsGroupShape( const Reference< XShape >& rXShape ) const +bool DrawingML::IsGroupShape( const Reference< XShape >& rXShape ) { bool bRet = false; if ( rXShape.is() ) diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 9982aae75209..7f2ef54bb293 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -150,10 +150,6 @@ void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs) } } -void ManifestImport::doKeyInfoEntry(StringHashMap &) -{ -} - void ManifestImport::doEncryptedKey(StringHashMap &) { aKeyInfoSequence.clear(); @@ -171,18 +167,6 @@ void ManifestImport::doEncryptionMethod(StringHashMap &rConvertedAttribs, } } -void ManifestImport::doEncryptedKeyInfo(StringHashMap &) -{ -} - -void ManifestImport::doEncryptedCipherData(StringHashMap &) -{ -} - -void ManifestImport::doEncryptedPgpData(StringHashMap &) -{ -} - void ManifestImport::doEncryptedCipherValue() { if ( aKeyInfoSequence.size() == 3 ) @@ -353,9 +337,9 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re if (aConvertedName == gsFileEntryElement) //manifest:file-entry doFileEntry(aConvertedAttribs); else if (aConvertedName == gsManifestKeyInfoElement) //loext:keyinfo - doKeyInfoEntry(aConvertedAttribs); + ; else if (aConvertedName == gsManifestKeyInfoElement13) //manifest:keyinfo - doKeyInfoEntry(aConvertedAttribs); + ; else aStack.back().m_bValid = false; break; @@ -393,13 +377,13 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re else if (aConvertedName == gsEncryptionMethodElement13) //manifest:encryption-method doEncryptionMethod(aConvertedAttribs, gsAlgorithmAttribute13); else if (aConvertedName == gsKeyInfoElement) //loext:KeyInfo - doEncryptedKeyInfo(aConvertedAttribs); + ; else if (aConvertedName == gsCipherDataElement) //loext:CipherData - doEncryptedCipherData(aConvertedAttribs); + ; else if (aConvertedName == gsCipherDataElement13) //manifest:CipherData - doEncryptedCipherData(aConvertedAttribs); + ; else if (aConvertedName == gsPgpDataElement13) //manifest:PGPData - doEncryptedPgpData(aConvertedAttribs); + ; else aStack.back().m_bValid = false; break; @@ -411,7 +395,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re if (!aIter->m_bValid) aStack.back().m_bValid = false; else if (aConvertedName == gsPgpDataElement) //loext:PGPData - doEncryptedPgpData(aConvertedAttribs); + ; else if (aConvertedName == gsCipherValueElement) //loext:CipherValue // ciphervalue action happens on endElement aCurrentCharacters = ""; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 33b0637015d7..15023374bf71 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -91,12 +91,8 @@ private: void doKeyDerivation(StringHashMap &rConvertedAttribs); /// @throws css::uno::RuntimeException void doStartKeyAlg(StringHashMap &rConvertedAttribs); - void doKeyInfoEntry(StringHashMap &); void doEncryptedKey(StringHashMap &); void doEncryptionMethod(StringHashMap &, const OUString &); - void doEncryptedKeyInfo(StringHashMap &); - void doEncryptedCipherData(StringHashMap &); - void doEncryptedPgpData(StringHashMap &); void doEncryptedCipherValue(); void doEncryptedKeyId(); void doEncryptedKeyPacket(); diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index 7aaf3e5ac207..928807bc6642 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -103,7 +103,7 @@ private: RegError deleteSubkeysAndValues(ORegKey* pKey); - RegError loadAndSaveValue(ORegKey* pTargetKey, + static RegError loadAndSaveValue(ORegKey* pTargetKey, ORegKey const * pSourceKey, const OUString& valueName, sal_uInt32 nCut, diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 2e2c6a8ad844..a9b26576d5b6 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -93,7 +93,7 @@ private: virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, css::uno::Reference< css::beans::XPropertySet > const & aXBackgroundPropSet ) override; void ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ); bool WriteColorSchemes(const FSHelperPtr& pFS, const OUString& rThemePath); - void WriteDefaultColorSchemes(const FSHelperPtr& pFS); + static void WriteDefaultColorSchemes(const FSHelperPtr& pFS); void WriteTheme( sal_Int32 nThemeNum ); virtual bool ImplCreateDocument() override; diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 060c7bad2a0c..beac67618acc 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -94,18 +94,18 @@ private: void dump( sal_uInt32 nLen, bool bNewLine = true ); #endif - void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); - void dump_atom( const Atom* pAtom, bool bNewLine = true ); - void dump_target( css::uno::Any& rAny ); - void dump( css::uno::Any& rAny ); - void dump( const PropertySet& rSet ); - void dump( const AnimationNode& rNode ); - void dump( const char * pText ); - void dump( const char * pText, sal_Int32 nInt ); + static void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); + static void dump_atom( const Atom* pAtom, bool bNewLine = true ); + static void dump_target( css::uno::Any& rAny ); + static void dump( css::uno::Any& rAny ); + static void dump( const PropertySet& rSet ); + static void dump( const AnimationNode& rNode ); + static void dump( const char * pText ); + static void dump( const char * pText, sal_Int32 nInt ); void dump( const char * pText, sal_Int64 nInt ); - void dump( const char * pText, double fDouble ); - void dump( const char * pText, const char * pText2 ); - void dump( const char * pText, const OUString& rString ); + static void dump( const char * pText, double fDouble ); + static void dump( const char * pText, const char * pText2 ); + static void dump( const char * pText, const OUString& rString ); }; } // namespace ppt diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 17806cf90903..d08202a27c66 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -57,12 +57,12 @@ public: void transformTextShape( SdrTextObj& rTextShape ); bool getBulletState( const SfxItemSet& rSet, SfxStyleSheetBase* pSheet, bool& rState ); - bool getBulletState( const SfxItemSet& rSet, sal_uInt16 nWhich, bool& rState ); + static bool getBulletState( const SfxItemSet& rSet, sal_uInt16 nWhich, bool& rState ); static bool transformItemSet( SfxItemSet& rSet, bool bNumbering ); - bool removeAlienAttributes( SfxItemSet& rSet ); - bool removeAlienAttributes( SfxItemSet& rSet, sal_uInt16 nWhich ); + static bool removeAlienAttributes( SfxItemSet& rSet ); + static bool removeAlienAttributes( SfxItemSet& rSet, sal_uInt16 nWhich ); SdDrawDocument& mrDocument; SdrOutliner& mrOutliner; diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index a45d7a9aca64..60ccc3dcd5bc 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -61,7 +61,7 @@ class SdVectorizeDlg : public weld::GenericDialogController static ::tools::Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ); Bitmap GetPreparedBitmap( Bitmap const & rBmp, Fraction& rScale ); void Calculate( Bitmap const & rBmp, GDIMetaFile& rMtf ); - void AddTile( BitmapReadAccess const * pRAcc, GDIMetaFile& rMtf, + static void AddTile( BitmapReadAccess const * pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ); DECL_LINK( ProgressHdl, long, void ); diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx index 96a5a349367a..27a5232e52f0 100644 --- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx @@ -90,7 +90,7 @@ namespace pdfi const FontAttributes& getFont( sal_Int32 nFontId ) const; sal_Int32 getFontId( const FontAttributes& rAttr ) const; - void sortElements( Element* pElement ); + static void sortElements( Element* pElement ); static OUString mirrorString( const OUString& i_rInString ); diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index d587ac97903e..d845d827ce5d 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -479,7 +479,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< std::unique_pt // FIXME: until hyperlinks and font effects are adjusted for // geometrical search handle them before sorting - m_rProcessor.sortElements( &elem ); + PDFIProcessor::sortElements( &elem ); // find paragraphs in text ParagraphElement* pCurPara = nullptr; diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index b9e01fe5c393..2e83a9b30316 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -491,7 +491,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< std::unique_ // FIXME: until hyperlinks and font effects are adjusted for // geometrical search handle them before sorting - m_rProcessor.sortElements( &elem ); + PDFIProcessor::sortElements( &elem ); // find paragraphs in text ParagraphElement* pCurPara = nullptr; diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 169c7cb84138..435cfa2e80c4 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -554,7 +554,7 @@ BaseStorage* Storage::OpenStorage( const OUString& rName, StreamMode m, bool bDi if( bDirect && !pEntry->m_bDirect ) bDirect = false; - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( !p ) { if( !( m & StreamMode::NOCREATE ) ) @@ -605,7 +605,7 @@ BaseStorageStream* Storage::OpenStream( const OUString& rName, StreamMode m, boo { if( !Validate() || !ValidateMode( m ) ) return new StorageStream( pIo, nullptr, m ); - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); bool bTemp = false; if( !p ) { @@ -650,7 +650,7 @@ void Storage::Remove( const OUString& rName ) { if( !Validate( true ) ) return; - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( p ) { p->Invalidate( true ); @@ -667,7 +667,7 @@ bool Storage::CopyTo( const OUString& rElem, BaseStorage* pDest, const OUString& { if( !Validate() || !pDest || !pDest->Validate( true ) ) return false; - StgDirEntry* pElem = pIo->m_pTOC->Find( *pEntry, rElem ); + StgDirEntry* pElem = StgDirStrm::Find( *pEntry, rElem ); if( pElem ) { if( pElem->m_aEntry.GetType() == STG_STORAGE ) @@ -755,7 +755,7 @@ bool Storage::IsStorage( const OUString& rName ) const { if( Validate() ) { - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( p ) return p->m_aEntry.GetType() == STG_STORAGE; } @@ -766,7 +766,7 @@ bool Storage::IsStream( const OUString& rName ) const { if( Validate() ) { - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( p ) return p->m_aEntry.GetType() == STG_STREAM; } @@ -776,7 +776,7 @@ bool Storage::IsStream( const OUString& rName ) const bool Storage::IsContained( const OUString& rName ) const { if( Validate() ) - return pIo->m_pTOC->Find( *pEntry, rName ) != nullptr; + return StgDirStrm::Find( *pEntry, rName ) != nullptr; else return false; } diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx index b4f1035c0078..b0d2c43cf511 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -96,7 +96,7 @@ public: bool Store(); void* GetEntry( sal_Int32 n, bool );// get an entry StgDirEntry* GetRoot() { return m_pRoot; } - StgDirEntry* Find( StgDirEntry&, const OUString& ); + static StgDirEntry* Find( StgDirEntry&, const OUString& ); StgDirEntry* Create( StgDirEntry&, const OUString&, StgEntryType ); }; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 5ac408552ba6..ccfb0c021548 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -2104,6 +2104,7 @@ IMPL_LINK_NOARG(URLBox, ChangedHdl, weld::ComboBox&, void) IMPL_LINK_NOARG(URLBox, FocusInHdl, weld::Widget&, void) { + (void)this; // loplugin:staticmethod #ifndef UNX // pb: don't select automatically on unix #93251# m_xWidget->select_entry_region(0, -1); diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 2cc3d2ab4fe1..ec42fdf1e928 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -41,7 +41,7 @@ DetailsContainer::DetailsContainer(PlaceEditDialog* pDialog) } //format without thousand separator -IMPL_LINK(DetailsContainer, FormatPortHdl, weld::SpinButton&, rSpinButton, void) +IMPL_STATIC_LINK(DetailsContainer, FormatPortHdl, weld::SpinButton&, rSpinButton, void) { rSpinButton.set_text(OUString::number(rSpinButton.get_value())); } diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 4fff9948c883..6cdd70b9a768 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -84,7 +84,7 @@ private: // tdf#115529 check and evtl. correct value, it is in 10th // degrees and *has* to be in the range [0 .. 3600[ - sal_Int16 checkAndCorrectValue(sal_Int16 nValue); + static sal_Int16 checkAndCorrectValue(sal_Int16 nValue); public: SwRotationGrf() diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 3b65f7117850..952badaab9da 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -550,7 +550,7 @@ BaseContent::removeProperty( const OUString& Name ) Sequence< ContentInfo > SAL_CALL BaseContent::queryCreatableContentsInfo() { - return m_pMyShell->queryCreatableContentsInfo(); + return TaskManager::queryCreatableContentsInfo(); } diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 75e1aa70a876..8de0bae31198 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -486,7 +486,7 @@ namespace fileaccess void insertDefaultProperties( const OUString& aUnqPath ); - css::uno::Sequence< css::ucb::ContentInfo > + static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo(); @@ -614,7 +614,7 @@ namespace fileaccess * osl::DirectoryItem::getFileStatus fills the required fields. */ - void + static void getMaskFromProperties( sal_Int32& n_Mask, const css::uno::Sequence< css::beans::Property >& seq ); diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index 6f2ab24fcbbd..79c8ba0c5ff7 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -68,7 +68,7 @@ namespace DOM static css::uno::Reference< XInterface > _getInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr); explicit CSAXDocumentBuilder(const css::uno::Reference< css::lang::XMultiServiceFactory >& mgr); - void setElementFastAttributes(const css::uno::Reference< css::xml::dom::XElement >& aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs); + static void setElementFastAttributes(const css::uno::Reference< css::xml::dom::XElement >& aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs); // XServiceInfo diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 1720ca404ce3..29842cc5071f 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -147,7 +147,7 @@ public: void fieldSeparator(); void endField(); void lockField(); - void ftnednref(); + static void ftnednref(); void ftnedncont(); void ftnednsep(); void pgNum(); diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index fdb64896098d..8773508ec055 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -203,10 +203,10 @@ public: static enum ::xmloff::token::XMLTokenEnum MapCountFieldName(FieldIdEnum nToken); static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(const OUString& sName); static enum ::xmloff::token::XMLTokenEnum MapMeasureKind(sal_Int16 nKind); - enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const css::uno::Reference< css::beans::XPropertySet> & xPropSet, + static enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const css::uno::Reference< css::beans::XPropertySet> & xPropSet, sal_Int32& nOffset); /// also adjust page offset - enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet); - enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet); + static enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet); + static enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet); private: @@ -376,26 +376,26 @@ private: GetMasterPropertySet(const css::uno::Reference < css::text::XTextField > & rTextField); /// get PropertySet of (any) DependentTextField for this FieldMaster - bool GetDependentFieldPropertySet( + static bool GetDependentFieldPropertySet( const css::uno::Reference< css::beans::XPropertySet> & xmaster, css::uno::Reference< css::beans::XPropertySet> & xField); /// get field ID from XTextField (and it's Property-Set) - enum FieldIdEnum GetFieldID(const css::uno::Reference < css::text::XTextField > & rTextField, + static enum FieldIdEnum GetFieldID(const css::uno::Reference < css::text::XTextField > & rTextField, const css::uno::Reference < css::beans::XPropertySet > & xPropSet); /// get field ID from XTextField service name (and it's PropertySet) - enum FieldIdEnum MapFieldName(const OUString& sFieldName, + static enum FieldIdEnum MapFieldName(const OUString& sFieldName, const css::uno::Reference < css::beans::XPropertySet> & xPropSet); /// determine, whether field has string or numeric content - bool IsStringField(FieldIdEnum nFieldType, /// field ID + static bool IsStringField(FieldIdEnum nFieldType, /// field ID const css::uno::Reference < css::beans::XPropertySet > & xPropSet); /// explode a field master name into field type and field name - void ExplodeFieldMasterName( + static void ExplodeFieldMasterName( const OUString& sMasterName, /// name as returned by SO API OUString& sFieldType, /// out: field type OUString& sVarName); /// out: variable name diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index d022ba3a12b3..44f4f7051d98 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -512,7 +512,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap // prepare animation information if needed if( mxAnimationsExporter.is() ) - mxAnimationsExporter->prepare( xShape ); + XMLAnimationsExporter::prepare( xShape ); // check for special shapes diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 2bb563c72627..a273f0a8bb4c 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -135,12 +135,12 @@ private: void updateSlots(); - X509Certificate_NssImpl* createAndAddCertificateFromPackage( + static X509Certificate_NssImpl* createAndAddCertificateFromPackage( const css::uno::Sequence<sal_Int8>& raDerCertificate, OUString const & raString); - SECKEYPrivateKey* insertPrivateKey(css::uno::Sequence<sal_Int8> const & raPrivateKey); + static SECKEYPrivateKey* insertPrivateKey(css::uno::Sequence<sal_Int8> const & raPrivateKey); - X509Certificate_NssImpl* createX509CertificateFromDER(const css::uno::Sequence<sal_Int8>& raDerCertificate); + static X509Certificate_NssImpl* createX509CertificateFromDER(const css::uno::Sequence<sal_Int8>& raDerCertificate); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException |