diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-15 12:23:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-16 07:26:27 +0100 |
| commit | a2751c0795cdac9d78f8919aab319a418b6e0bbc (patch) | |
| tree | 1396e27bd0e86536b9a29f08192f3d7eaeff2c8a /xmloff | |
| parent | a04340a08c9f2a0e7208f3109fbcc97ab19fccb3 (diff) | |
loplugin:staticmethods improvement
Change-Id: I8889ce8a7d2309b54454cfe4c6421282e1c6e755
Reviewed-on: https://gerrit.libreoffice.org/63434
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/txtflde.hxx | 16 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 2 |
2 files changed, 9 insertions, 9 deletions
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 |