starmath/mathml/inc/mathmlexport.hxx | 6 +++--- starmath/mathml/inc/mathmlimport.hxx | 6 +++--- starmath/mathml/source/mathmlexport.cxx | 8 ++++---- starmath/mathml/source/mathmlimport.cxx | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-)
New commits: commit 160d406d5abdabf36e57e2d72b35d9b3fec52cbd Author: dante <dante19031...@gmail.com> AuthorDate: Tue Jan 19 12:53:38 2021 +0100 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Thu Jan 21 05:27:48 2021 +0100 Replace bbUseHTMLMLEntities with m_bUseHTMLMLEntities Change-Id: I3cc0b185de647333591ce28140b37f7e99a2520d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109628 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/starmath/mathml/inc/mathmlexport.hxx b/starmath/mathml/inc/mathmlexport.hxx index ed5a598d6abf..1a6072118991 100644 --- a/starmath/mathml/inc/mathmlexport.hxx +++ b/starmath/mathml/inc/mathmlexport.hxx @@ -46,19 +46,19 @@ class SmXMLExportWrapper private: // Use customized entities - bool bbUseHTMLMLEntities; + bool m_bUseHTMLMLEntities; public: explicit SmXMLExportWrapper(css::uno::Reference<css::frame::XModel> const& rRef) : xModel(rRef) , bFlat(true) - , bbUseHTMLMLEntities(false) + , m_bUseHTMLMLEntities(false) { } bool Export(SfxMedium& rMedium); void SetFlat(bool bIn) { bFlat = bIn; } - void useHTMLMLEntities(bool bUseHTMLMLEntities) { bbUseHTMLMLEntities = bUseHTMLMLEntities; } + void useHTMLMLEntities(bool bUseHTMLMLEntities) { m_bUseHTMLMLEntities = bUseHTMLMLEntities; } static bool WriteThroughComponent(const css::uno::Reference<css::io::XOutputStream>& xOutputStream, diff --git a/starmath/mathml/inc/mathmlimport.hxx b/starmath/mathml/inc/mathmlimport.hxx index af7611852adc..215948b4a3cb 100644 --- a/starmath/mathml/inc/mathmlimport.hxx +++ b/starmath/mathml/inc/mathmlimport.hxx @@ -44,17 +44,17 @@ class SmXMLImportWrapper private: // Use customized entities - bool bbUseHTMLMLEntities; + bool m_bUseHTMLMLEntities; public: explicit SmXMLImportWrapper(css::uno::Reference<css::frame::XModel> const& rRef) : xModel(rRef) - , bbUseHTMLMLEntities(false) + , m_bUseHTMLMLEntities(false) { } ErrCode Import(SfxMedium& rMedium); - void useHTMLMLEntities(bool bUseHTMLMLEntities) { bbUseHTMLMLEntities = bUseHTMLMLEntities; } + void useHTMLMLEntities(bool bUseHTMLMLEntities) { m_bUseHTMLMLEntities = bUseHTMLMLEntities; } static ErrCode ReadThroughComponent(const css::uno::Reference<css::io::XInputStream>& xInputStream, diff --git a/starmath/mathml/source/mathmlexport.cxx b/starmath/mathml/source/mathmlexport.cxx index 2936b7fba5be..2c621217504f 100644 --- a/starmath/mathml/source/mathmlexport.cxx +++ b/starmath/mathml/source/mathmlexport.cxx @@ -187,7 +187,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) bRet = WriteThroughComponent(xStg, xModelComp, "meta.xml", xContext, xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaExporter" : "com.sun.star.comp.Math.XMLMetaExporter"), - bbUseHTMLMLEntities); + m_bUseHTMLMLEntities); } if (bRet) { @@ -196,7 +196,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) bRet = WriteThroughComponent(xStg, xModelComp, "content.xml", xContext, xInfoSet, "com.sun.star.comp.Math.XMLContentExporter", - bbUseHTMLMLEntities); + m_bUseHTMLMLEntities); } if (bRet) @@ -207,7 +207,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) bRet = WriteThroughComponent(xStg, xModelComp, "settings.xml", xContext, xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisSettingsExporter" : "com.sun.star.comp.Math.XMLSettingsExporter"), - bbUseHTMLMLEntities); + m_bUseHTMLMLEntities); } } else @@ -220,7 +220,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) bRet = WriteThroughComponent(xOut, xModelComp, xContext, xInfoSet, "com.sun.star.comp.Math.XMLContentExporter", - bbUseHTMLMLEntities); + m_bUseHTMLMLEntities); } if (xStatusIndicator.is()) diff --git a/starmath/mathml/source/mathmlimport.cxx b/starmath/mathml/source/mathmlimport.cxx index cbdfcc52abb1..061af451bf3a 100644 --- a/starmath/mathml/source/mathmlimport.cxx +++ b/starmath/mathml/source/mathmlimport.cxx @@ -188,7 +188,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) = ReadThroughComponent(rMedium.GetStorage(), xModelComp, "meta.xml", xContext, xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaImporter" : "com.sun.star.comp.Math.XMLMetaImporter"), - bbUseHTMLMLEntities); + m_bUseHTMLMLEntities); if (nWarn != ERRCODE_IO_BROKENPACKAGE) { @@ -199,7 +199,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisSettingsImporter" : "com.sun.star.comp.Math.XMLSettingsImporter"), - bbUseHTMLMLEntities); + m_bUseHTMLMLEntities); if (nWarn != ERRCODE_IO_BROKENPACKAGE) { @@ -208,7 +208,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) nError = ReadThroughComponent( rMedium.GetStorage(), xModelComp, "content.xml", xContext, xInfoSet, - "com.sun.star.comp.Math.XMLImporter", bbUseHTMLMLEntities); + "com.sun.star.comp.Math.XMLImporter", m_bUseHTMLMLEntities); } else nError = ERRCODE_IO_BROKENPACKAGE; @@ -226,7 +226,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) nError = ReadThroughComponent(xInputStream, xModelComp, xContext, xInfoSet, "com.sun.star.comp.Math.XMLImporter", false, - bbUseHTMLMLEntities); + m_bUseHTMLMLEntities); } if (xStatusIndicator.is()) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits