diff options
| -rw-r--r-- | include/xmloff/ImageStyle.hxx | 8 | ||||
| -rw-r--r-- | include/xmloff/shapeexport.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmlnume.hxx | 2 | ||||
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/FillStyleContext.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx index 62becb835fa5..2fd3f0167583 100644 --- a/include/xmloff/ImageStyle.hxx +++ b/include/xmloff/ImageStyle.hxx @@ -37,14 +37,14 @@ public: XMLImageStyle(); ~XMLImageStyle(); - void exportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport ); - void importXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); + static void exportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport ); + static void importXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); private: - SAL_DLLPRIVATE void ImpExportXML( const OUString& rStrName, const css::uno::Any& rValue, + SAL_DLLPRIVATE static void ImpExportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport ); - SAL_DLLPRIVATE bool ImpImportXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + SAL_DLLPRIVATE static bool ImpImportXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); }; diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index 8b25a5b5e5fd..2d741ca0b329 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -211,7 +211,7 @@ private: SAL_DLLPRIVATE void ImpExportNewTrans(const css::uno::Reference< css::beans::XPropertySet >& xPropSet, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint); SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const css::uno::Reference< css::beans::XPropertySet >& xPropSet); - SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, css::awt::Point* pRefPoint); + SAL_DLLPRIVATE static void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, css::awt::Point* pRefPoint); SAL_DLLPRIVATE void ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTRScale, double fTRShear, double fTRRotate, ::basegfx::B2DTuple& rTRTranslate, const XMLShapeExportFlags nFeatures); SAL_DLLPRIVATE bool ImpExportPresentationAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet, const OUString& rClass ); SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference< css::drawing::XShape >& xShape, TextPNS eExtensionNS = TextPNS::ODF ); diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx index 9fe84190e0d4..e8b430cebc63 100644 --- a/include/xmloff/xmlnume.hxx +++ b/include/xmloff/xmlnume.hxx @@ -57,7 +57,7 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport protected: /// Override this to add attributes to the <list-style> element. - SAL_DLLPRIVATE void AddListStyleAttributes(); + SAL_DLLPRIVATE static void AddListStyleAttributes(); SAL_DLLPRIVATE void exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle ); SAL_DLLPRIVATE void exportOutline(); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 6758df226d24..42be779677cc 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1641,7 +1641,7 @@ void SvXMLExport::ExportStyles_( bool ) { uno::Any aValue = xBitmap->getByName( rStrName ); - aImageStyle.exportXML( rStrName, aValue, *this ); + XMLImageStyle::exportXML( rStrName, aValue, *this ); } catch(const container::NoSuchElementException&) { diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 3c8dd438ee23..1c02a68e77b0 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -126,7 +126,7 @@ XMLBitmapStyleContext::XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 n { // start import XMLImageStyle aBitmapStyle; - aBitmapStyle.importXML( xAttrList, maAny, maStrName, rImport ); + XMLImageStyle::importXML( xAttrList, maAny, maStrName, rImport ); } XMLBitmapStyleContext::~XMLBitmapStyleContext() |