diff options
35 files changed, 120 insertions, 112 deletions
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index 47363ba891e4..f1186b019ae7 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -181,7 +181,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) return true; } -loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false); +loplugin::Plugin::Registration<StaticMethods> X("staticmethods", true); } diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index cd4e818f41c5..de7a5895b627 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -93,7 +93,7 @@ namespace abp /// guesses a default for the table name, if no valid table is selected void implDefaultTableName(); - inline bool needAdminInvokationPage( AddressSourceType _eType ) const + static inline bool needAdminInvokationPage( AddressSourceType _eType ) { return ( ( AST_LDAP == _eType ) || ( AST_OTHER == _eType ) @@ -105,7 +105,7 @@ namespace abp return needAdminInvokationPage( m_aSettings.eType ); } - inline bool needManualFieldMapping( AddressSourceType _eType ) const + static inline bool needManualFieldMapping( AddressSourceType _eType ) { return ( AST_OTHER == _eType ) || ( AST_KAB == _eType ) || ( AST_EVOLUTION == _eType ) || ( AST_EVOLUTION_GROUPWISE == _eType ) || @@ -118,7 +118,7 @@ namespace abp } /// determines whether the given address book type does provide one table only - inline bool needTableSelection( AddressSourceType _eType ) const + static inline bool needTableSelection( AddressSourceType _eType ) { return ( AST_LDAP != _eType ) && ( AST_KAB != _eType ); } diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index ea5738f51378..655644ed07fa 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -114,7 +114,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createGridModel( const OUString& rName ); // XLoadable @@ -162,7 +162,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& getForm() { return m_xForm; } - OUString getControlName(sal_Int32 nFormatKey ); + static OUString getControlName(sal_Int32 nFormatKey ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const OUString& rName, bool bForceListBox = false); diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 81c4c56597e9..2ad213beae05 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -71,7 +71,7 @@ friend class BibFrameCtrl_Impl; DECL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void* ); - bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController); + static bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController); public: BibFrameController_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > & xComponent, BibDataManager* pDatMan); diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 2d0fdbac7aa1..879520db1c99 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -77,11 +77,11 @@ namespace dbp virtual ~OControlWizardPage(); protected: - void fillListBox( + static void fillListBox( ListBox& _rList, const ::com::sun::star::uno::Sequence< OUString >& _rItems, bool _bClear = true); - void fillListBox( + static void fillListBox( ComboBox& _rList, const ::com::sun::star::uno::Sequence< OUString >& _rItems, bool _bClear = true); diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx index 6b701b49ab9b..8f062818ddca 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.hxx +++ b/extensions/source/dbpilots/optiongrouplayouter.hxx @@ -54,7 +54,7 @@ namespace dbp ); protected: - void implAnchorShape( + static void implAnchorShape( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxShapeProps ); }; diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index 4c0e3dd0fce2..68e7b43f9ecd 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -59,13 +59,13 @@ namespace dbp //= OGroupBoxSI - OUString OGroupBoxSI::getImplementationName() const + OUString OGroupBoxSI::getImplementationName() { return OUString("org.openoffice.comp.dbp.OGroupBoxWizard"); } - Sequence< OUString > OGroupBoxSI::getServiceNames() const + Sequence< OUString > OGroupBoxSI::getServiceNames() { Sequence< OUString > aReturn(1); aReturn[0] = "com.sun.star.sdb.GroupBoxAutoPilot"; @@ -76,13 +76,13 @@ namespace dbp //= OListComboSI - OUString OListComboSI::getImplementationName() const + OUString OListComboSI::getImplementationName() { return OUString("org.openoffice.comp.dbp.OListComboWizard"); } - Sequence< OUString > OListComboSI::getServiceNames() const + Sequence< OUString > OListComboSI::getServiceNames() { Sequence< OUString > aReturn(1); aReturn[0] = "com.sun.star.sdb.ListComboBoxAutoPilot"; @@ -93,13 +93,13 @@ namespace dbp //= OGridSI - OUString OGridSI::getImplementationName() const + OUString OGridSI::getImplementationName() { return OUString("org.openoffice.comp.dbp.OGridWizard"); } - Sequence< OUString > OGridSI::getServiceNames() const + Sequence< OUString > OGridSI::getServiceNames() { Sequence< OUString > aReturn(1); aReturn[0] = "com.sun.star.sdb.GridControlAutoPilot"; diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx index 85637a4edaf6..276e0837c801 100644 --- a/extensions/source/dbpilots/wizardservices.hxx +++ b/extensions/source/dbpilots/wizardservices.hxx @@ -35,9 +35,9 @@ namespace dbp struct OGroupBoxSI { public: - OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< OUString > - getServiceNames() const; + static OUString getImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > + getServiceNames(); }; @@ -47,9 +47,9 @@ namespace dbp struct OListComboSI { public: - OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< OUString > - getServiceNames() const; + static OUString getImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > + getServiceNames(); }; @@ -59,9 +59,9 @@ namespace dbp struct OGridSI { public: - OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< OUString > - getServiceNames() const; + static OUString getImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > + getServiceNames(); }; diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index cdc91c712fd0..1fa64a89a47c 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -123,7 +123,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ); + static void impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ); }; diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 568a4cb6ee1d..f31fd5de1a82 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -928,7 +928,7 @@ namespace pcr } - Any OBrowserListBox::impl_getControlAsPropertyValue( const ListBoxLine& _rLine ) const + Any OBrowserListBox::impl_getControlAsPropertyValue( const ListBoxLine& _rLine ) { Reference< XPropertyControl > xControl( _rLine.pLine->getControl() ); Any aPropertyValue; diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 839c8b5538aa..3b50d467c943 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -190,14 +190,14 @@ namespace pcr the property value to set. If it's not compatible with the control value, it will be converted, using <member>XPropertyHandler::convertToControlValue</member> */ - void impl_setControlAsPropertyValue( const ListBoxLine& _rLine, const ::com::sun::star::uno::Any& _rPropertyValue ); + static void impl_setControlAsPropertyValue( const ListBoxLine& _rLine, const ::com::sun::star::uno::Any& _rPropertyValue ); /** retrieves the value for the given control, as a property value, after converting it as necessary @param _rLine The line whose at which the value is to be set. */ - ::com::sun::star::uno::Any - impl_getControlAsPropertyValue( const ListBoxLine& _rLine ) const; + static ::com::sun::star::uno::Any + impl_getControlAsPropertyValue( const ListBoxLine& _rLine ); /** retrieves the ->BrowserLinePointer for a given entry name @param _rEntryName diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 6bd77b8f9e6e..549b5b9e478c 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -242,7 +242,7 @@ namespace pcr case PROPERTY_ID_BOUND_CELL: { Reference< XValueBinding > xBinding( m_pHelper->getCurrentBinding() ); - if ( !m_pHelper->isCellBinding( xBinding ) ) + if ( !CellBindingHelper::isCellBinding( xBinding ) ) xBinding.clear(); aReturn <<= xBinding; @@ -252,7 +252,7 @@ namespace pcr case PROPERTY_ID_LIST_CELL_RANGE: { Reference< XListEntrySource > xSource( m_pHelper->getCurrentListSource() ); - if ( !m_pHelper->isCellRangeListSource( xSource ) ) + if ( !CellBindingHelper::isCellRangeListSource( xSource ) ) xSource.clear(); aReturn <<= xSource; @@ -262,7 +262,7 @@ namespace pcr case PROPERTY_ID_CELL_EXCHANGE_TYPE: { Reference< XValueBinding > xBinding( m_pHelper->getCurrentBinding() ); - aReturn <<= (sal_Int16)( m_pHelper->isCellIntegerBinding( xBinding ) ? 1 : 0 ); + aReturn <<= (sal_Int16)( CellBindingHelper::isCellIntegerBinding( xBinding ) ? 1 : 0 ); } break; @@ -313,7 +313,7 @@ namespace pcr if ( xBinding.is() ) { bool bNeedIntegerBinding = ( nExchangeType == 1 ); - if ( (bool)bNeedIntegerBinding != m_pHelper->isCellIntegerBinding( xBinding ) ) + if ( (bool)bNeedIntegerBinding != CellBindingHelper::isCellIntegerBinding( xBinding ) ) { CellAddress aAddress; if ( m_pHelper->getAddressFromCellBinding( xBinding, aAddress ) ) diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 4e4684b2a5f1..234ac9158ab7 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -486,25 +486,25 @@ namespace pcr } - bool CellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) const + bool CellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) { return doesComponentSupport( _rxBinding.get(), SERVICE_SHEET_CELL_BINDING ); } - bool CellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) const + bool CellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) { return doesComponentSupport( _rxBinding.get(), SERVICE_SHEET_CELL_INT_BINDING ); } - bool CellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) const + bool CellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) { return doesComponentSupport( _rxSource.get(), SERVICE_SHEET_CELLRANGE_LISTSOURCE ); } - bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const + bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) { Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); bool bDoes = xSI.is() && xSI->supportsService( _rService ); diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx index a1f4d91b7397..89bf212a6e03 100644 --- a/extensions/source/propctrlr/cellbindinghelper.hxx +++ b/extensions/source/propctrlr/cellbindinghelper.hxx @@ -176,22 +176,22 @@ namespace pcr /** checks whether a given binding is a spreadsheet cell binding */ - bool isCellBinding( + static bool isCellBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding - ) const; + ); /** checks whether a given binding is a spreadsheet cell binding, exchanging integer values */ - bool isCellIntegerBinding( + static bool isCellIntegerBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding - ) const; + ); /** checks whether a given list source is a spreadsheet cell list source */ - bool isCellRangeListSource( + static bool isCellRangeListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource - ) const; + ); /** retrieves the index of the sheet which our control belongs to @return the index of the sheet which our control belongs to or -1, if an error occurred @@ -222,10 +222,10 @@ namespace pcr /** checkes whether a given component supports a given servive */ - bool doesComponentSupport( + static bool doesComponentSupport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, const OUString& _rService - ) const; + ); /** uses the document (it's factory interface, respectively) to create a component instance @param _rService diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index 2fafe3d979a4..87ab132ede49 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -71,8 +71,8 @@ namespace pcr void create( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxUI ); private: - vcl::Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + static vcl::Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + static OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); }; diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 5afa1589ad87..e1f261ad0c45 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -605,7 +605,7 @@ namespace pcr } - OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const + OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) { OUString sUIName; try diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index 903db5c3a9a2..a607e918f4c4 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -186,11 +186,11 @@ namespace pcr @see getModelElementFromUIName @see getAllElementUINames */ - OUString + static OUString getModelElementUIName( const ModelElementType _eType, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement - ) const; + ); /** retrieves the submission object for an UI name diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index c52fe33a7e71..47e5e30c81ed 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -367,7 +367,7 @@ namespace pcr { Reference< XPropertySet > xListSourceBinding( _rPropertyValue, UNO_QUERY ); if ( xListSourceBinding.is() ) - aReturn <<= m_pHelper->getModelElementUIName( EFormsHelper::Binding, xListSourceBinding ); + aReturn <<= EFormsHelper::getModelElementUIName( EFormsHelper::Binding, xListSourceBinding ); } break; diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 81716b251d5d..3a7d97003c6d 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -362,7 +362,7 @@ namespace pcr } - OUString FormLinkDialog::getFormDataSourceType( const Reference< XPropertySet >& _rxForm ) const + OUString FormLinkDialog::getFormDataSourceType( const Reference< XPropertySet >& _rxForm ) { OUString sReturn; if ( !_rxForm.is() ) @@ -453,7 +453,7 @@ namespace pcr } - void FormLinkDialog::getConnectionMetaData( const Reference< XPropertySet >& _rxFormProps, Reference< XDatabaseMetaData >& /* [out] */ _rxMeta ) const + void FormLinkDialog::getConnectionMetaData( const Reference< XPropertySet >& _rxFormProps, Reference< XDatabaseMetaData >& /* [out] */ _rxMeta ) { if ( _rxFormProps.is() ) { @@ -495,7 +495,7 @@ namespace pcr bool FormLinkDialog::getExistingRelation( const Reference< XPropertySet >& _rxLHS, const Reference< XPropertySet >& /*_rxRHS*/, // TODO: fix the usage of _rxRHS. This is issue #i81956#. - Sequence< OUString >& _rLeftFields, Sequence< OUString >& _rRightFields ) const + Sequence< OUString >& _rLeftFields, Sequence< OUString >& _rRightFields ) { try { diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 94b386e7108f..6dd94e915dd4 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -101,9 +101,9 @@ namespace pcr ::com::sun::star::uno::Sequence< OUString >& _rMasterFields ); - OUString getFormDataSourceType( + static OUString getFormDataSourceType( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm - ) const; + ); void getFormFields( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, @@ -115,19 +115,19 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& /* [out] */ _rxConnection ) const; - void getConnectionMetaData( + static void getConnectionMetaData( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& /* [out] */ _rxMeta - ) const; + ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCanonicUnderlyingTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps ) const; - bool getExistingRelation( + static bool getExistingRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxLHS, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRHS, ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rLeftFields, ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rRightFields - ) const; + ); }; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 4a87e124a567..5fcafaf92c64 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -340,7 +340,15 @@ namespace pcr void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { - forEachPage( &OPropertyEditor::setHelpSectionText, &_rHelpText ); + sal_uInt16 nCount = m_aTabControl.GetPageCount(); + for ( sal_uInt16 i=0; i<nCount; ++i ) + { + sal_uInt16 nID = m_aTabControl.GetPageId(i); + OBrowserPage* pPage = static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( nID ) ); + if ( !pPage ) + continue; + setHelpSectionText( *pPage, &_rHelpText ); + } } diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index bc49d2012fd1..18861826ed7a 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -134,7 +134,7 @@ namespace pcr void setPageLineListener( OBrowserPage& _rPage, const void* ); void setPageControlObserver( OBrowserPage& _rPage, const void* ); void enableHelpSection( OBrowserPage& _rPage, const void* ); - void setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString ); + static void setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString ); void setHelpLineLimits( OBrowserPage& _rPage, const void* ); protected: diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index ba0cad91bf67..3a658a1c391b 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -96,7 +96,7 @@ private: @return <TRUE/> if and only if the value could be converted */ - bool convertGenericValueToString( + static bool convertGenericValueToString( const uno::Any& _rValue, OUString& _rStringRep ); @@ -109,7 +109,7 @@ private: @return <TRUE/> if and only if the value could be converted */ - bool convertStringToGenericValue( + static bool convertStringToGenericValue( const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index e338f58f957a..5d8cb73af831 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -403,7 +403,7 @@ namespace pcr { Reference< XPropertySet > xSubmission( _rPropertyValue, UNO_QUERY ); if ( xSubmission.is() ) - aControlValue <<= m_pHelper->getModelElementUIName( EFormsHelper::Submission, xSubmission ); + aControlValue <<= EFormsHelper::getModelElementUIName( EFormsHelper::Submission, xSubmission ); } break; diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index 4aafb1f660d3..8293553a8b3c 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -372,7 +372,7 @@ namespace pcr } - OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) { OUString sReturn; OSL_ENSURE( _rxRepository.is(), "XSDValidationHelper::getBasicTypeNameForClass: invalid repository!" ); diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index f6e977247e7d..a14c905a6817 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx @@ -124,11 +124,11 @@ namespace pcr /** retrieves the name of the basic data type which has the given class, in the given repository */ - OUString + static OUString getBasicTypeNameForClass( sal_Int16 _nClass, ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > _rxRepository - ) const; + ); }; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 59339eb88e4c..477613eac120 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -559,7 +559,7 @@ class FilterCache : public BaseLock /** TODO document me */ - void removeStatePropsFromItem(CacheItem& aValue) + static void removeStatePropsFromItem(CacheItem& aValue) throw(css::uno::Exception); @@ -886,7 +886,7 @@ class FilterCache : public BaseLock @throws An exception if anything failed inside this operation. e.g. the given configuration set was not open. */ - EItemFlushState impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , + static EItemFlushState impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, const OUString& sItem) throw(css::uno::Exception); @@ -901,7 +901,7 @@ class FilterCache : public BaseLock /** TODO */ - void impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, + static void impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, const CacheItem& rItem) throw(css::uno::Exception); @@ -931,7 +931,7 @@ class FilterCache : public BaseLock /** TODO */ - OUStringList impl_tokenizeString(const OUString& sData , + static OUStringList impl_tokenizeString(const OUString& sData , sal_Unicode cSeparator); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 2cc7605ceb05..b06d15100fd6 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -145,7 +145,7 @@ private: @param rDescriptor a stl representation of the MediaDescriptor as in/out parameter. */ - void impl_seekStreamToZero(utl::MediaDescriptor& rDescriptor); + static void impl_seekStreamToZero(utl::MediaDescriptor& rDescriptor); @@ -282,7 +282,7 @@ private: reference to the MediaDescriptor (represented by an easy-to-use stl interface!), which should be patched. */ - void impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor); + static void impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor); diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx index 751178569f0e..ebf26e105599 100644 --- a/filter/source/graphicfilter/icgm/elements.hxx +++ b/filter/source/graphicfilter/icgm/elements.hxx @@ -131,9 +131,9 @@ class CGMElements CGMElements& operator=( CGMElements& ); void Init(); Bundle* GetBundleIndex( long nIndex, BundleList&, Bundle& ); - Bundle* GetBundle( BundleList& rList, long nIndex ); + static Bundle* GetBundle( BundleList& rList, long nIndex ); Bundle* InsertBundle( BundleList&, Bundle& ); - void DeleteAllBundles( BundleList& ); + static void DeleteAllBundles( BundleList& ); void CopyAllBundles( BundleList& Source, BundleList& Dest ); }; diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index d72aa9a7ebfb..757571064b0f 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -244,31 +244,31 @@ namespace treeview { private: std::vector< rtl::Reference< TVRead > > Elements; - ConfigData init( + static ConfigData init( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getConfiguration( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) const; + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > + static ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxProvider, - const char* file ) const; + const char* file ); - OUString - getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, - const char* key ) const; + static OUString + getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, + const char* key ); - bool - getBooleanKey( + static bool + getBooleanKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, - const char* key) const; + const char* key); - void subst( OUString& instpath ) const; + static void subst( OUString& instpath ); - bool SearchAndInsert(TVDom* p, TVDom* tvDom); + bool SearchAndInsert(TVDom* p, TVDom* tvDom); - void Check(TVDom* tvDom); + void Check(TVDom* tvDom); }; // end class TVChildTarget @@ -287,7 +287,7 @@ namespace treeview { void init(); private: - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage + static com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage ( const com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 29eeea1b7198..95f0be7e3868 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -231,7 +231,7 @@ namespace chelp { * The returned string maybe empty */ - OUString country( const OUString& Language ); + static OUString country( const OUString& Language ); void replaceName( OUString& oustring ) const; @@ -349,7 +349,7 @@ namespace chelp { void init(); private: - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage + static com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage ( const com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 7bf3fe11c2d9..bdfaa38d84dd 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -79,7 +79,7 @@ namespace helpdatafileproxy { int m_nItRead; int m_iItPos; - bool implReadLenAndData( const char* pData, int& riPos, HDFData& rValue ); + static bool implReadLenAndData( const char* pData, int& riPos, HDFData& rValue ); public: //HDFHelp must get a fileURL which can then directly be used by simple file access. diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 0aa8584613d0..781554d8a445 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -368,7 +368,7 @@ ContentProvider::getConfiguration() const uno::Reference< container::XHierarchicalNameAccess > ContentProvider::getHierAccess( const uno::Reference< lang::XMultiServiceFactory >& sProvider, - const char* file ) const + const char* file ) { uno::Reference< container::XHierarchicalNameAccess > xHierAccess; @@ -399,7 +399,7 @@ ContentProvider::getHierAccess( OUString ContentProvider::getKey( const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess, - const char* key ) const + const char* key ) { OUString instPath; if( xHierAccess.is() ) @@ -422,7 +422,7 @@ ContentProvider::getKey( bool ContentProvider::getBooleanKey( const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess, - const char* key ) const + const char* key ) { bool ret = false; if( xHierAccess.is() ) @@ -442,7 +442,7 @@ ContentProvider::getBooleanKey( return ret; } -void ContentProvider::subst( OUString& instpath ) const +void ContentProvider::subst( OUString& instpath ) { SvtPathOptions aOptions; instpath = aOptions.SubstituteVariable( instpath ); diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index 5a71b07159b4..0e3994d136fb 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -160,21 +160,21 @@ namespace chelp { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getConfiguration() const; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > + static ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& sProvider, - const char* file ) const; + const char* file ); - OUString + static OUString getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, - const char* key ) const; + const char* key ); - bool - getBooleanKey( + static bool + getBooleanKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, - const char* key) const; + const char* key); - void subst( OUString& instpath ) const; + static void subst( OUString& instpath ); }; } diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 5d6ebbd1f71c..ea779f6eee36 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -769,7 +769,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) } Reference< XMultiServiceFactory > -TVChildTarget::getConfiguration(const Reference< XComponentContext >& rxContext) const +TVChildTarget::getConfiguration(const Reference< XComponentContext >& rxContext) { Reference< XMultiServiceFactory > xProvider; if( rxContext.is() ) @@ -789,7 +789,7 @@ TVChildTarget::getConfiguration(const Reference< XComponentContext >& rxContext) Reference< XHierarchicalNameAccess > TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider, - const char* file ) const + const char* file ) { Reference< XHierarchicalNameAccess > xHierAccess; @@ -818,7 +818,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider OUString TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess, - const char* key ) const + const char* key ) { OUString instPath; if( xHierAccess.is() ) @@ -840,7 +840,7 @@ TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess, bool TVChildTarget::getBooleanKey(const Reference< XHierarchicalNameAccess >& xHierAccess, - const char* key) const + const char* key) { bool ret = false; if( xHierAccess.is() ) @@ -860,7 +860,7 @@ TVChildTarget::getBooleanKey(const Reference< return ret; } -void TVChildTarget::subst( OUString& instpath ) const +void TVChildTarget::subst( OUString& instpath ) { SvtPathOptions aOptions; instpath = aOptions.SubstituteVariable( instpath ); |