diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-22 16:10:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-23 06:46:41 +0200 |
| commit | ea20fcce1dac735a9730ab6672bf60ccec595e71 (patch) | |
| tree | df8f25ec6a90f47fb878236e239f8a23e679943c /sc/inc | |
| parent | a17b19726d723b16dacb49db7a8efd5fee9cb4cf (diff) | |
close some more holes in structures
and improve the pahole script so I can just run it once over the whole
codebase
Change-Id: I7e1775974a3a61f8c0e40646158f01163ace60cc
Reviewed-on: https://gerrit.libreoffice.org/76122
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/colorscale.hxx | 4 | ||||
| -rw-r--r-- | sc/inc/pivot.hxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index aa3e6f6e7e60..236dac698c54 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -43,11 +43,11 @@ class SC_DLLPUBLIC ScColorScaleEntry { private: double mnVal; - Color maColor; std::unique_ptr<ScFormulaCell> mpCell; std::unique_ptr<ScFormulaListener> mpListener; - ScColorScaleEntryType meType; ScConditionalFormat* mpFormat; + Color maColor; + ScColorScaleEntryType meType; void setListener(); diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index c374c952641e..2dcb9b2f1e0b 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -114,13 +114,13 @@ typedef std::vector< std::unique_ptr<ScDPLabelData> > ScDPLabelDataVector; struct ScPivotField { - SCCOL nCol; ///< 0-based dimension index (not source column index) + css::sheet::DataPilotFieldReference maFieldRef; + long mnOriginalDim; ///< >= 0 for duplicated field. PivotFunc nFuncMask; + SCCOL nCol; ///< 0-based dimension index (not source column index) sal_uInt8 mnDupCount; - css::sheet::DataPilotFieldReference maFieldRef; - explicit ScPivotField( SCCOL nNewCol = 0 ); ScPivotField( const ScPivotField& r ); @@ -156,13 +156,13 @@ struct ScPivotParam struct ScPivotFuncData { - SCCOL mnCol; + css::sheet::DataPilotFieldReference maFieldRef; + long mnOriginalDim; PivotFunc mnFuncMask; + SCCOL mnCol; sal_uInt8 mnDupCount; - css::sheet::DataPilotFieldReference maFieldRef; - explicit ScPivotFuncData( SCCOL nCol, PivotFunc nFuncMask ); #if DEBUG_PIVOT_TABLE |