diff options
Diffstat (limited to 'sc/source/filter/inc')
53 files changed, 216 insertions, 216 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 5ac54f447bee..50e46cd0df82 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -44,7 +44,7 @@ public: class XclExpUserBView : public ExcRecord { private: - XclExpString sUsername; + XclExpString const sUsername; sal_uInt8 aGUID[ 16 ]; virtual void SaveCont( XclExpStream& rStrm ) override; @@ -159,7 +159,7 @@ public: class XclExpChTrEmpty : public ExcRecord { private: - sal_uInt16 nRecNum; + sal_uInt16 const nRecNum; public: XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} @@ -188,8 +188,8 @@ public: class XclExpChTr0x0194 : public ExcRecord { private: - XclExpString sUsername; - DateTime aDateTime; + XclExpString const sUsername; + DateTime const aDateTime; virtual void SaveCont( XclExpStream& rStrm ) override; @@ -244,10 +244,10 @@ class XclExpChTrAction; class XclExpXmlChTrHeader : public ExcXmlRecord { - OUString maUserName; - DateTime maDateTime; + OUString const maUserName; + DateTime const maDateTime; sal_uInt8 maGUID[16]; - sal_Int32 mnLogNumber; + sal_Int32 const mnLogNumber; sal_uInt32 mnMinAction; sal_uInt32 mnMaxAction; @@ -269,8 +269,8 @@ public: class XclExpChTrInfo : public ExcRecord { private: - XclExpString sUsername; - DateTime aDateTime; + XclExpString const sUsername; + DateTime const aDateTime; sal_uInt8 aGUID[ 16 ]; virtual void SaveCont( XclExpStream& rStrm ) override; @@ -293,7 +293,7 @@ private: std::unique_ptr<sal_uInt16[]> pBuffer; sal_uInt16* pLast; - sal_uInt16 nBufSize; + sal_uInt16 const nBufSize; sal_uInt16 nLastId; public: @@ -341,12 +341,12 @@ public: class XclExpChTrAction : public ExcRecord { private: - OUString sUsername; + OUString const sUsername; DateTime aDateTime; sal_uInt32 nIndex; // action number std::unique_ptr<XclExpChTrAction> pAddAction; // additional record for this action - bool bAccepted; + bool const bAccepted; protected: const XclExpTabInfo& rTabInfo; // for table num export (sc num -> xcl num) @@ -465,7 +465,7 @@ class XclExpChTrCellContent final : public XclExpChTrAction, protected XclExpRoo std::unique_ptr<XclExpChTrData> pOldData; std::unique_ptr<XclExpChTrData> pNewData; sal_uInt16 nOldLength; // this is not the record size - ScAddress aPosition; + ScAddress const aPosition; static void MakeEmptyChTrData( std::unique_ptr<XclExpChTrData>& rpData ); @@ -522,7 +522,7 @@ public: class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot { private: - SCTAB nTab; + SCTAB const nTab; protected: virtual void SaveActionData( XclExpStream& rStrm ) const override; @@ -545,7 +545,7 @@ public: class XclExpChTrMoveRange final : public XclExpChTrAction { ScRange aSourceRange; - ScRange aDestRange; + ScRange const aDestRange; virtual void SaveActionData( XclExpStream& rStrm ) const override; virtual void PrepareSaveAction( XclExpStream& rStrm ) const override; diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index e2d9f3255ac5..c80012a9ac68 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -39,7 +39,7 @@ struct CommentModel bool mbRowHidden; /// Comment cell's Row is Hidden sal_Int32 mnTHA; /// Horizontal Alignment sal_Int32 mnTVA; /// Vertical Alignment - css::awt::Rectangle maAnchor; /// Anchor parameters + css::awt::Rectangle const maAnchor; /// Anchor parameters explicit CommentModel(); }; diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 26e246e75f8d..d67f648e8086 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -253,7 +253,7 @@ class ExtCfDataBarRule : public WorksheetHelper }; ExCfRuleModel maModel; RuleType mnRuleType; - ScDataBarFormatData* mpTarget; + ScDataBarFormatData* const mpTarget; public: ExtCfDataBarRule(ScDataBarFormatData* pTarget, const WorksheetHelper& rParent); @@ -276,7 +276,7 @@ public: private: std::vector< std::unique_ptr<ScFormatEntry> > maEntries; - ScRangeList maRange; + ScRangeList const maRange; }; typedef std::shared_ptr< CondFormat > CondFormatRef; diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index bcb68d9ba0b7..11d9b01a9f27 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -132,9 +132,9 @@ private: private: css::uno::Reference< css::container::XIndexContainer > mxCtrlFormIC; - sal_Int32 mnCtrlIndex; - sal_Int32 mnCtrlType; - sal_Int32 mnDropStyle; + sal_Int32 const mnCtrlIndex; + sal_Int32 const mnCtrlType; + sal_Int32 const mnDropStyle; }; class VmlDrawing : public ::oox::vml::Drawing, public WorksheetHelper @@ -187,7 +187,7 @@ private: const ::oox::vml::ShapeBase& rShape ) const; private: - ::oox::ole::ControlConverter maControlConv; + ::oox::ole::ControlConverter const maControlConv; ::oox::vml::TextFontModel maListBoxFont; }; diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 3a1a44dac6f3..681ebb516f3b 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -100,7 +100,7 @@ class ScEEParser protected: EditEngine* pEdit; SfxItemPool* pPool; - SfxItemPool* pDocPool; + SfxItemPool* const pDocPool; std::vector<std::shared_ptr<ScEEParseEntry>> maList; std::shared_ptr<ScEEParseEntry> mxActEntry; ColWidthsMap maColWidths; diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index 0e7cbb798963..bef6e43756ef 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -48,8 +48,8 @@ private: XclExpRecordList<> aRecList; XclExpCellTableRef mxCellTable; - SCTAB mnScTab; // table number SC document - sal_uInt16 nExcTab; // table number Excel document + SCTAB const mnScTab; // table number SC document + sal_uInt16 const nExcTab; // table number Excel document XclExpNoteListRef mxNoteList; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 4851952b4f0c..cde21d76c12e 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -38,7 +38,7 @@ protected: static const sal_uInt16 nRowMask; - XclFunctionProvider maFuncProv; + XclFunctionProvider const maFuncProv; const XclBiff meBiff; void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs ); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index dadeef2ae165..74a21cbfa563 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -175,7 +175,7 @@ class XclExpProtection : public XclExpBoolRecord class XclExpSheetProtection : public XclExpProtection { - SCTAB mnTab; + SCTAB const mnTab; public: XclExpSheetProtection(bool bValue, SCTAB nTab); virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -238,7 +238,7 @@ protected: sal_uInt64 m_nStrPos; sal_uInt64 m_nOwnPos; // Position after # and Len sal_uInt16 nGrbit; - SCTAB nTab; + SCTAB const nTab; ExcBundlesheetBase(); @@ -310,10 +310,10 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - SCTAB mnScTab; + SCTAB const mnScTab; XclExpFilterManager* mpManager; - bool mbFitToPage; - Color maTabColor; + bool const mbFitToPage; + Color const maTabColor; }; class XclExpFiltermode : public XclExpEmptyRecord @@ -331,7 +331,7 @@ public: SCCOL GetColCount() const { return static_cast< SCCOL >( GetValue() ); } private: - ScAddress maStartPos; + ScAddress const maStartPos; }; class ExcFilterCondition diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx index 554a01674c68..e8e233148897 100644 --- a/sc/source/filter/inc/expbase.hxx +++ b/sc/source/filter/inc/expbase.hxx @@ -32,7 +32,7 @@ class ScExportBase protected: SvStream& rStrm; - ScRange aRange; + ScRange const aRange; ScDocument* pDoc; SvNumberFormatter* pFormatter; std::unique_ptr<ScFieldEditEngine> diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index 84b08bd54a02..567ab3c93b5b 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -34,7 +34,7 @@ public: virtual void onStartElement( const AttributeList& rAttribs ) override; private: - ScDataBarFormatData* mpTarget; + ScDataBarFormatData* const mpTarget; bool mbFirstEntry; }; diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index fcc02dcd0c00..0ca479d88006 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -523,7 +523,7 @@ public: private: const FunctionParamInfo* mpParamInfo; const FunctionParamInfo* mpParamInfoEnd; - bool mbParamPairs; + bool const mbParamPairs; }; // Base function provider ===================================================== @@ -563,7 +563,7 @@ protected: private: typedef std::shared_ptr< FunctionProviderImpl > FunctionProviderImplRef; - FunctionProviderImplRef mxFuncImpl; /// Shared implementation between all copies of the provider. + FunctionProviderImplRef const mxFuncImpl; /// Shared implementation between all copies of the provider. }; // Op-code and function provider ============================================== @@ -598,7 +598,7 @@ public: private: typedef std::shared_ptr< OpCodeProviderImpl > OpCodeProviderImplRef; - OpCodeProviderImplRef mxOpCodeImpl; /// Shared implementation between all copies of the provider. + OpCodeProviderImplRef const mxOpCodeImpl; /// Shared implementation between all copies of the provider. }; // API formula parser wrapper ================================================= diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 3d6a9f8d9b94..35c117315550 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -24,9 +24,9 @@ public: */ struct SharedFormulaEntry { - ScAddress maAddress; - OUString maTokenStr; - sal_Int32 mnSharedId; + ScAddress const maAddress; + OUString const maTokenStr; + sal_Int32 const mnSharedId; SharedFormulaEntry( const ScAddress& rAddress, @@ -38,10 +38,10 @@ public: */ struct SharedFormulaDesc { - ScAddress maAddress; - sal_Int32 mnSharedId; - OUString maCellValue; - sal_Int32 mnValueType; + ScAddress const maAddress; + sal_Int32 const mnSharedId; + OUString const maCellValue; + sal_Int32 const mnValueType; SharedFormulaDesc( const ScAddress& rAddr, sal_Int32 nSharedId, @@ -50,15 +50,15 @@ public: struct TokenAddressItem { - OUString maTokenStr; - ScAddress maAddress; + OUString const maTokenStr; + ScAddress const maAddress; TokenAddressItem( const OUString& rTokenStr, const ScAddress& rAddress ) : maTokenStr( rTokenStr ), maAddress( rAddress ) {} }; struct TokenRangeAddressItem { - TokenAddressItem maTokenAndAddress; - ScRange maRange; + TokenAddressItem const maTokenAndAddress; + ScRange const maRange; TokenRangeAddressItem( const TokenAddressItem& rTokenAndAddress, const ScRange& rRange ) : maTokenAndAddress( rTokenAndAddress ), maRange( rRange ) {} }; diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index ec2d1d8ac14f..42a4b50a1482 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -155,7 +155,7 @@ private: typedef ::std::unique_ptr< ScfProgressBar > ScfProgressBarPtr; ScfProgressBarPtr mxProgress; /// Pointer to sub progress bar for this segment. - std::size_t mnSize; /// Size of this segment. + std::size_t const mnSize; /// Size of this segment. std::size_t mnPos; /// Current position of this segment. explicit ScfProgressSegment( std::size_t nSize ); @@ -166,7 +166,7 @@ private: typedef std::vector< std::unique_ptr<ScfProgressSegment> > ScfSegmentList; ScfSegmentList maSegments; /// List of progress segments. - OUString maText; /// UI string for system progress. + OUString const maText; /// UI string for system progress. ScProgressPtr mxSysProgress; /// System progress bar. SfxObjectShell* mpDocShell; /// The document shell for the progress bar. diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 93d77baf2ecf..f0507cc1738d 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -72,11 +72,11 @@ struct ScHTMLStyle struct ScHTMLGraphEntry { - ScRange aRange; // mapped range - Size aSize; // size in pixels - Size aSpace; // spacing in pixels - SdrObject* pObject; - bool bInCell; // if output is in cell + ScRange const aRange; // mapped range + Size const aSize; // size in pixels + Size const aSpace; // spacing in pixels + SdrObject* const pObject; + bool const bInCell; // if output is in cell bool bWritten; ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange, @@ -109,7 +109,7 @@ class ScHTMLExport : public ScExportBase GraphEntryList aGraphList; ScHTMLStyle aHTMLStyle; OUString aBaseURL; - OUString aStreamPath; + OUString const aStreamPath; VclPtr<OutputDevice> pAppWin; // for Pixel-work FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet OUString aNonConvertibleChars; // collect nonconvertible characters @@ -117,10 +117,10 @@ class ScHTMLExport : public ScExportBase SCTAB nUsedTables; short nIndent; sal_Char sIndent[nIndentMax+1]; - bool bAll; // whole document + bool const bAll; // whole document bool bTabHasGraphics; bool bTabAlignedLeft; - bool bCalcAsShown; + bool const bCalcAsShown; bool bCopyLocalFileToINet; bool bTableDataHeight; bool mbSkipImages; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 8a1d26a89e2d..52e9c385c77f 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -97,18 +97,18 @@ typedef o3tl::sorted_vector<sal_uLong> ScHTMLColOffset; struct ScHTMLTableStackEntry { - ScRangeListRef xLockedList; + ScRangeListRef const xLockedList; std::shared_ptr<ScEEParseEntry> xCellEntry; ScHTMLColOffset* pLocalColOffset; - sal_uLong nFirstTableCell; - SCROW nRowCnt; - SCCOL nColCntStart; - SCCOL nMaxCol; - sal_uInt16 nTable; + sal_uLong const nFirstTableCell; + SCROW const nRowCnt; + SCCOL const nColCntStart; + SCCOL const nMaxCol; + sal_uInt16 const nTable; sal_uInt16 nTableWidth; sal_uInt16 nColOffset; - sal_uInt16 nColOffsetStart; - bool bFirstRow; + sal_uInt16 const nColOffsetStart; + bool const bFirstRow; ScHTMLTableStackEntry( const std::shared_ptr<ScEEParseEntry>& rE, const ScRangeListRef& rL, ScHTMLColOffset* pTO, sal_uLong nFTC, @@ -129,9 +129,9 @@ struct ScHTMLTableStackEntry struct ScHTMLAdjustStackEntry { - SCCOL nLastCol; - SCROW nNextRow; - SCROW nCurRow; + SCCOL const nLastCol; + SCROW const nNextRow; + SCROW const nCurRow; ScHTMLAdjustStackEntry( SCCOL nLCol, SCROW nNRow, SCROW nCRow ) : nLastCol( nLCol ), nNextRow( nNRow ), @@ -151,7 +151,7 @@ class ScHTMLLayoutParser : public ScHTMLParser { private: Size aPageSize; - OUString aBaseURL; + OUString const aBaseURL; ::std::stack< std::unique_ptr<ScHTMLTableStackEntry> > aTableStack; OUString aString; @@ -536,7 +536,7 @@ private: ScHTMLPos maDocBasePos; /// Resulting base address in a Calc document. ScHTMLParser* mpParser; bool mbBorderOn:1; /// true = Table borders on. - bool mbPreFormText:1; /// true = Table from preformatted text (<pre> tag). + bool const mbPreFormText:1; /// true = Table from preformatted text (<pre> tag). bool mbRowOn:1; /// true = Inside of <tr> </tr>. bool mbDataOn:1; /// true = Inside of <td> </td> or <th> </th>. bool mbPushEmptyLine:1; /// true = Insert empty line before current entry. diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 4e76ef0cb414..5cc550bc7c16 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -33,8 +33,8 @@ class ScTokenArray; class StringHashEntry { private: - OUString aString; - sal_uInt32 nHash; + OUString const aString; + sal_uInt32 const nHash; static sal_uInt32 MakeHashCode( const OUString& ); public: @@ -74,9 +74,9 @@ class RangeNameBufferWK3 final private: struct Entry { - StringHashEntry aStrHashEntry; + StringHashEntry const aStrHashEntry; ScComplexRefData aScComplexRefDataRel; - OUString aScAbsName; + OUString const aScAbsName; sal_uInt16 nAbsInd; // == 0 -> no Abs-Name yet! sal_uInt16 nRelInd; bool bSingleRef; @@ -127,8 +127,8 @@ class ExtSheetBuffer : public ExcRoot private: struct Cont { - OUString aFile; - OUString aTab; + OUString const aFile; + OUString const aTab; sal_uInt16 nTabNum; // 0xFFFF -> not set yet // 0xFFFE -> tried to set, but failed // 0xFFFD -> should be in the same workbook, but not found @@ -163,7 +163,7 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) struct ExtName { sal_uInt32 nStorageId; - sal_uInt16 nFlags; + sal_uInt16 const nFlags; ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {} diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 48011504fc5b..1a27dc93ec1c 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -33,7 +33,7 @@ public: class ScOrcusXMLContextImpl : public ScOrcusXMLContext { ScDocument& mrDoc; - OUString maPath; + OUString const maPath; orcus::xmlns_repository maNsRepo; /// XML namespace repository for this context. diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 5afce3d33ae5..9d090b744619 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -84,7 +84,7 @@ class ScOrcusNamedExpression : public orcus::spreadsheet::iface::import_named_ex { ScDocumentImport& mrDoc; const ScOrcusGlobalSettings& mrGlobalSettings; - SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named expressions. + SCTAB const mnTab; //< negative if global, else >= 0 for sheet-local named expressions. public: ScOrcusNamedExpression( ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS, SCTAB nTab = -1 ); @@ -171,7 +171,7 @@ public: private: - SCTAB mnTab; + SCTAB const mnTab; ScDocument& mrDoc; std::unique_ptr<ScConditionalFormat> mpCurrentFormat; @@ -204,7 +204,7 @@ private: class ScOrcusSheetProperties : public orcus::spreadsheet::iface::import_sheet_properties { ScDocumentImport& mrDoc; - SCTAB mnTab; + SCTAB const mnTab; public: ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport& rDoc); virtual ~ScOrcusSheetProperties() override; @@ -289,7 +289,7 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet friend class ScOrcusArrayFormula; ScDocumentImport& mrDoc; - SCTAB mnTab; + SCTAB const mnTab; ScOrcusFactory& mrFactory; ScOrcusStyles& mrStyles; sc::SharedFormulaGroups maFormulaGroups; @@ -588,7 +588,7 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory Matrix }; - ScAddress maPos; + ScAddress const maPos; Type meType; OUString maStr1; diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 71d09f373e8b..41b876d26480 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -143,8 +143,8 @@ public: private: struct HFHelperData { - sal_Int32 mnLeftPropId; - sal_Int32 mnRightPropId; + sal_Int32 const mnLeftPropId; + sal_Int32 const mnRightPropId; sal_Int32 mnHeight; sal_Int32 mnBodyDist; bool mbHasContent; diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 3758ad4afdc5..4c016766c17b 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -190,7 +190,7 @@ struct PCFieldGroupModel /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem { - OUString maOrigName; + OUString const maOrigName; OUString maGroupName; explicit PivotCacheGroupItem( const OUString& rItemName ) : diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 083d434bfd58..75f8b78006ef 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -177,7 +177,7 @@ private: ItemModelVector maItems; /// All items of this field. PTFieldModel maModel; /// Pivot field settings. OUString maDPFieldName; /// Name of the field in DataPilot field collection. - sal_Int32 mnFieldIndex; /// Zero-based index of this field. + sal_Int32 const mnFieldIndex; /// Zero-based index of this field. }; struct PTFilterModel diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index cecb70d6ec55..d57cfefca43f 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -52,7 +52,7 @@ enum FUNC_TYPE class QProToSc : public ConverterBase { private: - TokenId mnAddToken; + TokenId const mnAddToken; SvStream& maIn; public: diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index e59893fba469..39fb408cf030 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -87,7 +87,7 @@ struct LOTUS_ROOT ScDocument* pDoc; LotusRangeList maRangeNames; ScRangeName* pScRangeName; - rtl_TextEncoding eCharsetQ; + rtl_TextEncoding const eCharsetQ; Lotus123Typ eFirstType; Lotus123Typ eActType; ScRange aActRange; diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index a9c802bf0124..7beca1ddb0c0 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -75,7 +75,7 @@ private: ScenarioCellVector maCells; /// Scenario cells. ScenarioModel maModel; /// Scenario model data. - sal_Int16 mnSheet; /// Index of the sheet this scenario is based on. + sal_Int16 const mnSheet; /// Index of the sheet this scenario is based on. }; struct SheetScenariosModel @@ -106,7 +106,7 @@ private: typedef RefVector< Scenario > ScenarioVector; ScenarioVector maScenarios; SheetScenariosModel maModel; - sal_Int16 mnSheet; + sal_Int16 const mnSheet; }; class ScenarioBuffer : public WorkbookHelper diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 90ebe0ee1f4e..a54b40b89577 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -86,7 +86,7 @@ private: typedef ::std::map< sal_Int32, ValueRangeVector > ColSpanVectorMap; ColSpanVectorMap maColSpans; /// Buffered column spans, mapped by row index. - sal_Int32 mnCurrRow; /// Current row index used for buffered cell import. + sal_Int32 const mnCurrRow; /// Current row index used for buffered cell import. }; /** Manages the cell contents and cell formatting of a sheet. @@ -210,7 +210,7 @@ private: struct MergedRange { ScRange maRange; /// The formatted cell range. - sal_Int32 mnHorAlign; /// Horizontal alignment in the range. + sal_Int32 const mnHorAlign; /// Horizontal alignment in the range. explicit MergedRange( const ScRange& rRange ); explicit MergedRange( const ScAddress& rAddress, sal_Int32 nHorAlign ); diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 83717637b6d6..5a9e6b778b41 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -42,7 +42,7 @@ struct SheetDataContextBase SheetDataBuffer& mrSheetData; /// The sheet data buffer for cell content and formatting. CellModel maCellData; /// Position, contents, formatting of current imported cell. CellFormulaModel maFmlaData; /// Settings for a cell formula. - sal_Int16 mnSheet; /// Index of the current sheet. + sal_Int16 const mnSheet; /// Index of the current sheet. explicit SheetDataContextBase( const WorksheetHelper& rHelper ); virtual ~SheetDataContextBase(); @@ -59,7 +59,7 @@ class SheetDataContext : public WorksheetContextBase, private SheetDataContextBa // forms the inner loop for bulk data parsing, and for the // duration of this we can drop the solar mutex. #if MULTI_THREAD_SHEET_PARSING - SolarMutexReleaser aReleaser; + SolarMutexReleaser const aReleaser; #endif public: diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index ee2a42a5b4a3..aa0a4557bd5f 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -258,7 +258,7 @@ private: FontModel maModel; ApiFontData maApiData; ApiFontUsedFlags maUsedFlags; - bool mbDxf; + bool const mbDxf; }; typedef std::shared_ptr< Font > FontRef; @@ -459,7 +459,7 @@ private: private: BorderModel maModel; ApiBorderData maApiData; - bool mbDxf; + bool const mbDxf; }; typedef std::shared_ptr< Border > BorderRef; @@ -553,7 +553,7 @@ private: PatternModelRef mxPatternModel; GradientModelRef mxGradientModel; ApiSolidFillData maApiData; - bool mbDxf; + bool const mbDxf; }; typedef std::shared_ptr< Fill > FillRef; diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index a5fbc55bc6bf..9d342f59c50a 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -93,7 +93,7 @@ protected: private: XfRef mxXf; - bool mbCellXf; /// True = cell XF, false = style XF. + bool const mbCellXf; /// True = cell XF, false = style XF. }; class DxfContext : public WorkbookContextBase diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index 88addba088e7..73e7fbee3cbc 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -86,9 +86,9 @@ public: private: struct SheetInfo : public SheetInfoModel { - OUString maCalcName; - OUString maCalcQuotedName; - sal_Int16 mnCalcSheet; + OUString const maCalcName; + OUString const maCalcQuotedName; + sal_Int16 const mnCalcSheet; explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const OUString& rCalcName ); }; diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 18f519b0d89b..4b5b23b0d5e3 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -125,7 +125,7 @@ private: XclEscherClientTextbox* pAdditionalText; sal_uInt16 nAdditionalText; sal_uInt32 mnNextKey; - bool mbIsRootDff; + bool const mbIsRootDff; }; // --- class XclEscherHostAppData ------------------------------------ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index e957c677b0fe..7f2df1b43c47 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -72,7 +72,7 @@ public: private: static sal_Int32 mnDrawingMLCount, mnVmlCount; - SCTAB mnScTab; + SCTAB const mnScTab; XclEscherEx& mrEscherEx; std::unique_ptr<XclExpMsoDrawing> pMsodrawingPerSheet; @@ -94,9 +94,9 @@ protected: sal_uInt16 nObjId; sal_uInt16 nGrbit; SCTAB mnScTab; - bool bFirstOnSheet; + bool const bFirstOnSheet; - bool mbOwnEscher; /// true = Escher part created on the fly. + bool const mbOwnEscher; /// true = Escher part created on the fly. /** @param bOwnEscher If set to true, this object will create its escher data. See SetOwnEscher() for details. */ @@ -153,14 +153,14 @@ public: class XclObjComment : public XclObj { - ScAddress maScPos; + ScAddress const maScPos; // no need to use std::unique_ptr< SdrCaptionObj, SdrObjectFreeOp > - SdrCaptionObj* mpCaption; + SdrCaptionObj* const mpCaption; - bool mbVisible; - tools::Rectangle maFrom; - tools::Rectangle maTo; + bool const mbVisible; + tools::Rectangle const maFrom; + tools::Rectangle const maTo; public: XclObjComment( XclExpObjectManager& rObjMgr, @@ -181,7 +181,7 @@ public: class XclObjDropDown : public XclObj { private: - bool bIsFiltered; + bool const bIsFiltered; virtual void WriteSubRecs( XclExpStream& rStrm ) override; @@ -300,7 +300,7 @@ public: class ExcBundlesheet8 : public ExcBundlesheetBase { private: - OUString sUnicodeName; + OUString const sUnicodeName; XclExpString GetName() const { return XclExpString( sUnicodeName, XclStrFlags::EightBitLength );} virtual void SaveCont( XclExpStream& rStrm ) override; @@ -328,7 +328,7 @@ public: class XclCodename : public ExcRecord { private: - XclExpString aName; + XclExpString const aName; virtual void SaveCont( XclExpStream& rStrm ) override; public: XclCodename( const OUString& ); @@ -345,9 +345,9 @@ public: class ExcEScenarioCell { private: - sal_uInt16 nCol; - sal_uInt16 nRow; - XclExpString sText; + sal_uInt16 const nCol; + sal_uInt16 nRow; + XclExpString const sText; protected: public: diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index fccbf881d9c0..0c46c53039ed 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -125,7 +125,7 @@ private: private: typedef std::unique_ptr< SvStream > SvStreamPtr; - ScAddress maScPos; /// Position of the hyperlink. + ScAddress const maScPos; /// Position of the hyperlink. OUString m_Repr; /// Cell representation text. SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags; /// Option flags. @@ -192,7 +192,7 @@ public: private: const ScCondDateFormatEntry& mrFormatEntry; - sal_Int32 mnPriority; + sal_Int32 const mnPriority; }; class XclExpCfvo : public XclExpRecord, protected XclExpRoot @@ -203,8 +203,8 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const ScColorScaleEntry& mrEntry; - ScAddress maSrcPos; - bool mbFirst; + ScAddress const maSrcPos; + bool const mbFirst; }; class XclExpColScaleCol : public XclExpRecord, protected XclExpRoot @@ -258,7 +258,7 @@ private: XclExpCfvoList maCfvoList; XclExpColScaleColList maColList; - sal_Int32 mnPriority; + sal_Int32 const mnPriority; }; class XclExpDataBar : public XclExpRecord, protected XclExpRoot @@ -273,8 +273,8 @@ private: std::unique_ptr<XclExpColScaleCol> mpCol; const ScDataBarFormat& mrFormat; - sal_Int32 mnPriority; - OString maGUID; + sal_Int32 const mnPriority; + OString const maGUID; }; class XclExpIconSet : public XclExpRecord, protected XclExpRoot @@ -288,7 +288,7 @@ private: XclExpCfvoList maCfvoList; const ScIconSetFormat& mrFormat; - sal_Int32 mnPriority; + sal_Int32 const mnPriority; }; /** Contains all conditional formats of a specific sheet. */ @@ -400,8 +400,8 @@ public: virtual void Save( XclExpStream& rStrm ) override; private: - XclExpString maDestRange; /// Destination range. - XclExpString maUrl; /// Source document URL. + XclExpString const maDestRange; /// Destination range. + XclExpString const maUrl; /// Source document URL. XclExpStringRef mxQryTables; /// List of source range names. sal_Int16 mnRefresh; /// Refresh time in minutes. bool mbEntireDoc; /// true = entire document. diff --git a/sc/source/filter/inc/xedbdata.hxx b/sc/source/filter/inc/xedbdata.hxx index 962f823084b6..7af0af6477c3 100644 --- a/sc/source/filter/inc/xedbdata.hxx +++ b/sc/source/filter/inc/xedbdata.hxx @@ -37,7 +37,7 @@ protected: struct Entry { const ScDBData* mpData; - sal_Int32 mnTableId; /// used as [n] in table[n].xml part name. + sal_Int32 const mnTableId; /// used as [n] in table[n].xml part name. Entry( const ScDBData* pData, sal_Int32 nTableId ); }; diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index c908675f3d2c..3a5a467419e9 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -79,7 +79,7 @@ private: virtual void ImplCalcAnchorRect( const tools::Rectangle& rRect, MapUnit eMapUnit ) override; private: - SCTAB mnScTab; /// Calc sheet index. + SCTAB const mnScTab; /// Calc sheet index. }; /** Represents the position (anchor) of a shape in an embedded draw page. */ @@ -94,9 +94,9 @@ private: virtual void ImplCalcAnchorRect( const tools::Rectangle& rRect, MapUnit eMapUnit ) override; private: - Size maPageSize; - sal_Int32 mnScaleX; - sal_Int32 mnScaleY; + Size const maPageSize; + sal_Int32 const mnScaleX; + sal_Int32 const mnScaleY; }; /** Represents the position (anchor) of a note object. */ @@ -126,7 +126,7 @@ private: protected: XclEscherEx& mrEscherEx; /// Reference to the DFF converter containing the DFF stream. - sal_uInt32 mnFragmentKey; /// The key of the DFF stream fragment to be written by this record. + sal_uInt32 const mnFragmentKey; /// The key of the DFF stream fragment to be written by this record. }; /** The MSODRAWINGGROUP record contains the DGGCONTAINER with global DFF data @@ -158,8 +158,8 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - Graphic maGraphic; /// The VCL graphic. - sal_uInt16 mnRecId; /// Record identifier for the IMGDATA record. + Graphic const maGraphic; /// The VCL graphic. + sal_uInt16 const mnRecId; /// Record identifier for the IMGDATA record. }; /** Helper class for form controls to manage spreadsheet links . */ @@ -238,7 +238,7 @@ private: virtual void WriteSubRecs( XclExpStream& rStrm ) override; private: - OUString maClassName; /// Class name of the control. + OUString const maClassName; /// Class name of the control. sal_uInt32 mnStrmStart; /// Start position in 'Ctls' stream. sal_uInt32 mnStrmSize; /// Size in 'Ctls' stream. }; @@ -374,7 +374,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - SCTAB mnTab; + SCTAB const mnTab; XclExpNoteList& mrNotes; }; @@ -439,9 +439,9 @@ public: virtual XclExpDffAnchorBase* CreateDffAnchor() const override; private: - Size maPageSize; - sal_Int32 mnScaleX; - sal_Int32 mnScaleY; + Size const maPageSize; + sal_Int32 const mnScaleX; + sal_Int32 const mnScaleY; }; #endif diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index 4d8ee7bdb930..8b9354b9ebe7 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -51,9 +51,9 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - ScColorScaleEntryType meType; + ScColorScaleEntryType const meType; OString maValue; - bool mbFirst; + bool const mbFirst; }; class XclExpExtNegativeColor @@ -63,7 +63,7 @@ public: void SaveXml( XclExpXmlStream& rStrm); private: - Color maColor; + Color const maColor; }; class XclExpExtAxisColor @@ -73,7 +73,7 @@ public: void SaveXml( XclExpXmlStream& rStrm ); private: - Color maAxisColor; + Color const maAxisColor; }; class XclExpExtIcon : public XclExpRecordBase, protected XclExpRoot @@ -130,9 +130,9 @@ public: private: XclExpRecordRef mxEntry; - OString maId; + OString const maId; const char* pType; - sal_Int32 mnPriority; + sal_Int32 const mnPriority; }; typedef std::shared_ptr<XclExpExt> XclExpExtRef; diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 69b1f2e76ae7..9287fdf86da0 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -196,7 +196,7 @@ public: private: XclExpHyperlinkRef mxLinkRec; /// Created HLINK record. - ScAddress maScPos; /// Cell position to set at the HLINK record. + ScAddress const maScPos; /// Cell position to set at the HLINK record. OUString maUrlList; /// List with all processed URLs. bool mbMultipleUrls; /// true = Multiple URL fields processed. }; diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index 6fc206078885..b7747c2e9077 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -42,7 +42,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - OUString maHdrString; /// Header or footer contents. + OUString const maHdrString; /// Header or footer contents. }; // General page settings ------------------------------------------------------ @@ -83,7 +83,7 @@ private: private: const ScfUInt16Vec& mrPageBreaks; /// Page settings data of current sheet. - sal_uInt16 mnMaxPos; /// Maximum row/column for BIFF8 page breaks. + sal_uInt16 const mnMaxPos; /// Maximum row/column for BIFF8 page breaks. }; // Page settings ============================================================== diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 261c05297d38..443d2da11ce4 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -215,7 +215,7 @@ private: ScRange maOrigSrcRange; /// The original sheet source range. ScRange maExpSrcRange; /// The exported sheet source range. ScRange maDocSrcRange; /// The range used to build the cache fields and items. - sal_uInt16 mnListIdx; /// List index in pivot cache buffer. + sal_uInt16 const mnListIdx; /// List index in pivot cache buffer. bool mbValid; /// true = The cache is valid for export. }; diff --git a/sc/source/filter/inc/xepivotxml.hxx b/sc/source/filter/inc/xepivotxml.hxx index 2301cd300fbf..c1eede23e886 100644 --- a/sc/source/filter/inc/xepivotxml.hxx +++ b/sc/source/filter/inc/xepivotxml.hxx @@ -51,8 +51,8 @@ class XclExpXmlPivotTables : public XclExpRecordBase, protected XclExpRoot struct Entry { const ScDPObject* mpTable; - sal_Int32 mnCacheId; - sal_Int32 mnPivotId; /// used as [n] in pivotTable[n].xml part name. + sal_Int32 const mnCacheId; + sal_Int32 const mnPivotId; /// used as [n] in pivotTable[n].xml part name. Entry( const ScDPObject* pTable, sal_Int32 nCacheId, sal_Int32 nPivotId ); }; diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index dd968d92aa7b..0e3f019374c5 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -68,7 +68,7 @@ public: virtual ~XclExpXmlElementRecord() override; protected: - sal_Int32 mnElement; + sal_Int32 const mnElement; }; class XclExpXmlStartElementRecord : public XclExpXmlElementRecord @@ -255,8 +255,8 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - bool mbValue; /// The record data. - sal_Int32 mnAttribute; /// The attribute to generate within SaveXml() + bool const mbValue; /// The record data. + sal_Int32 const mnAttribute; /// The attribute to generate within SaveXml() }; /** Record which exports a memory data array. */ @@ -292,7 +292,7 @@ public: virtual void Save( XclExpStream& rStrm ) override; private: - XclFutureRecType meRecType; + XclFutureRecType const meRecType; }; // List of records ============================================================ diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index f8a7cb06a02d..5b10d6a1bf3c 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -354,7 +354,7 @@ private: std::stack< sax_fastparser::FSHelperPtr > maStreams; XclExpXmlPathToStateMap maOpenedStreamMap; - bool mbExportVBA; + bool const mbExportVBA; }; #endif diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 8ee42dbcb268..994108939fb8 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -253,9 +253,9 @@ private: /** Stores a core number format index with corresponding Excel format index. */ struct XclExpNumFmt { - sal_uInt32 mnScNumFmt; /// Core index of the number format. - sal_uInt16 mnXclNumFmt; /// Resulting Excel format index. - OUString maNumFmtString; /// format string + sal_uInt32 const mnScNumFmt; /// Core index of the number format. + sal_uInt16 const mnXclNumFmt; /// Resulting Excel format index. + OUString const maNumFmtString; /// format string explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) : mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {} @@ -298,7 +298,7 @@ private: SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion. XclExpNumFmtVec maFormatMap; /// Maps core formats to Excel indexes. std::unique_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. - sal_uInt32 mnStdFmt; /// Key for standard number format. + sal_uInt32 const mnStdFmt; /// Key for standard number format. sal_uInt16 mnXclOffset; /// Offset to first user defined format. }; @@ -543,10 +543,10 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - OUString maName; /// Name of the cell style. + OUString const maName; /// Name of the cell style. XclExpXFId maXFId; /// XF identifier for style formatting. sal_uInt8 mnStyleId; /// Built-in style identifier. - sal_uInt8 mnLevel; /// Outline level for RowLevel and ColLevel styles. + sal_uInt8 const mnLevel; /// Outline level for RowLevel and ColLevel styles. }; /** Stores all XF records (cell formats and cell styles) in the document. diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 96cbe9d6baf4..de398e614f89 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -55,7 +55,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - XclExpStringRef mxResult; + XclExpStringRef const mxResult; }; // Additional records for special formula ranges @@ -118,7 +118,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - XclTokenArrayRef mxTokArr; /// The token array of a matrix formula. + XclTokenArrayRef const mxTokArr; /// The token array of a matrix formula. }; typedef std::shared_ptr< XclExpArray > XclExpArrayRef; @@ -166,7 +166,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - XclTokenArrayRef mxTokArr; /// The token array of a shared formula. + XclTokenArrayRef const mxTokArr; /// The token array of a shared formula. sal_uInt8 mnUsedCount; /// Number of FORMULA records referring to this record. }; @@ -237,7 +237,7 @@ private: sal_uInt32 mnColInpXclRow; /// Row index of column input cell. sal_uInt16 mnRowInpXclCol; /// Column index of row input cell. sal_uInt32 mnRowInpXclRow; /// Row index of row input cell. - sal_uInt8 mnScMode; /// Type of the multiple operation (Calc constant). + sal_uInt8 const mnScMode; /// Type of the multiple operation (Calc constant). bool mbValid; /// true = Contains valid references. }; @@ -368,7 +368,7 @@ private: virtual void WriteContents( XclExpStream& rStrm ) override; private: - double mfValue; /// The cell value. + double const mfValue; /// The cell value. }; /** Represents a BOOLERR record that describes a cell with a Boolean value. */ @@ -513,8 +513,8 @@ private: private: typedef ::std::vector< XclExpMultiXFId > XclExpMultiXFIdDeq; - sal_uInt16 mnMulRecId; /// Record ID for multiple record variant. - std::size_t mnContSize; /// Data size of contents for one cell + sal_uInt16 const mnMulRecId; /// Record ID for multiple record variant. + std::size_t const mnContSize; /// Data size of contents for one cell XclExpMultiXFIdDeq maXFIds; /// The XF identifiers of the cell formatting. }; @@ -882,14 +882,14 @@ private: typedef XclExpRecordList< XclExpCellBase > XclExpCellList; XclExpCellList maCellList; /// List of cell records for this row. - sal_uInt32 mnXclRow; /// Excel row index of this row. + sal_uInt32 const mnXclRow; /// Excel row index of this row. sal_uInt16 mnHeight; /// Row height in twips. sal_uInt16 mnFlags; /// Flags for the ROW record. sal_uInt16 mnXFIndex; /// Default row formatting. sal_uInt8 mnOutlineLevel; /// Outline Level of row (for OOXML) sal_uInt32 mnXclRowRpt; sal_uInt32 mnCurrentRow; - bool mbAlwaysEmpty; /// true = Do not add blank cells in Finalize(). + bool const mbAlwaysEmpty; /// true = Do not add blank cells in Finalize(). bool mbEnabled; /// true = Write this ROW record. }; @@ -1003,7 +1003,7 @@ private: XclExpShrfmlaBuffer maShrfmlaBfr; /// Buffer for SHRFMLA records. XclExpTableopBuffer maTableopBfr; /// Buffer for TABLEOP records. XclExpDefrowhRef mxDefrowheight; /// DEFROWHEIGHT record for default row format. - XclExpRecordRef mxGuts; /// GUTS record for outline areas. + XclExpRecordRef const mxGuts; /// GUTS record for outline areas. XclExpNoteListRef mxNoteList; /// List of NOTE records. XclExpMergedcellsRef mxMergedcells; /// MERGEDCELLS record for merged cell ranges. XclExpHyperlinkRef mxHyperlinkList; /// List of HLINK records. diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index 0e4176e98083..4416417ea623 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -57,10 +57,10 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - Color maGridColor; /// Grid color (<=BIFF5). + Color const maGridColor; /// Grid color (<=BIFF5). sal_uInt32 mnGridColorId; /// Color ID of grid color (>=BIFF8). sal_uInt16 mnFlags; /// Option flags. - XclAddress maFirstXclPos; /// First visible cell. + XclAddress const maFirstXclPos; /// First visible cell. sal_uInt16 mnNormalZoom; /// Zoom factor for normal view. sal_uInt16 mnPageZoom; /// Zoom factor for pagebreak preview. }; @@ -98,8 +98,8 @@ private: sal_uInt16 mnSplitX; /// Split X position, or frozen column. sal_uInt32 mnSplitY; /// Split Y position, or frozen row. XclAddress maSecondXclPos; /// First visible cell in additional panes. - sal_uInt8 mnActivePane; /// Active pane (with cell cursor). - bool mbFrozenPanes; /// true = "frozen" panes; false = "split" window. + sal_uInt8 const mnActivePane; /// Active pane (with cell cursor). + bool const mbFrozenPanes; /// true = "frozen" panes; false = "split" window. }; /** Represents a SELECTION record with selection data for a pane. */ diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 4a6b53dc8fa1..371cc72ca120 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -139,7 +139,7 @@ private: ScRangeList maRanges; /// Destination cell ranges. ScCondFmtPtr mxScCondFmt; /// Calc conditional format. - sal_uInt32 mnFormatIndex; /// Index of this conditional format in list. + sal_uInt32 const mnFormatIndex; /// Index of this conditional format in list. sal_uInt16 mnCondCount; /// Number of conditions to be inserted. sal_uInt16 mnCondIndex; /// Condition index to be inserted next. }; @@ -222,7 +222,7 @@ private: OUString maURL; /// Source document URL. OUString maTables; /// List of source range names. - ScRange maDestRange; /// Destination range. + ScRange const maDestRange; /// Destination range. XclImpWebQueryMode meMode; /// Current mode of the web query. sal_uInt16 mnRefresh; /// Refresh time in minutes. }; diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 9ad15a4b4f5e..f984725ef4df 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -431,7 +431,7 @@ private: typedef std::shared_ptr< XclImpChart > XclImpChartRef; XclImpChartRef mxChart; /// The chart itself (BOF/EOF substream data). - bool mbOwnTab; /// true = own sheet; false = embedded object. + bool const mbOwnTab; /// true = own sheet; false = embedded object. }; /** A note object, which is a specialized text box object. */ @@ -492,7 +492,7 @@ private: private: const XclImpRoot& mrRoot; /// Not derived from XclImpRoot to allow multiple inheritance. std::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document. - XclCtrlBindMode meBindMode; /// Value binding mode. + XclCtrlBindMode const meBindMode; /// Value binding mode. }; /** Base class for textbox based form controls. */ @@ -1100,7 +1100,7 @@ private: XclImpObjMapById maObjMapId; /// Maps BIFF8 drawing objects to object ID. XclImpObjTextMap maTextMap; /// Maps BIFF8 TXO textbox data to DFF stream position. ScfUInt16Vec maSkipObjs; /// IDs of all objects to be skipped. - bool mbOleObjs; /// True = draw model supports OLE objects. + bool const mbOleObjs; /// True = draw model supports OLE objects. }; /** Drawing manager of a single sheet. */ @@ -1200,7 +1200,7 @@ private: typedef std::unique_ptr<SvMemoryStream> SvMemoryStreamPtr; SvMemoryStream maDummyStrm; /// Dummy DGG stream for DFF manager. - XclImpSimpleDffConverter maDffConv; /// DFF converter used to resolve palette colors. + XclImpSimpleDffConverter const maDffConv; /// DFF converter used to resolve palette colors. SvMemoryStreamPtr mxMemStrm; /// Helper stream. }; diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index 658d81e195a3..9260e0b0d41c 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -67,7 +67,7 @@ private: SCTAB mnScTab; /// Calc sheet index of local names. ScRangeData::Type meNameType; sal_uInt16 mnXclTab; - sal_uInt16 mnNameIndex; + sal_uInt16 const mnNameIndex; bool mbVBName:1; /// true = Visual Basic procedure or function. bool mbMacro:1; /// Whether it's a user-defined macro. diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 58d9176fb643..a2baae681283 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -114,8 +114,8 @@ private: private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. css::uno::Sequence< css::beans::NamedValue > maEncryptionData; - sal_uInt16 mnKey; - sal_uInt16 mnHash; + sal_uInt16 const mnKey; + sal_uInt16 const mnHash; }; /** Decrypts BIFF8 stream contents using the given document identifier. */ diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index 76e60e1e30d0..141faeb6c71f 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -152,9 +152,9 @@ public: protected: XclTracer& mrTracer; /// Tracer for invalid addresses. - ScAddress maMaxPos; /// Default maximum position. - sal_uInt16 mnMaxCol; /// Maximum column index, as 16-bit value. - sal_uInt32 mnMaxRow; /// Maximum row index. + ScAddress const maMaxPos; /// Default maximum position. + sal_uInt16 const mnMaxCol; /// Maximum column index, as 16-bit value. + sal_uInt32 const mnMaxRow; /// Maximum row index. bool mbColTrunc; /// Flag for "columns truncated" warning box. bool mbRowTrunc; /// Flag for "rows truncated" warning box. bool mbTabTrunc; /// Flag for "tables truncated" warning box. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 1da9057df893..e14979461f4d 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1131,14 +1131,14 @@ enum XclChFrameType struct XclChFormatInfo { XclChObjectType meObjType; /// Object type for automatic format. - XclChPropertyMode mePropMode; /// Property mode for property set helper. - sal_uInt16 mnAutoLineColorIdx; /// Automatic line color index. - sal_Int16 mnAutoLineWeight; /// Automatic line weight (hairline, single, ...). - sal_uInt16 mnAutoPattColorIdx; /// Automatic fill pattern color index. - XclChFrameType meDefFrameType; /// Default format type for missing frame objects. - bool mbCreateDefFrame; /// true = Create missing frame objects on import. - bool mbDeleteDefFrame; /// true = Delete default frame formatting on export. - bool mbIsFrame; /// true = Object is a frame, false = Object is a line. + XclChPropertyMode const mePropMode; /// Property mode for property set helper. + sal_uInt16 const mnAutoLineColorIdx; /// Automatic line color index. + sal_Int16 const mnAutoLineWeight; /// Automatic line weight (hairline, single, ...). + sal_uInt16 const mnAutoPattColorIdx; /// Automatic fill pattern color index. + XclChFrameType const meDefFrameType; /// Default format type for missing frame objects. + bool const mbCreateDefFrame; /// true = Create missing frame objects on import. + bool const mbDeleteDefFrame; /// true = Delete default frame formatting on export. + bool const mbIsFrame; /// true = Object is a frame, false = Object is a line. }; /** Provides access to chart auto formatting for all available object types. */ @@ -1293,8 +1293,8 @@ public: private: css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; /// Factory to create the container. css::uno::Reference< css::container::XNameContainer > mxContainer; /// Container for the objects. - OUString maServiceName; /// Service name to create the container. - OUString maObjNameBase; /// Base of names for inserted objects. + OUString const maServiceName; /// Service name to create the container. + OUString const maObjNameBase; /// Base of names for inserted objects. sal_Int32 mnIndex; /// Index to create unique identifiers. }; @@ -1399,8 +1399,8 @@ struct XclChRootData css::uno::Reference< css::chart2::XChartDocument > mxChartDoc; /// The chart document. tools::Rectangle maChartRect; /// Position and size of the chart shape. - XclChTypeProvRef mxTypeInfoProv; /// Provides info about chart types. - XclChFmtInfoProvRef mxFmtInfoProv; /// Provides info about auto formatting. + XclChTypeProvRef const mxTypeInfoProv; /// Provides info about chart types. + XclChFmtInfoProvRef const mxFmtInfoProv; /// Provides info about auto formatting. XclChObjectTableRef mxLineDashTable; /// Container for line dash styles. XclChObjectTableRef mxGradientTable; /// Container for gradient fill styles. XclChObjectTableRef mxHatchTable; /// Container for hatch fill styles. diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index e97f6b61fafb..07a584c46d58 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -275,9 +275,9 @@ enum XclFuncParamConv */ struct XclFuncParamInfo { - XclFuncParamValidity meValid; /// Parameter validity. - XclFuncParamConv meConv; /// Token class conversion type. - bool mbValType; /// Data type (false = REFTYPE, true = VALTYPE). + XclFuncParamValidity meValid; /// Parameter validity. + XclFuncParamConv meConv; /// Token class conversion type. + bool mbValType; /// Data type (false = REFTYPE, true = VALTYPE). }; // Function data ============================================================== @@ -312,11 +312,11 @@ struct XclFunctionInfo { OpCode meOpCode; /// Calc function opcode. sal_uInt16 mnXclFunc; /// Excel function index. - sal_uInt8 mnMinParamCount; /// Minimum number of parameters. - sal_uInt8 mnMaxParamCount; /// Maximum number of parameters. - sal_uInt8 mnRetClass; /// Token class of the return value. - XclFuncParamInfo mpParamInfos[ EXC_FUNCINFO_PARAMINFO_COUNT ]; /// Information for all parameters. - sal_uInt8 mnFlags; /// Additional flags (EXC_FUNCFLAG_* constants). + sal_uInt8 const mnMinParamCount; /// Minimum number of parameters. + sal_uInt8 const mnMaxParamCount; /// Maximum number of parameters. + sal_uInt8 const mnRetClass; /// Token class of the return value. + XclFuncParamInfo const mpParamInfos[ EXC_FUNCINFO_PARAMINFO_COUNT ]; /// Information for all parameters. + sal_uInt8 const mnFlags; /// Additional flags (EXC_FUNCFLAG_* constants). const sal_Char* mpcMacroName; /** Function name, if simulated by a macro call (UTF-8) EXC_FUNCFLAG_ADDINEQUIV is 0; or programmatical add-in name @@ -411,7 +411,7 @@ public: private: ScfUInt8Vec maTokVec; /// Byte vector containing token data. ScfUInt8Vec maExtDataVec; /// Byte vector containing extended data (arrays, stacked NLRs). - bool mbVolatile; /// True = Formula contains volatile function. + bool const mbVolatile; /// True = Formula contains volatile function. }; typedef std::shared_ptr< XclTokenArray > XclTokenArrayRef; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index d9f04ca98942..a2f3a2741b93 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -515,7 +515,7 @@ public: protected: XclPCFieldInfo maFieldInfo; /// Pivot cache field info (SXFIELD record). XclPCFieldType meFieldType; /// Type of this pivot cache field. - sal_uInt16 mnFieldIdx; /// Own field index in pivot cache. + sal_uInt16 const mnFieldIdx; /// Own field index in pivot cache. ScfUInt16Vec maGroupOrder; /// Order of items in a grouping field (SXGROUPINFO record). XclPCNumGroupInfo maNumGroupInfo; /// Info for numeric grouping (SXNUMGROUP record). }; diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 1b799d845b87..8b1a0bfd8a98 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -72,21 +72,21 @@ struct XclRootData typedef std::shared_ptr< XclTracer > XclTracerRef; typedef std::shared_ptr< RootData > RootDataRef; - XclBiff meBiff; /// Current BIFF version. + XclBiff const meBiff; /// Current BIFF version. XclOutput meOutput; /// Current Output format. SfxMedium& mrMedium; /// The medium to import from. - tools::SvRef<SotStorage> mxRootStrg; /// The root OLE storage of imported/exported file. + tools::SvRef<SotStorage> const mxRootStrg; /// The root OLE storage of imported/exported file. ScDocument& mrDoc; /// The source or destination document. OUString maDocUrl; /// Document URL of imported/exported file. OUString maBasePath; /// Base path of imported/exported file (path of maDocUrl). OUString maUserName; /// Current user name. static const OUStringLiteral gaDefPassword; /// The default password used for stream encryption. rtl_TextEncoding meTextEnc; /// Text encoding to import/export byte strings. - LanguageType meSysLang; /// System language. + LanguageType const meSysLang; /// System language. LanguageType meDocLang; /// Document language (import: from file, export: from system). LanguageType meUILang; /// UI language (import: from file, export: from system). sal_Int16 mnDefApiScript; /// Default script type for blank cells (API constant). - ScAddress maScMaxPos; /// Highest Calc cell position. + ScAddress const maScMaxPos; /// Highest Calc cell position. ScAddress maXclMaxPos; /// Highest Excel cell position. ScAddress maMaxPos; /// Highest position valid in Calc and Excel. |