diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-09 15:32:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-09-10 11:22:53 +0000 |
| commit | 78ea29d51a23bf75f5753fae68ab8abe1072bbef (patch) | |
| tree | 07197f526f98497f893574c5f81eba52adf5135f | |
| parent | 6ebca1d1094d8fd85e485e504e810a1954befcc3 (diff) | |
loplugin:constantparam in sc
Change-Id: I82c78dd880c98532db407b0183a43705be2de67c
Reviewed-on: https://gerrit.libreoffice.org/28777
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
61 files changed, 138 insertions, 225 deletions
diff --git a/sc/inc/bulkdatahint.hxx b/sc/inc/bulkdatahint.hxx index 4b375848f87b..dd82ef6d3b9e 100644 --- a/sc/inc/bulkdatahint.hxx +++ b/sc/inc/bulkdatahint.hxx @@ -28,7 +28,7 @@ class BulkDataHint : public SfxSimpleHint BulkDataHint& operator= ( const BulkDataHint& ) = delete; public: - BulkDataHint( ScDocument& rDoc, const ColumnSpanSet* pSpans ); + BulkDataHint( ScDocument& rDoc ); virtual ~BulkDataHint(); void setSpans( const ColumnSpanSet* pSpans ); diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 35c737d40882..af73ff0c03b4 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -350,7 +350,7 @@ public: void CloneFormulaCell( const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr, - const std::vector<sc::RowSpan>& rRanges, sc::StartListeningContext* pCxt ); + const std::vector<sc::RowSpan>& rRanges ); svl::SharedString GetSharedString( SCROW nRow ) const; diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 1faf6bc331fe..08718960af01 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -278,7 +278,7 @@ public: bool NeedsRepaint() const; protected: - virtual void DataChanged( const ScRange* pModified ) const; + virtual void DataChanged() const; ScDocument* GetDocument() const { return mpDoc; } ScConditionalFormat* pCondFormat; @@ -344,7 +344,7 @@ public: virtual ScFormatEntry* Clone(ScDocument* pDoc) const override; protected: - virtual void DataChanged( const ScRange* pModified ) const override; + virtual void DataChanged() const override; }; namespace condformat { diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index d58e53d586a4..162d86d173e3 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -367,15 +367,15 @@ public: struct ScFieldIdentifier { - OUString maFieldName; /// Source field name. + OUString maFieldName; /// Source field name. sal_Int32 mnFieldIdx; /// Field index (if several fields with same name exist). bool mbDataLayout; /// True = data layout field collecting all data fields as items. inline explicit ScFieldIdentifier() : mnFieldIdx( 0 ), mbDataLayout( false ) {} - inline explicit ScFieldIdentifier( const OUString& rFieldName, sal_Int32 nFieldIdx, bool bDataLayout ) : - maFieldName( rFieldName ), mnFieldIdx( nFieldIdx ), mbDataLayout( bDataLayout ) {} + inline explicit ScFieldIdentifier( const OUString& rFieldName, bool bDataLayout ) : + maFieldName( rFieldName ), mnFieldIdx( 0 ), mbDataLayout( bDataLayout ) {} }; /** Base class of all implementation objects based on a DataPilot descriptor diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 9536bb8c787f..deaaa6bd4ba3 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -30,7 +30,6 @@ class ScDocument; class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool { SfxPoolItem** ppPoolDefaults; - SfxItemPool* pSecondary; static sal_uInt16* pVersionMap1; static sal_uInt16* pVersionMap2; static sal_uInt16* pVersionMap3; @@ -45,7 +44,7 @@ class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool static sal_uInt16* pVersionMap12; public: - ScDocumentPool( SfxItemPool* pSecPool = nullptr ); + ScDocumentPool(); protected: virtual ~ScDocumentPool(); public: diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 57ab3128e5ee..289d6df8a8f0 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1857,7 +1857,7 @@ public: SCTAB nTab, const ScSortParam& rSortParam, bool bKeepQuery, bool bUpdateRefs, ScProgress* pProgress, sc::ReorderParam* pUndo ); - void Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress ); + void Reorder( const sc::ReorderParam& rParam ); SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub ); SC_DLLPUBLIC bool CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index a3fcf887310c..626e3ddef6b9 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -54,7 +54,7 @@ class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem ScStyleSheet* pStyle; public: ScPatternAttr(SfxItemSet* pItemSet, const OUString& rStyleName); - ScPatternAttr(SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet = nullptr); + ScPatternAttr(SfxItemSet* pItemSet); ScPatternAttr(SfxItemPool* pItemPool); ScPatternAttr(const ScPatternAttr& rPatternAttr); diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 64216efec531..783dd44bd552 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -39,7 +39,6 @@ public: void Append( const ScRange& rRange ); ScRefFlags Parse( const OUString&, ScDocument*, - ScRefFlags nMask = ScRefFlags::VALID, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, SCTAB nDefaultTab = 0, sal_Unicode cDelimiter = 0 ); diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index d78f4e600266..b601d5fe11fd 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -341,8 +341,7 @@ public: virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0; - virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - int nId ) = 0; + virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList ) = 0; virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) = 0; @@ -350,8 +349,7 @@ public: bool bEnableExternal) = 0; virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, - const std::vector<OUString>& rServices, - int nId ) = 0; + const std::vector<OUString>& rServices ) = 0; virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove) = 0 ; @@ -374,7 +372,6 @@ public: bool bUnGroup = false ) = 0; virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent, - int nId, bool bDisallowCellMove ) = 0; virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent, @@ -394,9 +391,7 @@ public: FieldUnit eFUnit, sal_uInt16 nDecimals = 2, long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, - long nLast = 100 ) = 0; + long nMinimum = 0 ) = 0; virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(vcl::Window * pParent, const OUString& rDefault) = 0; @@ -421,16 +416,14 @@ public: const ScDPNameVec& rDataFields ) = 0; virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent, - int nId, const ScDPNumGroupInfo& rInfo ) = 0; virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( vcl::Window* pParent, - int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) = 0; - virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, int nId, + virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) = 0; diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 4a7548886b53..73b5ee6fbc9a 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -1127,7 +1127,7 @@ void ScBroadcastAreaSlotMachine::BulkBroadcastGroupAreas() if (m_BulkGroupAreas.empty()) return; - sc::BulkDataHint aHint(*pDoc, nullptr); + sc::BulkDataHint aHint(*pDoc); bool bBroadcasted = false; BulkGroupAreasType::iterator it = m_BulkGroupAreas.begin(), itEnd = m_BulkGroupAreas.end(); diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index 0b7bc6a93b78..d403b797bf55 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -216,7 +216,7 @@ void ScColumn::CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, std::vector<sc::RowSpan> aRanges; aRanges.reserve(1); aRanges.push_back(sc::RowSpan(nRow1, nRow2)); - CloneFormulaCell(*rSrcCell.mpFormula, rSrcAttr, aRanges, nullptr); + CloneFormulaCell(*rSrcCell.mpFormula, rSrcAttr, aRanges); } break; default: @@ -478,7 +478,7 @@ void ScColumn::DeleteRanges( const std::vector<sc::RowSpan>& rRanges, InsertDele void ScColumn::CloneFormulaCell( const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr, - const std::vector<sc::RowSpan>& rRanges, sc::StartListeningContext* pCxt ) + const std::vector<sc::RowSpan>& rRanges ) { sc::CellStoreType::iterator itPos = maCells.begin(); sc::CellTextAttrStoreType::iterator itAttrPos = maCellTextAttrs.begin(); @@ -509,11 +509,6 @@ void ScColumn::CloneFormulaCell( { // Single, ungrouped formula cell. ScFormulaCell* pCell = new ScFormulaCell(rSrc, *pDocument, aPos); - if (pCxt) - { - pCell->StartListeningTo(*pCxt); - pCell->SetDirty(); - } aFormulas.push_back(pCell); } else @@ -532,11 +527,6 @@ void ScColumn::CloneFormulaCell( xGroup->mpTopCell = pCell; xGroup->mnLength = nLen; } - if (pCxt) - { - pCell->StartListeningTo(*pCxt); - pCell->SetDirty(); - } aFormulas.push_back(pCell); } } diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index cf7af863c188..68fb54d2b577 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -782,7 +782,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) if (bDirty && !bFirstRun) { // Repaint everything for dependent formats - DataChanged( nullptr ); + DataChanged(); } bFirstRun = false; @@ -1466,7 +1466,7 @@ ScAddress ScConditionEntry::GetValidSrcPos() const return aValidPos; } -void ScConditionEntry::DataChanged( const ScRange* /* pModified */ ) const +void ScConditionEntry::DataChanged() const { //FIXME: Nothing so far } @@ -1590,10 +1590,10 @@ ScCondFormatEntry::~ScCondFormatEntry() { } -void ScCondFormatEntry::DataChanged( const ScRange* pModified ) const +void ScCondFormatEntry::DataChanged() const { if ( pCondFormat ) - pCondFormat->DoRepaint( pModified ); + pCondFormat->DoRepaint( nullptr ); } ScFormatEntry* ScCondFormatEntry::Clone( ScDocument* pDoc ) const diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 2fd1ad4986df..6c5021551ae3 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -186,12 +186,11 @@ static SfxItemInfo const aItemInfos[] = static_assert( SAL_N_ELEMENTS(aItemInfos) == ATTR_ENDINDEX - ATTR_STARTINDEX + 1, "these must match"); -ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) +ScDocumentPool::ScDocumentPool() : SfxItemPool ( OUString("ScDocumentPool"), ATTR_STARTINDEX, ATTR_ENDINDEX, - aItemInfos, nullptr, false/*bLoadRefCounts*/ ), - pSecondary ( pSecPool ) + aItemInfos, nullptr, false/*bLoadRefCounts*/ ) { // latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead vcl::Font aStdFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, @@ -334,9 +333,6 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) SetDefaults( ppPoolDefaults ); - if ( pSecondary ) - SetSecondaryPool( pSecondary ); - // ATTR_LANGUAGE_FORMAT from sv329 inserted, VersionMap in _ScGlobal__Init SetVersionMap( 1, 100, 157, pVersionMap1 ); @@ -387,7 +383,6 @@ ScDocumentPool::~ScDocumentPool() } delete[] ppPoolDefaults; - SfxItemPool::Free(pSecondary); } void ScDocumentPool::InitVersionMaps() diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 711212a5e66c..2bfff6a1205b 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1401,7 +1401,7 @@ void ScDocument::Sort( } } -void ScDocument::Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress ) +void ScDocument::Reorder( const sc::ReorderParam& rParam ) { ScTable* pTab = FetchTable(rParam.maSortRange.aStart.Tab()); if (!pTab) @@ -1409,7 +1409,7 @@ void ScDocument::Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress bool bOldEnableIdle = IsIdleEnabled(); EnableIdle(false); - pTab->Reorder(rParam, pProgress); + pTab->Reorder(rParam, nullptr); EnableIdle(bOldEnableIdle); } diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 65d9f9ca5a1c..f5f9f0c3e5e1 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -264,7 +264,7 @@ void ScDocument::GetChartRanges( const OUString& rChartName, ::std::vector< ScRa for(const OUString & aRangeString : aRangeStrings) { ScRangeList aRanges; - aRanges.Parse( aRangeString, pSheetNameDoc, ScRefFlags::VALID, pSheetNameDoc->GetAddressConvention() ); + aRanges.Parse( aRangeString, pSheetNameDoc, pSheetNameDoc->GetAddressConvention() ); rRangesVector.push_back(aRanges); } } diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx index 6f7030bf2b73..d8ebcfed0a70 100644 --- a/sc/source/core/data/documentimport.cxx +++ b/sc/source/core/data/documentimport.cxx @@ -500,8 +500,8 @@ class CellStoreInitializer sc::CellTextAttrStoreType::iterator miPos; SvtScriptType mnScriptNumeric; - Impl(const sal_uInt32 nMaxRowCount, const SvtScriptType nScriptNumeric) - : maAttrs(nMaxRowCount), miPos(maAttrs.begin()), mnScriptNumeric(nScriptNumeric) + Impl(const SvtScriptType nScriptNumeric) + : maAttrs(MAXROWCOUNT), miPos(maAttrs.begin()), mnScriptNumeric(nScriptNumeric) {} }; @@ -514,7 +514,7 @@ public: mrDocImpl(rDocImpl), mnTab(nTab), mnCol(nCol), - mpImpl(new Impl(MAXROWCOUNT, mrDocImpl.mnDefaultScriptNumeric)) + mpImpl(new Impl(mrDocImpl.mnDefaultScriptNumeric)) {} std::shared_ptr<Impl> mpImpl; diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 002decfc7147..dd618e8c7d30 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -72,13 +72,11 @@ ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const OUString& rStyleName ) { } -ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet ) +ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet ) : SfxSetItem ( ATTR_PATTERN, pItemSet ), pName ( nullptr ), - pStyle ( pStyleSheet ) + pStyle ( nullptr ) { - if ( pStyleSheet ) - GetItemSet().SetParent( &pStyleSheet->GetItemSet() ); } ScPatternAttr::ScPatternAttr( SfxItemPool* pItemPool ) diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index bef1af0c0952..52df776be131 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -1210,7 +1210,7 @@ void ScTable::FillFormulaVertical( return; aCol[nCol].DeleteRanges(aSpans, InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING | InsertDeleteFlags::FORMULA | InsertDeleteFlags::OUTLINE); - aCol[nCol].CloneFormulaCell(rSrcCell, sc::CellTextAttr(), aSpans, nullptr); + aCol[nCol].CloneFormulaCell(rSrcCell, sc::CellTextAttr(), aSpans); std::shared_ptr<sc::ColumnBlockPositionSet> pSet(new sc::ColumnBlockPositionSet(*pDocument)); sc::StartListeningContext aStartCxt(*pDocument, pSet); diff --git a/sc/source/core/tool/bulkdatahint.cxx b/sc/source/core/tool/bulkdatahint.cxx index 72ac7c025a2b..134c50809d28 100644 --- a/sc/source/core/tool/bulkdatahint.cxx +++ b/sc/source/core/tool/bulkdatahint.cxx @@ -21,8 +21,8 @@ struct BulkDataHint::Impl mpSpans(pSpans) {} }; -BulkDataHint::BulkDataHint( ScDocument& rDoc, const ColumnSpanSet* pSpans ) : - SfxSimpleHint(SC_HINT_BULK_DATACHANGED), mpImpl(new Impl(rDoc, pSpans)) {} +BulkDataHint::BulkDataHint( ScDocument& rDoc ) : + SfxSimpleHint(SC_HINT_BULK_DATACHANGED), mpImpl(new Impl(rDoc, nullptr)) {} BulkDataHint::~BulkDataHint() { diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index b680eb40c88e..d73dd79adfd6 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -157,7 +157,7 @@ ScRangeList::~ScRangeList() RemoveAll(); } -ScRefFlags ScRangeList::Parse( const OUString& rStr, ScDocument* pDoc, ScRefFlags nMask, +ScRefFlags ScRangeList::Parse( const OUString& rStr, ScDocument* pDoc, formula::FormulaGrammar::AddressConvention eConv, SCTAB nDefaultTab, sal_Unicode cDelimiter ) { @@ -166,7 +166,6 @@ ScRefFlags ScRangeList::Parse( const OUString& rStr, ScDocument* pDoc, ScRefFlag if (!cDelimiter) cDelimiter = ScCompiler::GetNativeSymbolChar(ocSep); - nMask |= ScRefFlags::VALID; // falls das jemand vergessen sollte ScRefFlags nResult = ~ScRefFlags::ZERO; // alle Bits setzen ScRange aRange; const SCTAB nTab = pDoc ? nDefaultTab : 0; @@ -186,7 +185,7 @@ ScRefFlags ScRangeList::Parse( const OUString& rStr, ScDocument* pDoc, ScRefFlag if ( (nRes & ScRefFlags::VALID ) && (nTmp1 != ScRefFlags::ZERO) && ( nTmp2 != nEndRangeBits ) ) applyStartToEndFlags(nRes, nTmp1); - if ( (nRes & nMask) == nMask ) + if ( nRes & ScRefFlags::VALID ) Append( aRange ); nResult &= nRes; // alle gemeinsamen Bits bleiben erhalten } diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 34a855c12560..eac2a9c23328 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -181,7 +181,7 @@ void ImportExcel::Formula( } ExcelToSc::ExcelToSc( XclImpRoot& rRoot ) : - ExcelConverterBase(rRoot.GetDocImport().getDoc().GetSharedStringPool(), 512), + ExcelConverterBase(rRoot.GetDocImport().getDoc().GetSharedStringPool()), XclImpRoot( rRoot ), maFuncProv( rRoot ), meBiff( rRoot.GetBiff() ) diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index 16ec427d0180..71140167f2b7 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -169,8 +169,8 @@ void ConverterBase::Reset() aStack.Reset(); } -ExcelConverterBase::ExcelConverterBase( svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ) : - ConverterBase(rSPool, nNewBuffer) +ExcelConverterBase::ExcelConverterBase( svl::SharedStringPool& rSPool ) : + ConverterBase(rSPool, 512) { } @@ -190,8 +190,8 @@ void ExcelConverterBase::Reset() aEingPos.Set( 0, 0, 0 ); } -LotusConverterBase::LotusConverterBase( SvStream &rStr, svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffers ) : - ConverterBase(rSPool, nNewBuffers), +LotusConverterBase::LotusConverterBase( SvStream &rStr, svl::SharedStringPool& rSPool ) : + ConverterBase(rSPool, 128), aIn( rStr ), nBytesLeft( 0 ) { diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index f2b87ff1db52..f6c1cb61bbc4 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -29,8 +29,9 @@ const sal_uInt16 TokenPool::nScTokenOff = 8192; -TokenStack::TokenStack( sal_uInt16 nNewSize ) +TokenStack::TokenStack( ) { + const sal_uInt16 nNewSize = 1024; pStack = new TokenId[ nNewSize ]; Reset(); diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 5c24f293110b..4e4c4a9ccb8c 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -481,11 +481,11 @@ void XclExpChFutureRecordBase::Save( XclExpStream& rStrm ) // Frame formatting =========================================================== -XclExpChFramePos::XclExpChFramePos( sal_uInt16 nTLMode, sal_uInt16 nBRMode ) : +XclExpChFramePos::XclExpChFramePos( sal_uInt16 nTLMode ) : XclExpRecord( EXC_ID_CHFRAMEPOS, 20 ) { maData.mnTLMode = nTLMode; - maData.mnBRMode = nBRMode; + maData.mnBRMode = EXC_CHFRAMEPOS_PARENT; } void XclExpChFramePos::WriteBody( XclExpStream& rStrm ) @@ -1212,7 +1212,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > const & xTitle, sal_uInt16 ConvertRotationBase( aTitleProp, true ); // manual text position - only for main title - mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_PARENT, EXC_CHFRAMEPOS_PARENT ) ); + mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_PARENT ) ); if( nTarget == EXC_CHOBJLINK_TITLE ) { Any aRelPos; @@ -2307,7 +2307,7 @@ void XclExpChLegend::Convert( const ScfPropertySet& rPropSet ) Reference< cssc::XChartDocument > xChart1Doc( GetChartDocument(), UNO_QUERY_THROW ); Reference< XShape > xChart1Legend( xChart1Doc->getLegend(), UNO_SET_THROW ); // coordinates in CHLEGEND record written but not used by Excel - mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_CHARTSIZE, EXC_CHFRAMEPOS_PARENT ) ); + mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_CHARTSIZE ) ); XclChFramePos& rFramePos = mxFramePos->GetFramePosData(); rFramePos.mnTLMode = EXC_CHFRAMEPOS_CHARTSIZE; css::awt::Point aLegendPos = xChart1Legend->getPosition(); @@ -3215,7 +3215,7 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > const & xDiagram, sal // the CHAXESSET record contains the inner plot area maData.maRect = CalcChartRectFromHmm( xPositioning->calculateDiagramPositionExcludingAxes() ); // the embedded CHFRAMEPOS record contains the outer plot area - mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_PARENT, EXC_CHFRAMEPOS_PARENT ) ); + mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_PARENT ) ); // for pie charts, always use inner plot area size to exclude the data labels as Excel does const XclExpChTypeGroup* pFirstTypeGroup = GetFirstTypeGroup().get(); bool bPieChart = pFirstTypeGroup && (pFirstTypeGroup->GetTypeInfo().meTypeCateg == EXC_CHTYPECATEG_PIE); diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index 57097ff41653..170d5e51ec46 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -210,10 +210,10 @@ void ScfSimpleProgressBar::Init( sal_Size nSize ) maProgress.ActivateSegment( nSegment ); } -ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, sal_uInt16 nResId ) : +ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell ) : mrStrm( rStrm ) { - Init( pDocShell, ScGlobal::GetRscString( nResId ) ); + Init( pDocShell, ScGlobal::GetRscString( STR_LOAD_DOC ) ); } void ScfStreamProgressBar::Progress() diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 27e54c642034..85e9566dacfc 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -97,7 +97,7 @@ protected: class ExcelConverterBase : public ConverterBase { protected: - ExcelConverterBase( svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ); + ExcelConverterBase( svl::SharedStringPool& rSPool ); virtual ~ExcelConverterBase(); public: @@ -123,7 +123,7 @@ protected: inline void Read( double& fDouble ); inline void Read( sal_uInt32& nUINT32 ); - LotusConverterBase( SvStream& rStr, svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ); + LotusConverterBase( SvStream& rStr, svl::SharedStringPool& rSPool ); virtual ~LotusConverterBase(); public: diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 9070a007b63b..8df4e74ac492 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -205,7 +205,7 @@ private: class ScfStreamProgressBar { public: - explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, sal_uInt16 nResId = STR_LOAD_DOC ); + explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell ); /** Sets the progress bar to the current stream position. */ void Progress(); diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index ffac2697be5f..98b40a150041 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -222,10 +222,10 @@ class TokenStack { private: TokenId* pStack; // Stack as Array - sal_uInt16 nPos; // Write-mark - sal_uInt16 nSize; // first Index outside of stack + sal_uInt16 nPos; // Write-mark + sal_uInt16 nSize; // first Index outside of stack public: - TokenStack( sal_uInt16 nNewSize = 1024 ); + TokenStack(); ~TokenStack(); inline TokenStack& operator <<( const TokenId& rNewId ); inline void operator >>( TokenId &rId ); diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index 7f0b5d756206..bf5f3e93bdc8 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -88,14 +88,14 @@ private: FormIdent aIdents[ nSize_ ]; //gepufferte Formate bool bValid[ nSize_ ]; FormIdent aCompareIdent; // zum Vergleichen - sal_uInt8 nDefaultFormat; // Defaultformat der Datei + sal_uInt8 nDefaultFormat; // Defaultformat der Datei SvNumberFormatter* pFormTable; // Value-Format-Table-Anker StampTyp nIndex; LanguageType eLanguage; // Systemsprache SfxUInt32Item* NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ); public: - FormCache( ScDocument*, sal_uInt8 nNewDefaultFormat = 0xFF ); + FormCache( ScDocument* ); ~FormCache(); inline const SfxUInt32Item* GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt ); diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 7ba80f109c79..14223119f284 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -201,7 +201,7 @@ public: class XclExpChFramePos : public XclExpRecord { public: - explicit XclExpChFramePos( sal_uInt16 nTLMode, sal_uInt16 nBRMode ); + explicit XclExpChFramePos( sal_uInt16 nTLMode ); /** Returns read/write access to the frame position data. */ inline XclChFramePos& GetFramePosData() { return maData; } diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 75ce42974aa3..480fb324ea4c 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -358,7 +358,7 @@ void LotusToSc::Reset( const ScAddress& rEingPos ) LotusToSc::LotusToSc(LotusContext &rContext, SvStream &rStream, svl::SharedStringPool& rSPool, rtl_TextEncoding e, bool b) - : LotusConverterBase(rStream, rSPool, 128) + : LotusConverterBase(rStream, rSPool) , m_rContext(rContext) { eSrcChar = e; diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 8e867fd8e469..cf12bc2e160e 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -147,10 +147,10 @@ double Snum32ToDouble( sal_uInt32 nValue ) return fValue; } -FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat ) +FormCache::FormCache( ScDocument* pDoc1 ) : nIndex(0) { // Default format is 'Default' - nDefaultFormat = nNewDefaultFormat; + nDefaultFormat = 0xff; pFormTable = pDoc1->GetFormatTable(); for(bool & rb : bValid) rb = false; diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 75b83ff2ce4d..239e8bc433b6 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -40,9 +40,8 @@ using namespace ::com::sun::star; using namespace xmloff::token; -XMLTableShapeImportHelper::XMLTableShapeImportHelper( - ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : - XMLShapeImportHelper(rImp, rImp.GetModel(), pImpMapper ), +XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp ) : + XMLShapeImportHelper(rImp, rImp.GetModel(), nullptr ), pAnnotationContext(nullptr), bOnTable(false) { diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index 1e1fcf91f72c..c0d39ac2b03f 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -34,7 +34,7 @@ class XMLTableShapeImportHelper : public XMLShapeImportHelper public: - XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=nullptr ); + XMLTableShapeImportHelper( ScXMLImport& rImp ); virtual ~XMLTableShapeImportHelper(); static void SetLayer(css::uno::Reference<css::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index b9388e254c69..91258f78754e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -628,22 +628,10 @@ AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( return new AbstractScSortWarningDlg_Impl( pDlg ); } -AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - int nId ) +AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList ) { - VclPtr<ScCondFormatManagerDlg> pDlg; - switch( nId ) - { - case RID_SCDLG_COND_FORMAT_MANAGER: - pDlg = VclPtr<ScCondFormatManagerDlg>::Create( pParent, pDoc, pFormatList ); - break; - default: - break; - } - if(pDlg) - return new AbstractScCondFormatManagerDlg_Impl( pDlg ); - - return nullptr; + VclPtr<ScCondFormatManagerDlg> pDlg = VclPtr<ScCondFormatManagerDlg>::Create( pParent, pDoc, pFormatList ); + return new AbstractScCondFormatManagerDlg_Impl( pDlg ); } AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(vcl::Window* pParent) @@ -660,22 +648,10 @@ AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilo } AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( vcl::Window* pParent, - const std::vector<OUString>& rServices, - int nId ) + const std::vector<OUString>& rServices ) { - VclPtr<ScDataPilotServiceDlg> pDlg; - switch ( nId ) - { - case RID_SCDLG_DAPISERVICE : - pDlg = VclPtr<ScDataPilotServiceDlg>::Create( pParent, rServices ); - break; - default: - break; - } - - if ( pDlg ) - return new AbstractScDataPilotServiceDlg_Impl( pDlg ); - return nullptr; + VclPtr<ScDataPilotServiceDlg> pDlg = VclPtr<ScDataPilotServiceDlg>::Create( pParent, rServices ); + return new AbstractScDataPilotServiceDlg_Impl( pDlg ); } AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(vcl::Window* pParent, @@ -720,22 +696,10 @@ AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( vcl: } AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( vcl::Window* pParent, - int nId, bool bDisallowCellMove ) { - VclPtr<ScInsertCellDlg> pDlg; - switch ( nId ) - { - case RID_SCDLG_INSCELL : - pDlg = VclPtr<ScInsertCellDlg>::Create( pParent, bDisallowCellMove); - break; - default: - break; - } - - if ( pDlg ) - return new AbstractScInsertCellDlg_Impl( pDlg ); - return nullptr; + VclPtr<ScInsertCellDlg> pDlg = VclPtr<ScInsertCellDlg>::Create( pParent, bDisallowCellMove); + return new AbstractScInsertCellDlg_Impl( pDlg ); } AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( vcl::Window* pParent, @@ -772,12 +736,10 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg FieldUnit eFUnit, sal_uInt16 nDecimals, long nMaximum , - long nMinimum, - long nFirst, - long nLast ) + long nMinimum ) { VclPtr<ScMetricInputDlg> pDlg = VclPtr<ScMetricInputDlg>::Create(pParent, sDialogName, nCurrent ,nDefault, eFUnit, - nDecimals, nMaximum , nMinimum , nFirst, nLast); + nDecimals, nMaximum , nMinimum , 1, 100); return new AbstractScMetricInputDlg_Impl( pDlg ); } @@ -827,28 +789,22 @@ AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( } AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg( - vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) + vcl::Window* pParent, const ScDPNumGroupInfo& rInfo ) { - if( nId == RID_SCDLG_DPNUMGROUP ) - return new AbstractScDPNumGroupDlg_Impl( VclPtr<ScDPNumGroupDlg>::Create( pParent, rInfo ) ); - return nullptr; + return new AbstractScDPNumGroupDlg_Impl( VclPtr<ScDPNumGroupDlg>::Create( pParent, rInfo ) ); } AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( - vcl::Window* pParent, int nId, + vcl::Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) { - if( nId == RID_SCDLG_DPDATEGROUP ) - return new AbstractScDPDateGroupDlg_Impl( VclPtr<ScDPDateGroupDlg>::Create( pParent, rInfo, nDatePart, rNullDate ) ); - return nullptr; + return new AbstractScDPDateGroupDlg_Impl( VclPtr<ScDPDateGroupDlg>::Create( pParent, rInfo, nDatePart, rNullDate ) ); } AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg ( - vcl::Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) + vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) { - if( nId == RID_SCDLG_DPSHOWDETAIL ) - return new AbstractScDPShowDetailDlg_Impl( VclPtr<ScDPShowDetailDlg>::Create( pParent, rDPObj, nOrient ) ); - return nullptr; + return new AbstractScDPShowDetailDlg_Impl( VclPtr<ScDPShowDetailDlg>::Create( pParent, rDPObj, nOrient ) ); } AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(vcl::Window* pParent, const OUString& rName, diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index f48771faf6a2..3955053c2ca6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -423,8 +423,7 @@ public: virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) override; - virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - int nId ) override; + virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList ) override; virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) override; @@ -432,8 +431,7 @@ public: bool bEnableExternal) override; virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, - const std::vector<OUString>& rServices, - int nId ) override; + const std::vector<OUString>& rServices ) override; virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove ) override; //for dataform @@ -455,7 +453,6 @@ public: bool bUnGroup = false) override; virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent, - int nId, bool bDisallowCellMove ) override; virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent, @@ -476,9 +473,7 @@ public: FieldUnit eFUnit, sal_uInt16 nDecimals = 2, long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, - long nLast = 100 ) override; + long nMinimum = 0 ) override; virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(vcl::Window * pParent, const OUString& rDefault) override; @@ -503,16 +498,14 @@ public: const ScDPNameVec& rDataFields ) override; virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent, - int nId, const ScDPNumGroupInfo& rInfo ) override; virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( vcl::Window* pParent, - int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) override; - virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, int nId, + virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) override; diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 8f0d621c0af1..d75bb340aff9 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -557,7 +557,7 @@ ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const ScRangeList aRange; ScRefFlags nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(), - ScRefFlags::VALID, mpViewData->GetDocument()->GetAddressConvention(), maPos.Tab()); + mpViewData->GetDocument()->GetAddressConvention(), maPos.Tab()); ScConditionalFormat* pFormat = mpCondFormList->GetConditionalFormat(); if((nFlags & ScRefFlags::VALID) && !aRange.empty() && pFormat) @@ -761,7 +761,7 @@ IMPL_LINK_TYPED( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void ) OUString aRangeStr = rEdit.GetText(); ScRangeList aRange; ScRefFlags nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(), - ScRefFlags::VALID, mpViewData->GetDocument()->GetAddressConvention()); + mpViewData->GetDocument()->GetAddressConvention()); if(nFlags & ScRefFlags::VALID) rEdit.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); else diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 43c8cbe6ef1d..7a504b87cc06 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -82,9 +82,9 @@ const sal_uInt16 ScTPValidationValue::pValueRanges[] = }; ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, - ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) + ScTabViewShell *pTabViewSh) : ScValidationDlgBase(pParent ? pParent : SfxGetpApp()->GetTopWindow(), - "ValidationDialog", "modules/scalc/ui/validationdialog.ui", pArgSet, pB) + "ValidationDialog", "modules/scalc/ui/validationdialog.ui", pArgSet, nullptr) , m_pTabVwSh(pTabViewSh) , m_nValuePageId(0) , m_bOwnRefHdlr(false) diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 628b26cc0d71..1e5ce4c12c70 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -388,7 +388,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bApi, bool bIsUnnamed, // Sortieren ohne SubTotals aSubTotalParam.bRemoveOnly = true; // wird unten wieder zurueckgesetzt - DoSubTotals( nTab, aSubTotalParam, nullptr, false, bApi ); + DoSubTotals( nTab, aSubTotalParam, false, bApi ); } if (bSort) @@ -413,7 +413,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bApi, bool bIsUnnamed, { pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben aSubTotalParam.bRemoveOnly = false; - DoSubTotals( nTab, aSubTotalParam, nullptr, false, bApi ); + DoSubTotals( nTab, aSubTotalParam, false, bApi ); } if (bRecord) @@ -950,7 +950,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, } void ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, - const ScSortParam* pForceNewSort, bool bRecord, bool bApi ) + bool bRecord, bool bApi ) { //! auch fuer ScDBFunc::DoSubTotals benutzen! // dann bleibt aussen: @@ -1060,7 +1060,7 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, if (bDo) { // Sortieren - if ( rParam.bDoSort || pForceNewSort ) + if ( rParam.bDoSort ) { pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 ); @@ -1069,7 +1069,7 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, ScSortParam aOldSort; pDBData->GetSortParam( aOldSort ); - ScSortParam aSortParam( aNewParam, pForceNewSort ? *pForceNewSort : aOldSort ); + ScSortParam aSortParam( aNewParam, aOldSort ); Sort( nTab, aSortParam, false, false, bApi ); } diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index ccbbe56d5fc2..877faddac2e1 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2824,7 +2824,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, nStartCol, nStartRow, nStartTab, nOldEndCol, nOldEndRow, nEndTab ), ScAddress( nDestCol, nDestRow, nDestTab ), - bCut, pUndoDoc, nullptr, bScenariosAdded ) ); + bCut, pUndoDoc, bScenariosAdded ) ); } SCCOL nDestPaintEndCol = nDestEndCol; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 0c203013a5dc..9d3fcb3b08b7 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -586,7 +586,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if (pChangeTrack) { if ( pChangeTrack->IsProtected() ) - bDo = ExecuteChangeProtectionDialog( nullptr ); + bDo = ExecuteChangeProtectionDialog(); } if ( bDo ) { @@ -621,7 +621,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_CHG_PROTECT : { - if ( ExecuteChangeProtectionDialog( nullptr ) ) + if ( ExecuteChangeProtectionDialog() ) { rReq.Done(); SetDocumentModified(); @@ -644,12 +644,12 @@ void ScDocShell::Execute( SfxRequest& rReq ) WinBits(WB_YES_NO | WB_DEF_NO), ScGlobal::GetRscString( STR_END_REDLINING ) ); if( aBox->Execute() == RET_YES ) - bDo = ExecuteChangeProtectionDialog( nullptr, true ); + bDo = ExecuteChangeProtectionDialog( true ); else bDo = false; } else // merge might reject some actions - bDo = ExecuteChangeProtectionDialog( nullptr, true ); + bDo = ExecuteChangeProtectionDialog( true ); } if ( !bDo ) { @@ -1132,7 +1132,7 @@ void UpdateAcceptChangesDialog() } } -bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJustQueryIfProtected ) +bool ScDocShell::ExecuteChangeProtectionDialog( bool bJustQueryIfProtected ) { bool bDone = false; ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack(); @@ -1147,7 +1147,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJus OUString aPassword; ScopedVclPtrInstance<SfxPasswordDialog> pDlg( - _pParent ? _pParent : GetActiveDialogParent(), &aText ); + GetActiveDialogParent(), &aText ); pDlg->SetText( aTitle ); pDlg->SetMinLen( 1 ); pDlg->SetHelpId( GetStaticInterface()->GetSlot(SID_CHG_PROTECT)->GetCommand() ); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f23346ce0ebd..bb949ce08ae2 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -143,7 +143,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie // use ScChartPositioner to auto-detect column/row headers (like ScChartArray in old version) ScRangeListRef aRangeListRef( new ScRangeList ); - aRangeListRef->Parse( aRangeString, &rScDoc, ScRefFlags::VALID, rScDoc.GetAddressConvention() ); + aRangeListRef->Parse( aRangeString, &rScDoc, rScDoc.GetAddressConvention() ); if ( !aRangeListRef->empty() ) { rScDoc.LimitChartIfAll( aRangeListRef ); // limit whole columns/rows to used area diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index 5a538ca12ab8..bebf5d7f54dd 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -75,7 +75,6 @@ public: const ScRange* pAdvSource, bool bRecord, bool bApi ); void DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, - const ScSortParam* pForceNewSort, bool bRecord, bool bApi ); bool AddDBRange( const OUString& rName, const ScRange& rRange, bool bApi ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 2f09dde27fd5..f53209bfd4b3 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -255,7 +255,7 @@ public: /// If bJustQueryIfProtected==sal_True protection is not /// changed and <TRUE/> is returned if not protected or /// password was entered correctly. - bool ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJustQueryIfProtected = false ); + bool ExecuteChangeProtectionDialog( bool bJustQueryIfProtected = false ); void SetPrintZoom( SCTAB nTab, sal_uInt16 nScale, sal_uInt16 nPages ); bool AdjustPrintZoom( const ScRange& rRange ); diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 522bf63bf043..de3ae5f238a1 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -127,10 +127,9 @@ class ScDBFuncUndo: public ScSimpleUndo protected: ScDBData* pAutoDBRange; ScRange aOriginalRange; - SdrUndoAction* mpDrawUndo; public: - ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo = nullptr ); + ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal ); virtual ~ScDBFuncUndo(); void BeginUndo(); diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 3187163aefd3..8fc8432b7bb9 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -214,7 +214,7 @@ class ScUndoDragDrop: public ScMoveUndo public: ScUndoDragDrop( ScDocShell* pNewDocShell, const ScRange& rRange, ScAddress aNewDestPos, bool bNewCut, - ScDocument* pUndoDocument, ScRefUndoData* pRefData, + ScDocument* pUndoDocument, bool bScenario ); virtual ~ScUndoDragDrop(); @@ -561,7 +561,7 @@ class ScUndoRefConversion: public ScSimpleUndo public: ScUndoRefConversion( ScDocShell* pNewDocShell, const ScRange& aMarkRange, const ScMarkData& rMark, - ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, InsertDeleteFlags nNewFlag); + ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti); virtual ~ScUndoRefConversion(); virtual void Undo() override; @@ -577,7 +577,6 @@ private: ScDocument* pRedoDoc; ScRange aRange; bool bMulti; - InsertDeleteFlags nFlags; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 8270dda2568e..564e8979de92 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -440,7 +440,7 @@ public: const ScMarkData& rMark, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, InsertDeleteFlags nNewFlags, - ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3 + ScRefUndoData* pRefData ); virtual ~ScUndoDataForm(); diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 460947e192e3..905b250fc258 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -175,7 +175,7 @@ class ScValidationDlg bool LeaveRefStatus(); public: - explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = nullptr ); + explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh ); virtual ~ScValidationDlg(); virtual void dispose() override { diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 5602bed8c6ef..da2358a354b8 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -507,24 +507,23 @@ void ScMoveUndo::EndUndo() ScSimpleUndo::EndUndo(); } -ScDBFuncUndo::ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo ) : +ScDBFuncUndo::ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal ) : ScSimpleUndo( pDocSh ), - aOriginalRange( rOriginal ), - mpDrawUndo( pDrawUndo ) + aOriginalRange( rOriginal ) { pAutoDBRange = pDocSh->GetOldAutoDBRange(); } ScDBFuncUndo::~ScDBFuncUndo() { - DeleteSdrUndoAction( mpDrawUndo ); + DeleteSdrUndoAction( nullptr ); delete pAutoDBRange; } void ScDBFuncUndo::BeginUndo() { ScSimpleUndo::BeginUndo(); - DoSdrUndoAction( mpDrawUndo, &pDocShell->GetDocument() ); + DoSdrUndoAction( nullptr, &pDocShell->GetDocument() ); } void ScDBFuncUndo::EndUndo() @@ -561,7 +560,7 @@ void ScDBFuncUndo::EndUndo() void ScDBFuncUndo::BeginRedo() { - RedoSdrUndoAction( mpDrawUndo ); + RedoSdrUndoAction( nullptr ); if ( pAutoDBRange ) { // move the database range to this function's position again (see ScDocShell::GetDBData) diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index a79c621287af..a11065eb6701 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1101,8 +1101,8 @@ bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell, const ScRange& rRange, ScAddress aNewDestPos, bool bNewCut, - ScDocument* pUndoDocument, ScRefUndoData* pRefData, bool bScenario ) : - ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFFIRST ), + ScDocument* pUndoDocument, bool bScenario ) : + ScMoveUndo( pNewDocShell, pUndoDocument, nullptr, SC_UNDO_REFFIRST ), mnPaintExtFlags( 0 ), aSrcRange( rRange ), bCut( bNewCut ), diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 2c7fa64bc6d2..2f88c2995fb7 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -1273,14 +1273,13 @@ bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell, const ScRange& aMarkRange, const ScMarkData& rMark, - ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, InsertDeleteFlags nNewFlag) : + ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti) : ScSimpleUndo( pNewDocShell ), aMarkData ( rMark ), pUndoDoc ( pNewUndoDoc ), pRedoDoc ( pNewRedoDoc ), aRange ( aMarkRange ), -bMulti ( bNewMulti ), -nFlags ( nNewFlag ) +bMulti ( bNewMulti ) { SetChangeTrack(); } @@ -1299,7 +1298,7 @@ OUString ScUndoRefConversion::GetComment() const void ScUndoRefConversion::SetChangeTrack() { ScChangeTrack* pChangeTrack = pDocShell->GetDocument().GetChangeTrack(); - if ( pChangeTrack && (nFlags & InsertDeleteFlags::FORMULA) ) + if ( pChangeTrack ) pChangeTrack->AppendContentsIfInRefDoc( pUndoDoc, nStartChangeAction, nEndChangeAction ); else @@ -1318,7 +1317,7 @@ void ScUndoRefConversion::DoChange( ScDocument* pRefDoc) SCTAB nTabCount = rDoc.GetTableCount(); aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - pRefDoc->CopyToDocument( aCopyRange, nFlags, bMulti, rDoc, &aMarkData ); + pRefDoc->CopyToDocument( aCopyRange, InsertDeleteFlags::ALL, bMulti, rDoc, &aMarkData ); pDocShell->PostPaint( aRange, PAINT_GRID); pDocShell->PostDataChanged(); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index c23439899b3b..28d5dcf0d603 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -1790,8 +1790,7 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, InsertDeleteFlags nNewFlags, - ScRefUndoData* pRefData, - void* /*pFill1*/, void* /*pFill2*/, void* /*pFill3*/ ) : + ScRefUndoData* pRefData ) : ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ), mpMarkData(new ScMarkData(rMark)), pUndoDoc( pNewUndoDoc ), diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx index 7ca1aa485f2a..ec29bb2ace6e 100644 --- a/sc/source/ui/undo/undosort.cxx +++ b/sc/source/ui/undo/undosort.cxx @@ -42,7 +42,7 @@ void UndoSort::Execute( bool bUndo ) sc::ReorderParam aParam = maParam; if (bUndo) aParam.reverse(); - rDoc.Reorder(aParam, nullptr); + rDoc.Reorder(aParam); if (maParam.mbHasHeaders) { diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index d4f2318ffb88..7fb5029ce5f2 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5860,7 +5860,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen ScDBDocFunc aFunc(*pDocSh); - aFunc.DoSubTotals( nTab, aParam, nullptr, true, true ); // Bereich muss angelegt sein + aFunc.DoSubTotals( nTab, aParam, true, true ); // Bereich muss angelegt sein } } @@ -5887,7 +5887,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException, std pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen ScDBDocFunc aFunc(*pDocSh); - aFunc.DoSubTotals( nTab, aParam, nullptr, true, true ); // Bereich muss angelegt sein + aFunc.DoSubTotals( nTab, aParam, true, true ); // Bereich muss angelegt sein } } diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index a28f0c970212..a27ebbcce24e 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -1037,7 +1037,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi { if( pSaveData->GetDataLayoutDimension() ) { - ScFieldIdentifier aFieldId( OUString( SC_DATALAYOUT_NAME ), 0, true ); + ScFieldIdentifier aFieldId( OUString( SC_DATALAYOUT_NAME ), true ); return new ScDataPilotFieldObj( *this, aFieldId ); } } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 4e7fe86bc02d..dfc6dcac94b2 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1148,7 +1148,7 @@ ScVbaRange::getCellRangesForAddress( ScRefFlags& rResFlags, const OUString& sAdd if ( pDocSh ) { ScDocument& rDoc = pDocSh->GetDocument(); - rResFlags = rCellRanges.Parse( sAddress, &rDoc, ScRefFlags::VALID, eConv, 0, cDelimiter ); + rResFlags = rCellRanges.Parse( sAddress, &rDoc, eConv, 0, cDelimiter ); if ( rResFlags & ScRefFlags::VALID ) { return true; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 5c52886efc0d..0c6d36d35d5d 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -340,8 +340,7 @@ public: const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, const uno::Type& rVbaType, - const OUString& rModelServiceName, - sal_Int16 nComponentType ) throw (uno::RuntimeException); + const OUString& rModelServiceName ) throw (uno::RuntimeException); protected: uno::Reference< container::XIndexContainer > const & createForm() throw (uno::RuntimeException); @@ -364,11 +363,10 @@ ScVbaControlContainer::ScVbaControlContainer( const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, const uno::Type& rVbaType, - const OUString& rModelServiceName, - sal_Int16 nComponentType ) throw (uno::RuntimeException) : + const OUString& rModelServiceName ) throw (uno::RuntimeException) : ScVbaObjectContainer( rxParent, rxContext, rxModel, rxSheet, rVbaType ), maModelServiceName( rModelServiceName ), - mnComponentType( nComponentType ) + mnComponentType( form::FormComponentType::COMMANDBUTTON ) { } @@ -464,8 +462,7 @@ ScVbaButtonContainer::ScVbaButtonContainer( ScVbaControlContainer( rxParent, rxContext, rxModel, rxSheet, cppu::UnoType<excel::XButton>::get(), - "com.sun.star.form.component.CommandButton", - form::FormComponentType::COMMANDBUTTON ) + "com.sun.star.form.component.CommandButton" ) { } diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 2f331a28d9f0..d44f759f501a 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -220,7 +220,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - std::unique_ptr<AbstractScInsertCellDlg> pDlg(pFact->CreateScInsertCellDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_INSCELL, bTheFlag)); + std::unique_ptr<AbstractScInsertCellDlg> pDlg(pFact->CreateScInsertCellDlg( pTabViewShell->GetDialogParent(), bTheFlag)); OSL_ENSURE(pDlg, "Dialog create fail!"); if (pDlg->Execute() == RET_OK) eCmd = pDlg->GetInsCellCmd(); @@ -1079,7 +1079,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); AbstractScDPShowDetailDlg* pDlg = pFact->CreateScDPShowDetailDlg( - pTabViewShell->GetDialogParent(), RID_SCDLG_DPSHOWDETAIL, *pDPObj, nOrientation ); + pTabViewShell->GetDialogParent(), *pDPObj, nOrientation ); OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) { @@ -1120,7 +1120,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OSL_ENSURE( pFact, "ScAbstractFactory create fail!" ); Date aNullDate( *GetViewData()->GetDocument()->GetFormatTable()->GetNullDate() ); AbstractScDPDateGroupDlg* pDlg = pFact->CreateScDPDateGroupDlg( - pTabViewShell->GetDialogParent(), RID_SCDLG_DPDATEGROUP, + pTabViewShell->GetDialogParent(), aNumInfo, nParts, aNullDate ); OSL_ENSURE( pDlg, "Dialog create fail!" ); if( pDlg->Execute() == RET_OK ) @@ -1134,7 +1134,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE( pFact, "ScAbstractFactory create fail!" ); AbstractScDPNumGroupDlg* pDlg = pFact->CreateScDPNumGroupDlg( - pTabViewShell->GetDialogParent(), RID_SCDLG_DPNUMGROUP, aNumInfo ); + pTabViewShell->GetDialogParent(), aNumInfo ); OSL_ENSURE( pDlg, "Dialog create fail!" ); if( pDlg->Execute() == RET_OK ) pTabViewShell->NumGroupDataPilot( pDlg->GetGroupInfo() ); @@ -2440,7 +2440,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() ); std::unique_ptr<AbstractScCondFormatManagerDlg> pDlg(pFact->CreateScCondFormatMgrDlg( - pTabViewShell->GetDialogParent(), pDoc, pList, RID_SCDLG_COND_FORMAT_MANAGER)); + pTabViewShell->GetDialogParent(), pDoc, pList)); short nRet = pDlg->Execute(); if(nRet == RET_OK && pDlg->CondFormatsChanged()) { @@ -2658,7 +2658,7 @@ void ScCellShell::ExecuteDataPilotDialog() std::vector<OUString> aSources = ScDPObject::GetRegisteredSources(); std::unique_ptr<AbstractScDataPilotServiceDlg> pServDlg( pFact->CreateScDataPilotServiceDlg( - pTabViewShell->GetDialogParent(), aSources, RID_SCDLG_DAPISERVICE)); + pTabViewShell->GetDialogParent(), aSources)); OSL_ENSURE(pServDlg, "Dialog create fail!"); if ( pServDlg->Execute() == RET_OK ) diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 0fafd4d34b2a..d0f51dfeb725 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -273,7 +273,7 @@ void getChartSourceRanges(ScDocument* pDoc, const SdrMarkList& rObjs, std::vecto { ScRangeList aRange; ScAddress aAddr; - if (aRange.Parse(*it, pDoc, ScRefFlags::VALID, pDoc->GetAddressConvention()) & ScRefFlags::VALID) + if (aRange.Parse(*it, pDoc, pDoc->GetAddressConvention()) & ScRefFlags::VALID) { for(size_t i = 0; i < aRange.size(); ++i) rRanges.push_back(*aRange[i]); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index b1db59642e1c..88d1f14e071b 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -1973,7 +1973,7 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow , nStartCol, nCurrentRow, nStartTab, nUndoEndCol, nUndoEndRow, nEndTab, rMark, pUndoDoc, pRedoDoc, nUndoFlags, - pUndoData, nullptr, nullptr, nullptr ); + pUndoData ); pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), true ); sal_uInt16 nPaint = PAINT_GRID; diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 96d77357e466..8204bff05e68 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -286,7 +286,7 @@ void ScViewFunc::DoRefConversion() pDocSh->GetUndoManager()->AddUndoAction( new ScUndoRefConversion( pDocSh, - aMarkRange, rMark, pUndoDoc, pRedoDoc, bMulti, InsertDeleteFlags::ALL) ); + aMarkRange, rMark, pUndoDoc, pRedoDoc, bMulti) ); } pDocSh->PostPaint( aMarkRange, PAINT_GRID ); |