diff options
22 files changed, 37 insertions, 37 deletions
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index e06a51ac7dd2..f6d31703f7d1 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -79,7 +79,7 @@ private: bool bFillBox; com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - void ReleaseFocus(); + static void ReleaseFocus(); void InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation ); void ClearBox(); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 3d840d8b2515..a5c3b91fc29e 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -311,7 +311,7 @@ private: void CheckCompileBasic(); bool BasicExecute(); - void GoOnTop(); + static void GoOnTop(); sal_Int32 FormatAndPrint( Printer* pPrinter, sal_Int32 nPage = -1 ); SbModuleRef XModule(); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 12af69212e83..af89dfb3292d 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1346,7 +1346,7 @@ sal_Int32 DialogWindow::countPages( Printer* ) void DialogWindow::printPage( sal_Int32 nPage, Printer* pPrinter ) { - pEditor->printPage( nPage, pPrinter, CreateQualifiedName() ); + DlgEditor::printPage( nPage, pPrinter, CreateQualifiedName() ); } void DialogWindow::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index 2b51b175091d..f08f298b6dc8 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -225,7 +225,7 @@ public: EntryDescriptor GetEntryDescriptor( SvTreeListEntry* pEntry ); - ItemType ConvertType (EntryType eType); + static ItemType ConvertType (EntryType eType); bool IsValidEntry( SvTreeListEntry* pEntry ); SvTreeListEntry* AddEntry( @@ -236,8 +236,8 @@ public: void RemoveEntry (SvTreeListEntry*); void RemoveEntry (ScriptDocument const&); - OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; - void GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage ); + OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; + static void GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage ); void SetCurrentEntry (EntryDescriptor&); diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 212dc7f6ebb9..5cd80eb12540 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -79,7 +79,7 @@ private: void EnableButton( Button& rButton, bool bEnable ); - OUString GetInfo( SbxVariable* pVar ); + static OUString GetInfo( SbxVariable* pVar ); void StoreMacroDescription(); void RestoreMacroDescription(); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 5929511f8ae6..ff181b230ec1 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -695,7 +695,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) aModName = aModName.getToken( 0, ' ', nIndex ); } SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), - aModName, m_pBasicBox->ConvertType( aDesc.GetType() ) ); + aModName, TreeListBox::ConvertType( aDesc.GetType() ) ); pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SfxCallMode::SYNCHRON, &aSbxItem, 0L ); } } @@ -876,7 +876,7 @@ void ObjectPage::DeleteCurrent() m_pBasicBox->Select( m_pBasicBox->GetCurEntry() ); if (SfxDispatcher* pDispatcher = GetDispatcher()) { - SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aName, m_pBasicBox->ConvertType( eType ) ); + SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aName, TreeListBox::ConvertType( eType ) ); pDispatcher->Execute( SID_BASICIDE_SBXDELETED, SfxCallMode::SYNCHRON, &aSbxItem, 0L ); } diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index bfbe8fe04deb..4b2083a8eac6 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -132,13 +132,13 @@ namespace basctl virtual bool includeDocument( const docs::DocumentDescriptor& _rDocument ) const SAL_OVERRIDE; private: - bool impl_isDocumentVisible_nothrow( const docs::DocumentDescriptor& _rDocument ) const; + static bool impl_isDocumentVisible_nothrow( const docs::DocumentDescriptor& _rDocument ); private: bool m_bFilterInvisible; }; - bool FilterDocuments::impl_isDocumentVisible_nothrow( const docs::DocumentDescriptor& _rDocument ) const + bool FilterDocuments::impl_isDocumentVisible_nothrow( const docs::DocumentDescriptor& _rDocument ) { try { diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index e7225c91124b..acd21ac62e3d 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -28,7 +28,7 @@ namespace basctl class SIDEModel : public SfxBaseModel, public com::sun::star::lang::XServiceInfo { - void notImplemented() throw ( ::com::sun::star::io::IOException ); + static void notImplemented() throw ( ::com::sun::star::io::IOException ); public: SIDEModel( SfxObjectShell *pObjSh = 0 ); virtual ~SIDEModel(); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 1ed8f9f950a1..a6e8ecc43e39 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -96,7 +96,7 @@ private: void CheckWindows(); void RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName, bool bDestroy ); void UpdateWindows(); - void InvalidateBasicIDESlots(); + static void InvalidateBasicIDESlots(); void StoreAllWindowData( bool bPersistent = true ); void SetMDITitle(); void EnableScrollbars( bool bEnable ); diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 6371ac67b72f..81e9f61ef57d 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -103,7 +103,7 @@ public: private: DECL_LINK(MarkTimeout, void *); - void Print( Printer* pPrinter, const OUString& rTitle ); + static void Print( Printer* pPrinter, const OUString& rTitle ); private: ScrollBar* pHScroll; @@ -202,7 +202,7 @@ public: void ShowProperties(); void UpdatePropertyBrowserDelayed(); - void printPage( sal_Int32 nPage, Printer* pPrinter, const OUString& ); + static void printPage( sal_Int32 nPage, Printer* pPrinter, const OUString& ); bool AdjustPageSize(); diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index 92205ddc226a..e38ea8aac650 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -39,7 +39,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_SeqData; protected: - bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + static bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); public: DlgEdTransferableImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aSeqFlavors, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aSeqData ); diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 8469624ec8e0..04ab22d5dccf 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -61,7 +61,7 @@ protected: typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > InterfaceArray; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > CreateMultiSelectionSequence( const SdrMarkList& _rMarkList ); void implSetNewObjectSequence( const ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rObjectSeq ); @@ -69,7 +69,7 @@ protected: void implSetNewObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); - OUString GetHeadlineName( + static OUString GetHeadlineName( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); public: diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 23880ed711ac..341f05d4d080 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -101,7 +101,7 @@ class BibConfig : public utl::ConfigItem OUString aColumnDefaults[COLUMN_COUNT]; - com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx index 220f83fcd55a..4c7afb525fe7 100644 --- a/extensions/source/bibliography/bibmod.hxx +++ b/extensions/source/bibliography/bibmod.hxx @@ -38,7 +38,7 @@ class BibModul ResMgr* GetResMgr(){return pResMgr;} static BibConfig* GetConfig(); - BibDataManager* createDataManager(); + static BibDataManager* createDataManager(); }; diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 96fb625615c6..1056a1474c9b 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -105,9 +105,9 @@ class GridWindow : public vcl::Window void drawHandles(); void computeExtremes(); - void computeChunk( double fMin, double fMax, double& fChunkOut, double& fMinChunkOut ); + static void computeChunk( double fMin, double fMax, double& fChunkOut, double& fMinChunkOut ); void computeNew(); - double interpolate( double x, double* pNodeX, double* pNodeY, int nNodes ); + static double interpolate( double x, double* pNodeX, double* pNodeY, int nNodes ); virtual void MouseMove( const MouseEvent& ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& ) SAL_OVERRIDE; diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index d0ae220ce38a..0a5a432c4cf2 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -98,10 +98,10 @@ private: Link maReloadOptionsLink; - inline oslGenericFunction + static inline oslGenericFunction LoadSymbol( const char* ); - void Init(); - void DeInit(); + static void Init(); + static void DeInit(); SANE_Status ControlOption( int, SANE_Action, void* ); diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 4b4a18e64318..502468c2a135 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -47,8 +47,8 @@ protected: osl::Mutex maProtector; void* mpData; - void AcquireData(); - void ReleaseData(); + static void AcquireData(); + static void ReleaseData(); public: diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 21dd6ca2513f..26e3eb15ac5d 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -176,7 +176,7 @@ public: SfxDispatcher* GetDispatcher(); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); - void InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent) const; + static void InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent); }; #endif diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx index 25b7e7d93eb5..ad5db821655a 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx @@ -122,9 +122,9 @@ public: static Sequence< OUString > getSupportedServiceNames_Static() throw(); private: - OUString SAL_CALL makeLowerCase(const OUString&, CharClass *); - OUString SAL_CALL makeUpperCase(const OUString&, CharClass *); - OUString SAL_CALL makeInitCap(const OUString&, CharClass *); + static OUString SAL_CALL makeLowerCase(const OUString&, CharClass *); + static OUString SAL_CALL makeUpperCase(const OUString&, CharClass *); + static OUString SAL_CALL makeInitCap(const OUString&, CharClass *); }; inline OUString Hyphenator::getImplementationName_Static() throw() diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index 4504b3c5c9f9..765234943231 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -124,9 +124,9 @@ public: getSupportedServiceNames_Static() throw(); private: - OUString SAL_CALL makeLowerCase(const OUString&, CharClass *); - OUString SAL_CALL makeUpperCase(const OUString&, CharClass *); - OUString SAL_CALL makeInitCap(const OUString&, CharClass *); + static OUString SAL_CALL makeLowerCase(const OUString&, CharClass *); + static OUString SAL_CALL makeUpperCase(const OUString&, CharClass *); + static OUString SAL_CALL makeInitCap(const OUString&, CharClass *); /* static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceManager > xLngSvcMgr; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 03940a43f61d..1ab2b53ca9d9 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1046,7 +1046,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt StateChanged( nSID, eState, pState, 0 ); } -void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent) const +void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent) { if (!objSh || !objSh->isTiledRendering()) return; diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index b1a2a5d74c4f..cee4a342e440 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -425,8 +425,8 @@ private: bool isZip(); void ensureZipIsInitialized(); - librevenge::RVNGInputStream *createWPXStream(const SotStorageStreamRef &rxStorage); - librevenge::RVNGInputStream *createWPXStream(const Reference<XInputStream> &rxStream); + static librevenge::RVNGInputStream *createWPXStream(const SotStorageStreamRef &rxStorage); + static librevenge::RVNGInputStream *createWPXStream(const Reference<XInputStream> &rxStream); private: ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxStream; |