diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/xmloff/SettingsExportHelper.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/formlayerexport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/formlayerimport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/nmspmap.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/prstylei.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/shapeimport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/txtimp.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/txtimppr.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/xmlimp.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmluconv.hxx | 4 |
10 files changed, 15 insertions, 15 deletions
diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx index 32677e095c75..97cacb5dbba6 100644 --- a/include/xmloff/SettingsExportHelper.hxx +++ b/include/xmloff/SettingsExportHelper.hxx @@ -60,7 +60,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper const OUString& rName) const; void exportBool(const bool bValue, const OUString& rName) const; - void exportByte(const sal_Int8 nValue, const OUString& rName) const; + static void exportByte(const sal_Int8 nValue, const OUString& rName); void exportShort(const sal_Int16 nValue, const OUString& rName) const; void exportInt(const sal_Int32 nValue, const OUString& rName) const; void exportLong(const sal_Int64 nValue, const OUString& rName) const; diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 7aaf8a5af969..05c0a69792fb 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -142,7 +142,7 @@ namespace xmloff /** determines whether the given page contains logical forms */ - bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ) const; + static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ); /** determines whether the given page contains XForm instances */ diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 084f3f32707c..dcb35932488a 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -65,7 +65,7 @@ namespace xmloff /** creates an import context for the office:forms element */ - SvXMLImportContext* createOfficeFormsContext( + static SvXMLImportContext* createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName); diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index e72be961c891..a99c66270299 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -136,7 +136,7 @@ public: /* deprecated */ bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix, const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); -/* deprecated */ sal_uInt16 GetIndexByKey( sal_uInt16 nKey ) const; +/* deprecated */ static sal_uInt16 GetIndexByKey( sal_uInt16 nKey ); /* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const; /* deprecated */ sal_uInt16 GetFirstIndex() const; /* deprecated */ sal_uInt16 GetNextIndex( sal_uInt16 nOldIdx ) const; diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 583f3557843e..8ce29d50ed2b 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -78,10 +78,10 @@ protected: bool translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames(); //UUUU provider for often used sets - const OldFillStyleDefinitionSet& getStandardSet(); - const OldFillStyleDefinitionSet& getHeaderSet(); - const OldFillStyleDefinitionSet& getFooterSet(); - const OldFillStyleDefinitionSet& getParaSet(); + static const OldFillStyleDefinitionSet& getStandardSet(); + static const OldFillStyleDefinitionSet& getHeaderSet(); + static const OldFillStyleDefinitionSet& getFooterSet(); + static const OldFillStyleDefinitionSet& getParaSet(); virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index a6d3a25ddbd9..de960236ac86 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -327,7 +327,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList); - SvXMLImportContext* CreateFrameChildContext( + static SvXMLImportContext* CreateFrameChildContext( SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 03b2319ce069..e179fd4c257d 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -375,7 +375,7 @@ private: /// ugly, but implementation of this is in XMLPropertyBackpatcher.cxx struct BackpatcherImpl; std::shared_ptr<BackpatcherImpl> m_xBackpatcherImpl; - std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl(); + static std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl(); protected: virtual SvXMLImportContext *CreateTableChildContext( diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx index baa7cee25dca..9a2e0293efdc 100644 --- a/include/xmloff/txtimppr.hxx +++ b/include/xmloff/txtimppr.hxx @@ -29,12 +29,12 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyM sal_Int32 nSizeTypeIndex; sal_Int32 nWidthTypeIndex; - void FontFinished( + static void FontFinished( XMLPropertyState *pFontFamilyNameState, XMLPropertyState *pFontStyleNameState, XMLPropertyState *pFontFamilyState, XMLPropertyState *pFontPitchState, - XMLPropertyState *pFontCharsetState ) const; + XMLPropertyState *pFontCharsetState ); void FontDefaultsCheck( XMLPropertyState*pFontFamilyName, diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index d4faf1002ec9..7b94d38e05cd 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -180,7 +180,7 @@ protected: inline bool HasShapeImport() const { return mxShapeImport.is(); } inline void ClearShapeImport() { mxShapeImport = 0; } - SchXMLImportHelper* CreateChartImport(); + static SchXMLImportHelper* CreateChartImport(); ::xmloff::OFormLayerXMLImport* CreateFormImport(); void SetFontDecls( XMLFontStylesContext *pFontDecls ); diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 00d8a34521aa..66698fa05413 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -207,8 +207,8 @@ public: /** convert NumberingType to num-forat and num-letter-sync values */ void convertNumFormat( OUStringBuffer& rBuffer, sal_Int16 nType ) const; - void convertNumLetterSync( OUStringBuffer& rBuffer, - sal_Int16 nType ) const; + static void convertNumLetterSync( OUStringBuffer& rBuffer, + sal_Int16 nType ); static void convertPropertySet(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& aProperties); |