diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-07 11:35:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-08 08:49:02 +0100 |
commit | 9a3810ba9b8b52096bee29e83d1eb5ce57512270 (patch) | |
tree | 03d49c1a0a145eeb55402a7ef50c24567df6318e | |
parent | 0d43023ed4bc14207b9ba15367b123f2af739d1b (diff) |
pack some data structures
Change-Id: I7ef990b8aa7b26c413b54186c360ed3f858d4e26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88170
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | comphelper/source/container/enumhelper.cxx | 4 | ||||
-rw-r--r-- | include/comphelper/enumhelper.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/imp_op.hxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 6 |
4 files changed, 6 insertions, 8 deletions
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index 1267bb1e66d9..6c05c89d3cd7 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -135,8 +135,8 @@ void OEnumerationByName::impl_stopDisposeListening() } OEnumerationByIndex::OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess) - :m_nPos(0) - ,m_xAccess(_rxAccess) + :m_xAccess(_rxAccess) + ,m_nPos(0) ,m_bListening(false) { impl_startDisposeListening(); diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx index c9816cd3e055..16d95b76e808 100644 --- a/include/comphelper/enumhelper.hxx +++ b/include/comphelper/enumhelper.hxx @@ -73,8 +73,8 @@ class COMPHELPER_DLLPUBLIC OEnumerationByIndex final : private OEnumerationLock , public ::cppu::WeakImplHelper< css::container::XEnumeration , css::lang::XEventListener > { - sal_Int32 m_nPos; css::uno::Reference< css::container::XIndexAccess > m_xAccess; + sal_Int32 m_nPos; bool m_bListening; public: diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 2579446800b7..3edb96dfe75a 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -77,10 +77,10 @@ class ImportExcel : public ImportTyp, protected XclImpRoot protected: struct LastFormula { + sal_uInt16 mnXF; SCCOL mnCol; SCROW mnRow; double mfValue; - sal_uInt16 mnXF; ScFormulaCell* mpCell; }; typedef std::unordered_map<SCCOL, LastFormula> LastFormulaMapType; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ded90158472b..def37015ef50 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -206,14 +206,12 @@ SdrObjTransformInfoRec::SdrObjTransformInfoRec() : struct SdrObject::Impl { sdr::ObjectUserVector maObjectUsers; - + std::shared_ptr<DiagramDataInterface> mpDiagramData; o3tl::optional<double> mnRelativeWidth; - sal_Int16 meRelativeWidthRelation; o3tl::optional<double> mnRelativeHeight; + sal_Int16 meRelativeWidthRelation; sal_Int16 meRelativeHeightRelation; - std::shared_ptr<DiagramDataInterface> mpDiagramData; - Impl() : meRelativeWidthRelation(text::RelOrientation::PAGE_FRAME), meRelativeHeightRelation(text::RelOrientation::PAGE_FRAME) {} |