compilerplugins/clang/unuseddefaultparams.cxx | 21 ++++- cui/source/factory/dlgfact.cxx | 16 +--- cui/source/factory/dlgfact.hxx | 12 +-- include/sfx2/childwin.hxx | 3 include/sfx2/fcontnr.hxx | 2 include/sfx2/progress.hxx | 2 include/sfx2/sfxdlg.hxx | 9 -- include/sfx2/tabdlg.hxx | 5 - include/svtools/calendar.hxx | 4 - include/svtools/ivctrl.hxx | 4 - include/svtools/transfer.hxx | 3 include/svtools/treelist.hxx | 6 - include/svx/framelinkarray.hxx | 15 +-- include/svx/galmisc.hxx | 3 include/svx/langbox.hxx | 6 - include/svx/svdedtv.hxx | 6 - include/svx/svdmrkv.hxx | 3 include/svx/svdoashp.hxx | 2 include/svx/svdobj.hxx | 2 include/svx/svdotable.hxx | 2 include/svx/svdotext.hxx | 2 include/svx/svxdlg.hxx | 3 include/svx/txencbox.hxx | 3 include/svx/view3d.hxx | 4 - sc/inc/address.hxx | 2 sc/inc/column.hxx | 7 - sc/inc/dociter.hxx | 9 -- sc/inc/document.hxx | 8 -- sc/inc/dpoutput.hxx | 2 sc/inc/editutil.hxx | 4 - sc/inc/filter.hxx | 3 sc/inc/table.hxx | 4 - sc/source/core/data/column2.cxx | 4 - sc/source/core/data/column3.cxx | 5 - sc/source/core/data/column4.cxx | 11 -- sc/source/core/data/dociter.cxx | 4 - sc/source/core/data/document.cxx | 14 +-- sc/source/core/data/dpoutput.cxx | 12 --- sc/source/core/data/table2.cxx | 8 +- sc/source/core/inc/interpre.hxx | 3 sc/source/core/tool/address.cxx | 13 --- sc/source/core/tool/editutil.cxx | 4 - sc/source/core/tool/interpr4.cxx | 5 - sc/source/filter/dif/difexp.cxx | 3 sc/source/filter/excel/xeformula.cxx | 6 - sc/source/filter/excel/xestream.cxx | 4 - sc/source/filter/excel/xestring.cxx | 4 - sc/source/filter/inc/addressconverter.hxx | 4 - sc/source/filter/inc/ftools.hxx | 3 sc/source/filter/inc/xestream.hxx | 4 - sc/source/filter/inc/xestring.hxx | 7 - sc/source/filter/oox/addressconverter.cxx | 10 +- sc/source/ui/cctrl/cbuttonw.cxx | 11 -- sc/source/ui/docshell/docsh.cxx | 35 ++++---- sc/source/ui/docshell/impex.cxx | 2 sc/source/ui/inc/anyrefdg.hxx | 2 sc/source/ui/inc/cbutton.hxx | 3 sc/source/ui/inc/docsh.hxx | 2 sc/source/ui/inc/mtrindlg.hxx | 2 sc/source/ui/inc/viewfunc.hxx | 9 +- sc/source/ui/miscdlgs/anyrefdg.cxx | 4 - sc/source/ui/miscdlgs/mtrindlg.cxx | 4 - sc/source/ui/view/viewfun4.cxx | 5 - sc/source/ui/view/viewfunc.cxx | 13 +-- sfx2/source/appl/childwin.cxx | 5 - sfx2/source/bastyp/fltfnc.cxx | 5 - sfx2/source/bastyp/progress.cxx | 5 - sfx2/source/dialog/tabdlg.cxx | 9 +- svtools/inc/roadmap.hxx | 2 svtools/source/brwbox/datwin.hxx | 2 svtools/source/contnr/imivctl.hxx | 16 +--- svtools/source/contnr/imivctl1.cxx | 22 ++--- svtools/source/contnr/ivctrl.cxx | 4 - svtools/source/contnr/svimpbox.cxx | 16 +--- svtools/source/contnr/treelist.cxx | 28 ------- svtools/source/control/calendar.cxx | 22 ++--- svtools/source/control/roadmap.cxx | 8 +- svtools/source/inc/svimpbox.hxx | 4 - svtools/source/misc/transfer2.cxx | 5 - svx/source/accessibility/svxrectctaccessiblecontext.cxx | 6 - svx/source/dialog/framelinkarray.cxx | 35 ++++---- svx/source/dialog/langbox.cxx | 8 +- svx/source/dialog/txencbox.cxx | 4 - svx/source/engine3d/view3d1.cxx | 64 ++++++---------- svx/source/form/fmvwimp.cxx | 7 - svx/source/gallery2/galmisc.cxx | 5 - svx/source/inc/fmexch.hxx | 4 - svx/source/inc/fmvwimp.hxx | 2 svx/source/inc/svxrectctaccessiblecontext.hxx | 2 svx/source/svdraw/svdedtv1.cxx | 15 +-- svx/source/svdraw/svdmrkv.cxx | 6 - svx/source/svdraw/svdoashp.cxx | 4 - svx/source/svdraw/svdobj.cxx | 2 svx/source/svdraw/svdotxat.cxx | 4 - svx/source/table/svdotable.cxx | 4 - sw/inc/dbmgr.hxx | 3 sw/inc/editsh.hxx | 5 - sw/inc/frmfmt.hxx | 2 sw/inc/ndarr.hxx | 3 sw/inc/ndtxt.hxx | 6 - sw/inc/node.hxx | 3 sw/inc/section.hxx | 2 sw/inc/view.hxx | 2 sw/source/core/docnode/node.cxx | 6 - sw/source/core/docnode/section.cxx | 4 - sw/source/core/edit/ednumber.cxx | 4 - sw/source/core/edit/edsect.cxx | 7 - sw/source/core/layout/atrfrm.cxx | 4 - sw/source/core/txtnode/ndtxt.cxx | 18 +--- sw/source/ui/fldui/fldpage.cxx | 29 +++---- sw/source/ui/fldui/fldpage.hxx | 5 - sw/source/uibase/dbui/dbmgr.cxx | 5 - sw/source/uibase/inc/inputwin.hxx | 2 sw/source/uibase/inc/wrtsh.hxx | 32 ++++---- sw/source/uibase/ribbar/inputwin.cxx | 4 - sw/source/uibase/uiview/viewsrch.cxx | 16 +--- sw/source/uibase/wrtsh/move.cxx | 24 +++--- sw/source/uibase/wrtsh/select.cxx | 8 +- 118 files changed, 379 insertions(+), 537 deletions(-)
New commits: commit 03614918c028e82df353308837864c6fc7ff992c Author: Noel Grandin <[email protected]> Date: Fri Mar 4 11:35:33 2016 +0200 loplugin:unuseddefaultparam in sc Change-Id: Id461fc600bec5fe372875c2dcf405997fcf9f0b4 diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index a7d79ac..0e545be 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -323,7 +323,7 @@ public: inline size_t hash() const; /// "A1" or "$A$1" or R1C1 or R[1]C[1] - OUString GetColRowString( bool bAbsolute = false ) const; + OUString GetColRowString() const; }; inline void ScAddress::PutInOrder( ScAddress& rAddress ) diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index edef180..d7a6aad 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -234,7 +234,7 @@ public: bool HasSelectionMatrixFragment(const ScMarkData& rMark) const; bool GetFirstVisibleAttr( SCROW& rFirstRow ) const; - bool GetLastVisibleAttr( SCROW& rLastRow, bool bFullFormattedArea = false ) const; + bool GetLastVisibleAttr( SCROW& rLastRow ) const; bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; bool IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0, SCROW nEndRow = MAXROW ) const; @@ -346,7 +346,7 @@ public: svl::SharedString GetSharedString( SCROW nRow ) const; void SetRawString( SCROW nRow, const OUString& rStr ); - void SetRawString( SCROW nRow, const svl::SharedString& rStr, bool bBroadcast = true ); + void SetRawString( SCROW nRow, const svl::SharedString& rStr ); void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const svl::SharedString& rStr, bool bBroadcast = true ); void SetValue( SCROW nRow, double fVal ); void SetValues( SCROW nRow, const std::vector<double>& rVals ); @@ -517,8 +517,7 @@ public: bool GetNextSpellingCell(SCROW& nRow, bool bInSel, const ScMarkData& rData) const; void StartListeningFormulaCells( - sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, SCROW nRow1, SCROW nRow2, - SCROW* pStartRow = nullptr ); + sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, SCROW nRow1, SCROW nRow2 ); void EndListeningFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 3775f9d..856d938 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -351,12 +351,6 @@ public: row position of the found entry are returned, otherwise invalid. - @param bSearchForEqualAfterMismatch - Continue searching for an equal entry even if the - last entry matching the range was found, in case - the data is not sorted. Is always done if regular - expressions are involved. - The search does not stop when encountering a string and does not assume that no values follow anymore. If querying for a string a mismatch on the first @@ -368,8 +362,7 @@ public: iterator is not usable anymore except for obtaining the number format! */ - bool FindEqualOrSortedLastInRange( SCCOL& nFoundCol, - SCROW& nFoundRow, bool bSearchForEqualAfterMismatch = false ); + bool FindEqualOrSortedLastInRange( SCCOL& nFoundCol, SCROW& nFoundRow ); }; class ScDocAttrIterator // all attribute areas diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 30a8d9f..541a0cc 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1199,8 +1199,7 @@ public: SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr, const ScMarkData* pTabMark = nullptr ); - SC_DLLPUBLIC void DeleteRow( const ScRange& rRange, - ScDocument* pRefUndoDoc = nullptr ); + SC_DLLPUBLIC void DeleteRow( const ScRange& rRange ); bool InsertCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr, @@ -1211,8 +1210,7 @@ public: SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr, const ScMarkData* pTabMark = nullptr ); - void DeleteCol( const ScRange& rRange, - ScDocument* pRefUndoDoc = nullptr ); + void DeleteCol( const ScRange& rRange ); bool CanInsertRow( const ScRange& rRange ) const; bool CanInsertCol( const ScRange& rRange ) const; @@ -1615,7 +1613,7 @@ public: bool RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = nullptr, SCROW* pLastRow = nullptr) const; bool HasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const; - bool ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = nullptr) const; + bool ColFiltered(SCCOL nCol, SCTAB nTab) const; SC_DLLPUBLIC void SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered); SCROW FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const; SCROW LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const; diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index f759c64..959dbc4 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -109,7 +109,7 @@ public: void Output(); //! Refresh? ScRange GetOutputRange( sal_Int32 nRegionType = css::sheet::DataPilotOutputRangeType::WHOLE ); - ScRange GetOutputRange( sal_Int32 nRegionType = css::sheet::DataPilotOutputRangeType::WHOLE ) const; + ScRange GetOutputRange() const; long GetHeaderRows(); bool HasError(); // range overflow or exception from source diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index a34caeb..340d579 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -134,8 +134,8 @@ public: /// Creates a copy of SfxItemSet if bRememberCopy set void SetDefaults( const SfxItemSet& rDefaults, bool bRememberCopy = true ); - /// Becomes the owner of the SfxItemSet if bTakeOwnership set - void SetDefaults( SfxItemSet* pDefaults, bool bTakeOwnership = true ); + /// Becomes the owner of the SfxItemSet + void SetDefaults( SfxItemSet* pDefaults ); /// Set the item in the default ItemSet which is created /// if it doesn't exist yet. diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 9f215f6..4f93743 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -104,8 +104,7 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin { // various export filters virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) = 0; virtual void ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest ) = 0; - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0; + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) = 0; virtual void ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) = 0; virtual void ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) = 0; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 496378e..95d3225 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -449,7 +449,7 @@ public: void UndoToTable( sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = nullptr ); + InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab ); void CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, ScTable* pTable); @@ -711,7 +711,7 @@ public: void SetManualHeight( SCROW nStartRow, SCROW nEndRow, bool bManual ); sal_uInt16 GetColWidth( SCCOL nCol, bool bHiddenAsZero = true ) const; - sal_uLong GetColWidth( SCCOL nStartCol, SCCOL nEndCol, bool bHiddenAsZero = true ) const; + sal_uLong GetColWidth( SCCOL nStartCol, SCCOL nEndCol ) const; SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow = nullptr, SCROW* pEndRow = nullptr, bool bHiddenAsZero = true ) const; sal_uLong GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero = true ) const; sal_uLong GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 2823d63..e9c3833 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -2898,14 +2898,14 @@ bool ScColumn::GetFirstVisibleAttr( SCROW& rFirstRow ) const return false; } -bool ScColumn::GetLastVisibleAttr( SCROW& rLastRow, bool bFullFormattedArea ) const +bool ScColumn::GetLastVisibleAttr( SCROW& rLastRow ) const { if (pAttrArray) { // row of last cell is needed SCROW nLastData = GetLastDataPos(); // always including notes, 0 if none - return pAttrArray->GetLastVisibleAttr( rLastRow, nLastData, bFullFormattedArea ); + return pAttrArray->GetLastVisibleAttr( rLastRow, nLastData ); } else return false; diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index f37ae4e..b350e42 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2393,7 +2393,7 @@ void ScColumn::SetRawString( SCROW nRow, const OUString& rStr ) SetRawString(nRow, aSS); } -void ScColumn::SetRawString( SCROW nRow, const svl::SharedString& rStr, bool bBroadcast ) +void ScColumn::SetRawString( SCROW nRow, const svl::SharedString& rStr ) { if (!ValidRow(nRow)) return; @@ -2404,8 +2404,7 @@ void ScColumn::SetRawString( SCROW nRow, const svl::SharedString& rStr, bool bBr CellStorageModified(); - if (bBroadcast) - BroadcastNewCell(nRow); + BroadcastNewCell(nRow); } void ScColumn::SetRawString( diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index 4cb643f..f426d8d 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -1255,10 +1255,6 @@ public: } } - SCROW getStartRow() const - { - return mnStartRow; - } }; class EndListeningFormulaCellsHandler @@ -1346,15 +1342,10 @@ public: void ScColumn::StartListeningFormulaCells( sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, - SCROW nRow1, SCROW nRow2, SCROW* pStartRow ) + SCROW nRow1, SCROW nRow2 ) { StartListeningFormulaCellsHandler aFunc(rStartCxt, rEndCxt); sc::ProcessBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2); - - if (pStartRow) - // start row position may be smaller than nRow1 in case the formula - // group starts before nRow1 position. - *pStartRow = aFunc.getStartRow(); } void ScColumn::EndListeningFormulaCells( diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 760d9b4..f9387c7 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1277,7 +1277,7 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField() } bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, - SCROW& nFoundRow, bool bSearchForEqualAfterMismatch ) + SCROW& nFoundRow ) { // Set and automatically reset mpParam->mbRangeLookup when returning. We // could use comphelper::FlagRestorationGuard, but really, that one is @@ -1412,7 +1412,7 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, maCurPos = aPosSave; return true; } - if ( (bSearchForEqualAfterMismatch || mpParam->eSearchType != utl::SearchParam::SRCH_NORMAL) && + if ( (mpParam->eSearchType != utl::SearchParam::SRCH_NORMAL) && StoppedOnMismatch() ) { // Assume found entry to be the last value less than respectively diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 731c8c1..73eb510 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1407,12 +1407,11 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, pChartListenerCollection->UpdateDirtyCharts(); } -void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc ) +void ScDocument::DeleteRow( const ScRange& rRange ) { DeleteRow( rRange.aStart.Col(), rRange.aStart.Tab(), rRange.aEnd.Col(), rRange.aEnd.Tab(), - rRange.aStart.Row(), static_cast<SCSIZE>(rRange.aEnd.Row()-rRange.aStart.Row()+1), - pRefUndoDoc ); + rRange.aStart.Row(), static_cast<SCSIZE>(rRange.aEnd.Row()-rRange.aStart.Row()+1) ); } bool ScDocument::CanInsertCol( const ScRange& rRange ) const @@ -1599,12 +1598,11 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA pChartListenerCollection->UpdateDirtyCharts(); } -void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc ) +void ScDocument::DeleteCol( const ScRange& rRange ) { DeleteCol( rRange.aStart.Row(), rRange.aStart.Tab(), rRange.aEnd.Row(), rRange.aEnd.Tab(), - rRange.aStart.Col(), static_cast<SCSIZE>(rRange.aEnd.Col()-rRange.aStart.Col()+1), - pRefUndoDoc ); + rRange.aStart.Col(), static_cast<SCSIZE>(rRange.aEnd.Col()-rRange.aStart.Col()+1) ); } // for Area-Links: Insert/delete cells, when the range is changed. @@ -4389,12 +4387,12 @@ bool ScDocument::HasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) con return maTabs[nTab]->HasFilteredRows(nStartRow, nEndRow); } -bool ScDocument::ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol) const +bool ScDocument::ColFiltered(SCCOL nCol, SCTAB nTab) const { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) return false; - return maTabs[nTab]->ColFiltered(nCol, pFirstCol); + return maTabs[nTab]->ColFiltered(nCol); } void ScDocument::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered) diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 425e938..c75f570 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -1174,7 +1174,7 @@ ScRange ScDPOutput::GetOutputRange( sal_Int32 nRegionType ) return ScRange(aStartPos.Col(), aStartPos.Row(), nTab, nTabEndCol, nTabEndRow, nTab); } -ScRange ScDPOutput::GetOutputRange( sal_Int32 nRegionType ) const +ScRange ScDPOutput::GetOutputRange() const { using namespace ::com::sun::star::sheet; @@ -1182,16 +1182,6 @@ ScRange ScDPOutput::GetOutputRange( sal_Int32 nRegionType ) const return ScRange(ScAddress::INITIALIZE_INVALID); SCTAB nTab = aStartPos.Tab(); - switch (nRegionType) - { - case DataPilotOutputRangeType::RESULT: - return ScRange(nDataStartCol, nDataStartRow, nTab, nTabEndCol, nTabEndRow, nTab); - case DataPilotOutputRangeType::TABLE: - return ScRange(aStartPos.Col(), nTabStartRow, nTab, nTabEndCol, nTabEndRow, nTab); - default: - OSL_ENSURE(nRegionType == DataPilotOutputRangeType::WHOLE, "ScDPOutput::GetOutputRange: unknown region type"); - break; - } return ScRange(aStartPos.Col(), aStartPos.Row(), nTab, nTabEndCol, nTabEndRow, nTab); } diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index aabf837..419821b 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1194,7 +1194,7 @@ void ScTable::CopyToTable( void ScTable::UndoToTable( sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData ) + InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab ) { if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2)) { @@ -1204,7 +1204,7 @@ void ScTable::UndoToTable( for ( SCCOL i = 0; i <= MAXCOL; i++) { if ( i >= nCol1 && i <= nCol2 ) - aCol[i].UndoToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, pDestTab->aCol[i], pMarkData); + aCol[i].UndoToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, pDestTab->aCol[i]); else aCol[i].CopyToColumn(rCxt, 0, MAXROW, InsertDeleteFlags::FORMULA, false, pDestTab->aCol[i]); } @@ -2834,7 +2834,7 @@ sal_uInt16 ScTable::GetColWidth( SCCOL nCol, bool bHiddenAsZero ) const return (sal_uInt16) STD_COL_WIDTH; } -sal_uLong ScTable::GetColWidth( SCCOL nStartCol, SCCOL nEndCol, bool bHiddenAsZero ) const +sal_uLong ScTable::GetColWidth( SCCOL nStartCol, SCCOL nEndCol ) const { if (!ValidCol(nStartCol) || !ValidCol(nEndCol) || nStartCol > nEndCol) return 0; @@ -2844,7 +2844,7 @@ sal_uLong ScTable::GetColWidth( SCCOL nStartCol, SCCOL nEndCol, bool bHiddenAsZe SCCOL nLastHiddenCol = -1; for (SCCOL nCol = nStartCol; nCol <= nEndCol; ++nCol) { - if (bHiddenAsZero && nCol > nLastHiddenCol) + if (nCol > nLastHiddenCol) bHidden = ColHidden(nCol, nullptr, &nLastHiddenCol); if (bHidden) diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 6d5ceaa..b7d9a71 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -325,8 +325,7 @@ void PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRefInList ); void PopDoubleRef( ScRange&, bool bDontCheckForTableOp = false ); void DoubleRefToVars( const formula::FormulaToken* p, SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, - SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, - bool bDontCheckForTableOp = false ); + SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2 ); ScDBRangeBase* PopDBDoubleRef(); void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2 ); diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index d4a69c7..5542be6 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -2235,7 +2235,7 @@ void ScRange::IncEndRowSticky( SCsROW nDelta ) aEnd.IncRow( nDelta); // was greater than MAXROW, caller should know.. } -OUString ScAddress::GetColRowString( bool bAbsolute ) const +OUString ScAddress::GetColRowString() const { OUStringBuffer aString; @@ -2245,20 +2245,13 @@ OUString ScAddress::GetColRowString( bool bAbsolute ) const case formula::FormulaGrammar::CONV_OOO: case formula::FormulaGrammar::CONV_XL_A1: case formula::FormulaGrammar::CONV_XL_OOX: - if (bAbsolute) - aString.append("$"); - lcl_ScColToAlpha( aString, nCol); - - if ( bAbsolute ) - aString.append("$"); - aString.append(OUString::number(nRow+1)); break; case formula::FormulaGrammar::CONV_XL_R1C1: - lcl_r1c1_append_r ( aString, nRow, bAbsolute, detailsOOOa1 ); - lcl_r1c1_append_c ( aString, nCol, bAbsolute, detailsOOOa1 ); + lcl_r1c1_append_r ( aString, nRow, false/*bAbsolute*/, detailsOOOa1 ); + lcl_r1c1_append_c ( aString, nCol, false/*bAbsolute*/, detailsOOOa1 ); break; } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 9da65b2..82dd082 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -507,12 +507,12 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, bool bRememberC EnableUndo( true ); } -void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, bool bTakeOwnership ) +void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet ) { if ( bDeleteDefaults ) delete pDefaults; pDefaults = pSet; - bDeleteDefaults = bTakeOwnership; + bDeleteDefaults = true; if ( pDefaults ) SetDefaults( *pDefaults, false ); } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index f316862..107158e 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -969,13 +969,12 @@ void ScInterpreter::PopSingleRef( ScAddress& rAdr ) void ScInterpreter::DoubleRefToVars( const formula::FormulaToken* p, SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, - SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, - bool bDontCheckForTableOp ) + SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2 ) { const ScComplexRefData& rCRef = *p->GetDoubleRef(); SingleRefToVars( rCRef.Ref1, rCol1, rRow1, rTab1); SingleRefToVars( rCRef.Ref2, rCol2, rRow2, rTab2); - if (!pDok->m_TableOpList.empty() && !bDontCheckForTableOp) + if (!pDok->m_TableOpList.empty()) { ScRange aRange( rCol1, rRow1, rTab1, rCol2, rRow2, rTab2 ); if ( IsTableOpInRange( aRange ) ) diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index e1a197a..9a8016d 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -47,8 +47,9 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc, } FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, - const ScRange&rRange, const rtl_TextEncoding eCharSet, sal_uInt32 nDifOption ) + const ScRange&rRange, const rtl_TextEncoding eCharSet ) { + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL; OSL_ENSURE( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range not sorted!" ); OSL_ENSURE( rRange.aStart.Tab() == rRange.aEnd.Tab(), "ScExportDif(): only one table please!" ); diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 11a4bf3..d372e8a 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -421,7 +421,7 @@ private: void AppendNameToken( sal_uInt16 nNameIdx, sal_uInt8 nSpaces = 0 ); void AppendMissingNameToken( const OUString& rName, sal_uInt8 nSpaces = 0 ); void AppendNameXToken( sal_uInt16 nExtSheet, sal_uInt16 nExtName, sal_uInt8 nSpaces = 0 ); - void AppendMacroCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces = 0 ); + void AppendMacroCallToken( const XclExpExtFuncData& rExtFuncData ); void AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData ); void AppendEuroToolCallToken( const XclExpExtFuncData& rExtFuncData ); @@ -2352,10 +2352,10 @@ void XclExpFmlaCompImpl::AppendNameXToken( sal_uInt16 nExtSheet, sal_uInt16 nExt Append( 0, (meBiff <= EXC_BIFF5) ? 12 : 2 ); } -void XclExpFmlaCompImpl::AppendMacroCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces ) +void XclExpFmlaCompImpl::AppendMacroCallToken( const XclExpExtFuncData& rExtFuncData ) { sal_uInt16 nNameIdx = GetNameManager().InsertMacroCall( rExtFuncData.maFuncName, rExtFuncData.mbVBasic, true, rExtFuncData.mbHidden ); - AppendNameToken( nNameIdx, nSpaces ); + AppendNameToken( nNameIdx ); } void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData ) diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 7b7f23d..ae9857b 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -325,10 +325,10 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF // Xcl has an obscure sense of whether starting a new record or not, // and crashes if it encounters the string header at the very end of a record. // Thus we add 1 to give some room, seems like they do it that way but with another count (10?) -void XclExpStream::WriteByteString( const OString& rString, sal_uInt16 nMaxLen ) +void XclExpStream::WriteByteString( const OString& rString ) { SetSliceSize( 0 ); - sal_Size nLen = ::std::min< sal_Size >( rString.getLength(), nMaxLen ); + sal_Size nLen = ::std::min< sal_Size >( rString.getLength(), 0x00FF ); nLen = ::std::min< sal_Size >( nLen, 0xFF ); sal_uInt16 nLeft = PrepareWrite(); diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 1ac074e..ca271fc 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -113,9 +113,9 @@ void XclExpString::Assign( const OUString& rString, XclStrFlags nFlags, sal_uInt Build( rString.getStr(), rString.getLength(), nFlags, nMaxLen ); } -void XclExpString::Assign( sal_Unicode cChar, XclStrFlags nFlags ) +void XclExpString::Assign( sal_Unicode cChar ) { - Build( &cChar, 1, nFlags, EXC_STR_MAXLEN ); + Build( &cChar, 1, EXC_STR_DEFAULT, EXC_STR_MAXLEN ); } void XclExpString::AssignByte( diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index a2679da..4fabc83 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -94,7 +94,7 @@ struct BinAddress inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {} void read( SequenceInputStream& rStrm ); - void read( BiffInputStream& rStrm, bool bCol16Bit = true ); + void read( BiffInputStream& rStrm ); }; inline bool operator<( const BinAddress& rL, const BinAddress& rR ) @@ -130,7 +130,7 @@ struct BinRange inline explicit BinRange( const css::table::CellRangeAddress& rRange ) : maFirst( rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow ) {} void read( SequenceInputStream& rStrm ); - void read( BiffInputStream& rStrm, bool bCol16Bit = true ); + void read( BiffInputStream& rStrm ); }; inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& orRange ) diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index e2a385b..bb6b1c1 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -289,8 +289,7 @@ public: // various export filters virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) override; virtual void ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest ) override; - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) override; + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) override; virtual void ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) override; virtual void ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) override; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 4e4b836..901e7da 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -127,9 +127,7 @@ public: // (slice length setting has no effect here -> disabled automatically) /** Writes string length field and OString buffer. */ - void WriteByteString( - const OString& rString, - sal_uInt16 nMaxLen = 0x00FF ); + void WriteByteString( const OString& rString ); /** Writes 8-bit character buffer. */ void WriteCharBuffer( const ScfUInt8Vec& rBuffer ); diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 0b8c5ea..c1fb351 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -70,11 +70,8 @@ public: XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); - /** Assigns a Unicode character, converts this object to a BIFF8 Unicode string. - @param nFlags Modifiers for string export. */ - void Assign( - sal_Unicode cChar, - XclStrFlags nFlags = EXC_STR_DEFAULT ); + /** Assigns a Unicode character, converts this object to a BIFF8 Unicode string. */ + void Assign( sal_Unicode cChar ); /** Assigns an unformatted string, converts this object to a BIFF2-BIFF7 byte string. @param nFlags Modifiers for string export. diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index bbc4a3d..6b4cc34 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -87,10 +87,10 @@ void BinAddress::read( SequenceInputStream& rStrm ) mnCol = rStrm.readInt32(); } -void BinAddress::read( BiffInputStream& rStrm, bool bCol16Bit ) +void BinAddress::read( BiffInputStream& rStrm ) { mnRow = rStrm.readuInt16(); - mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); + mnCol = rStrm.readuInt16(); } void BinRange::read( SequenceInputStream& rStrm ) @@ -101,12 +101,12 @@ void BinRange::read( SequenceInputStream& rStrm ) maLast.mnCol = rStrm.readInt32(); } -void BinRange::read( BiffInputStream& rStrm, bool bCol16Bit ) +void BinRange::read( BiffInputStream& rStrm ) { maFirst.mnRow = rStrm.readuInt16(); maLast.mnRow = rStrm.readuInt16(); - maFirst.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); - maLast.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); + maFirst.mnCol = rStrm.readuInt16(); + maLast.mnCol = rStrm.readuInt16(); } void BinRangeList::read( SequenceInputStream& rStrm ) diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 47b3833..436aa4e 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -50,8 +50,7 @@ void ScDDComboBoxButton::SetOptSizePixel() void ScDDComboBoxButton::Draw( const Point& rAt, const Size& rSize, - bool bState, - bool bBtnIn /* = false */ ) + bool bState ) { if ( rSize.Width() == 0 || rSize.Height() == 0 ) return; @@ -70,13 +69,7 @@ void ScDDComboBoxButton::Draw( const Point& rAt, DecorationView aDecoView( pOut); - DrawButtonFlags nButtonStyle = DrawButtonFlags::Default; - if( bBtnIn ) // gedrueckt? - { - nButtonStyle = DrawButtonFlags::Pressed; - } - - aInnerRect=aDecoView.DrawButton( aBtnRect, nButtonStyle ); + aInnerRect=aDecoView.DrawButton( aBtnRect, DrawButtonFlags::Default ); aInnerRect.Left() += 1; aInnerRect.Top() += 1; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index e8b6cd8..09f87e6 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2826,11 +2826,11 @@ void ScDocShell::SetDocumentModified() * Drawing also needs to be updated for the normal SetDocumentModified * e.g.: when deleting tables etc. */ -void ScDocShell::SetDrawModified( bool bIsModified /* = true */ ) +void ScDocShell::SetDrawModified() { - bool bUpdate = bIsModified != IsModified(); + bool bUpdate = !IsModified(); - SetModified( bIsModified ); + SetModified(); SfxBindings* pBindings = GetViewBindings(); if (bUpdate) @@ -2842,25 +2842,22 @@ void ScDocShell::SetDrawModified( bool bIsModified /* = true */ ) } } - if (bIsModified) + if (pBindings) { - if (pBindings) - { - // #i105960# Undo etc used to be volatile. - // They always have to be invalidated, including drawing layer or row height changes - // (but not while pPaintLockData is set). - pBindings->Invalidate( SID_UNDO ); - pBindings->Invalidate( SID_REDO ); - pBindings->Invalidate( SID_REPEAT ); - } + // #i105960# Undo etc used to be volatile. + // They always have to be invalidated, including drawing layer or row height changes + // (but not while pPaintLockData is set). + pBindings->Invalidate( SID_UNDO ); + pBindings->Invalidate( SID_REDO ); + pBindings->Invalidate( SID_REPEAT ); + } - if ( aDocument.IsChartListenerCollectionNeedsUpdate() ) - { - aDocument.UpdateChartListenerCollection(); - SfxGetpApp()->Broadcast(SfxSimpleHint( SC_HINT_DRAW_CHANGED )); // Navigator - } - SC_MOD()->AnythingChanged(); + if ( aDocument.IsChartListenerCollectionNeedsUpdate() ) + { + aDocument.UpdateChartListenerCollection(); + SfxGetpApp()->Broadcast(SfxSimpleHint( SC_HINT_DRAW_CHANGED )); // Navigator } + SC_MOD()->AnythingChanged(); } void ScDocShell::SetInUndo(bool bSet) diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 460a92f..509f05f 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2223,7 +2223,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, rtl_TextEncoding ) override { return eERR_INTERN; } virtual void ScExportDif( SvStream&, ScDocument*, const ScAddress&, const rtl_TextEncoding ) override {} - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding, sal_uInt32 ) override { return eERR_INTERN; } + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding ) override { return eERR_INTERN; } virtual void ScExportHTML( SvStream&, const OUString&, ScDocument*, const ScRange&, const rtl_TextEncoding, bool, const OUString&, OUString&, const OUString& ) override {} virtual void ScExportRTF( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding ) override {} diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 7ef76ad..20d5859 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -82,7 +82,7 @@ public: void Init(); void ShowReference(const OUString& rStr); - void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ); + void ReleaseFocus( formula::RefEdit* pEdit ); void HideReference( bool bDoneRefMode = true ); void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ); void RefInputDone( bool bForced = false ); diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index 49d5853..a78d71e 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -36,8 +36,7 @@ public: void Draw( const Point& rAt, const Size& rSize, - bool bState, - bool bBtnIn = false ); + bool bState ); void Draw( bool bState ) { Draw( aBtnPos, aBtnSize, bState ); } diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 3545654..74bf9155 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -332,7 +332,7 @@ public: void UpdatePaintExt( sal_uInt16& rExtFlags, const ScRange& rRange ); void SetDocumentModified(); - void SetDrawModified( bool bIsModified = true ); + void SetDrawModified(); void LockPaint(); void UnlockPaint(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 177024d..7bd015f 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -41,7 +41,7 @@ public: virtual ~ScMetricInputDlg(); virtual void dispose() override; - long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const; + long GetInputValue() const; private: VclPtr<MetricField> m_pEdValue; diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 61f3775..2644952 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -164,7 +164,7 @@ public: bool bCursorOnly = false ); void ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, - const SvxBoxInfoItem* pNewInner, bool bRecord = true ); + const SvxBoxInfoItem* pNewInner ); void ApplyUserItemSet( const SfxItemSet& rItemSet ); @@ -189,7 +189,7 @@ public: void DeleteCells( DelCellCmd eCmd ); bool InsertCells( InsCellCmd eCmd, bool bRecord = true, bool bPartOfPaste = false ); - void DeleteMulti( bool bRows, bool bRecord = true ); + void DeleteMulti( bool bRows ); void DeleteContents( InsertDeleteFlags nFlags ); @@ -197,8 +197,7 @@ public: bool bWidth, const std::vector<sc::ColRowSpan>& rRanges, ScSizeMode eMode, sal_uInt16 nSizeTwips, bool bRecord = true, bool bPaint = true, ScMarkData* pMarkData = nullptr ); - void SetMarkedWidthOrHeight( bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips, - bool bRecord = true ); + void SetMarkedWidthOrHeight( bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips ); bool AdjustBlockHeight( bool bPaint = true, ScMarkData* pMarkData = nullptr ); bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow ); @@ -290,7 +289,7 @@ public: void DoThesaurus(); /** Generic implementation of sheet conversion functions. */ - void DoSheetConversion( const ScConversionParam& rParam, bool bRecord = true ); + void DoSheetConversion( const ScConversionParam& rParam ); void SetPrintRanges( bool bEntireSheet, const OUString* pPrint, diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index c44ec1b..9998a05 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -285,11 +285,11 @@ void ScFormulaReferenceHelper::ShowReference(const OUString& rStr) } } -void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton ) +void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit ) { if( !pRefEdit && pEdit ) { - m_pDlg->RefInputStart( pEdit, pButton ); + m_pDlg->RefInputStart( pEdit ); } ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index cedfcbe..869ffc8 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -70,7 +70,7 @@ void ScMetricInputDlg::dispose() ModalDialog::dispose(); } -long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const +long ScMetricInputDlg::GetInputValue() const { /* with decimal digits @@ -91,7 +91,7 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const */ // first cut off the decimal digits - not that great... - return sal::static_int_cast<long>( m_pEdValue->Denormalize( m_pEdValue->GetValue( eUnit ) ) ); + return sal::static_int_cast<long>( m_pEdValue->Denormalize( m_pEdValue->GetValue( FUNIT_TWIP ) ) ); } // Handler: diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index a4fe4b8..6fac2e8b 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -425,7 +425,7 @@ void ScViewFunc::DoHangulHanjaConversion() DoSheetConversion( aConvParam ); } -void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, bool bRecord ) +void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam ) { SCCOL nCol; SCROW nRow; @@ -437,7 +437,8 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, bool bR ScSplitPos eWhich = rViewData.GetActivePart(); EditView* pEditView = nullptr; bool bIsEditMode = rViewData.HasEditView(eWhich); - if (bRecord && !rDoc.IsUndoEnabled()) + bool bRecord = true; + if (!rDoc.IsUndoEnabled()) bRecord = false; if (bIsEditMode) // edit mode active { diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 2631be4..c3d7424 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -998,12 +998,13 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) // patterns and borders void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, - const SvxBoxInfoItem* pNewInner, bool bRecord ) + const SvxBoxInfoItem* pNewInner ) { ScDocument* pDoc = GetViewData().GetDocument(); ScMarkData aFuncMark( GetViewData().GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, pDoc ); - if (bRecord && !pDoc->IsUndoEnabled()) + bool bRecord = true; + if (!pDoc->IsUndoEnabled()) bRecord = false; bool bRemoveAdjCellBorder = false; @@ -1546,7 +1547,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd ) Unmark(); } -void ScViewFunc::DeleteMulti( bool bRows, bool bRecord ) +void ScViewFunc::DeleteMulti( bool bRows ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); @@ -1555,6 +1556,7 @@ void ScViewFunc::DeleteMulti( bool bRows, bool bRecord ) ScMarkData aFuncMark( GetViewData().GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, &rDoc ); + bool bRecord = true; if (!rDoc.IsUndoEnabled()) bRecord = false; @@ -2107,8 +2109,7 @@ void ScViewFunc::SetWidthOrHeight( // column width/row height (via marked range) -void ScViewFunc::SetMarkedWidthOrHeight( bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips, - bool bRecord) +void ScViewFunc::SetMarkedWidthOrHeight( bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips ) { ScMarkData& rMark = GetViewData().GetMarkData(); @@ -2127,7 +2128,7 @@ void ScViewFunc::SetMarkedWidthOrHeight( bool bWidth, ScSizeMode eMode, sal_uInt std::vector<sc::ColRowSpan> aRanges = bWidth ? rMark.GetMarkedColSpans() : rMark.GetMarkedRowSpans(); - SetWidthOrHeight(bWidth, aRanges, eMode, nSizeTwips, bRecord); + SetWidthOrHeight(bWidth, aRanges, eMode, nSizeTwips); rMark.MarkToSimple(); } commit fb6c99f21e03afb85d00459ca1e1abb07e71d126 Author: Noel Grandin <[email protected]> Date: Fri Mar 4 10:45:52 2016 +0200 loplugin:unuseddefaultparam in svtools Change-Id: I3ef15fa33791bc5e59c36c1e80f669c7e1e7044b diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index bb51ec7..8a11638 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -224,7 +224,7 @@ private: SVT_DLLPRIVATE void ImplFormat(); using Window::ImplHitTest; SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; - SVT_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev = true); + SVT_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, DayOfWeek eDayOfWeek, bool bBack = true, @@ -289,7 +289,7 @@ public: bool IsTravelSelect() const { return mbTravelSelect; } - Size CalcWindowSizePixel( long nCalcMonthPerLine = 1 ) const; + Size CalcWindowSizePixel() const; void SetSelectHdl( const Link<Calendar*,void>& rLink ) { maSelectHdl = rLink; } }; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index b1130e5..eb803f8 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -264,9 +264,7 @@ public: SvxIconChoiceCtrlEntry* InsertEntry( const OUString& rText, const Image& rImage, - sal_uLong nPos = CONTAINER_APPEND, - const Point* pPos = nullptr - ); + sal_uLong nPos = CONTAINER_APPEND ); /** creates automatic mnemonics for all icon texts in the control diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 333fa87..61d8cd1 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -515,8 +515,7 @@ public: using TransferableHelper::StartDrag; void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - const Link<sal_Int8,void>& rCallbck, - sal_Int32 nDragPointer = DND_POINTER_NONE ); + const Link<sal_Int8,void>& rCallbck ); }; #endif diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index fb21e9b..053bb7f 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -83,8 +83,8 @@ class SVT_DLLPUBLIC SvTreeList SvTreeListEntry* FirstVisible() const { return First(); } SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; - SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; - SvTreeListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=nullptr ) const; + SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry ) const; + SvTreeListEntry* LastVisible( const SvListView* ) const; SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; @@ -159,7 +159,7 @@ public: sal_uLong GetEntryCount() const { return nEntryCount; } SvTreeListEntry* First() const; SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; - SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; + SvTreeListEntry* Prev( SvTreeListEntry* pEntry ) const; SvTreeListEntry* Last() const; SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index 4cc79cf..d752265 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -94,7 +94,7 @@ private: RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; - RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ); + RoadmapItem* GetByID( ItemId _nID ); const RoadmapItem* GetByID( ItemId _nID ) const; RoadmapItem* GetPreviousHyperLabel( ItemIndex _Index); diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index d4d1495..dc4f76b 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -81,7 +81,7 @@ public: OUString& Title() { return _aTitle; } bool IsFrozen() const { return _bFrozen; } - void Freeze( bool bFreeze = true ) { _bFrozen = bFreeze; } + void Freeze() { _bFrozen = true; } void Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, bool bCurs ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index c012542..a238cae 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -321,14 +321,14 @@ public: SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pView, WinBits nWinStyle ); ~SvxIconChoiceCtrl_Impl(); - bool SetChoiceWithCursor ( bool bDo = true ) { bool bOld = bChooseWithCursor; bChooseWithCursor = bDo; return bOld; } + bool SetChoiceWithCursor() { bool bOld = bChooseWithCursor; bChooseWithCursor = true; return bOld; } void Clear( bool bInCtor = false ); void SetStyle( WinBits nWinStyle ); WinBits GetStyle() const { return nWinBits; } void InsertEntry( SvxIconChoiceCtrlEntry*, size_t nPos, const Point* pPos=nullptr ); void CreateAutoMnemonics( MnemonicGenerator* _pGenerator = nullptr ); void FontModified(); - void SelectAll( bool bSelect = true ); + void SelectAll(); void SelectEntry( SvxIconChoiceCtrlEntry*, bool bSelect, @@ -369,11 +369,7 @@ public: void SetNoSelection(); SvxIconChoiceCtrlEntry* GetCurEntry() const { return pCursor; } - void SetCursor( - SvxIconChoiceCtrlEntry*, - // true == carry selection when single-selecting - bool bSyncSingleSelection = true - ); + void SetCursor( SvxIconChoiceCtrlEntry* ); SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false ); @@ -418,7 +414,7 @@ public: bool bIsBackgroundPainted = false); void PaintItem(const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, - sal_uInt16 nPaintFlags, vcl::RenderContext& rRenderContext, const OUString* pStr = nullptr); + sal_uInt16 nPaintFlags, vcl::RenderContext& rRenderContext); // recalculates all BoundingRects if bMustRecalcBoundingRects == true void CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); } @@ -595,11 +591,11 @@ public: GridId GetUnoccupiedGrid(); void OccupyGrids( const SvxIconChoiceCtrlEntry* ); - void OccupyGrid( GridId nId, bool bOccupy = true ) + void OccupyGrid( GridId nId ) { DBG_ASSERT(!_pGridMap || nId<(sal_uLong)(_nGridCols*_nGridRows),"OccupyGrid: Bad GridId"); if(_pGridMap && nId < (sal_uLong)(_nGridCols *_nGridRows) ) - _pGridMap[ nId ] = bOccupy; + _pGridMap[ nId ] = true; } Rectangle GetGridRect( GridId ); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index bd6fdd3..85080a7 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1572,15 +1572,11 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis(const Rectangle& rTextRect, const Rec void SvxIconChoiceCtrl_Impl::PaintItem(const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags, - vcl::RenderContext& rRenderContext, const OUString* pStr ) + vcl::RenderContext& rRenderContext ) { if (eItem == IcnViewFieldTypeText) { - OUString aText; - if (!pStr) - aText = SvtIconChoiceCtrl::GetEntryText(pEntry, false); - else - aText = *pStr; + OUString aText = SvtIconChoiceCtrl::GetEntryText(pEntry, false); Color aOldFontColor = rRenderContext.GetTextColor(); if (pView->AutoFontColor()) @@ -2044,11 +2040,11 @@ void SvxIconChoiceCtrl_Impl::SetBoundingRect_Impl( SvxIconChoiceCtrlEntry* pEntr } -void SvxIconChoiceCtrl_Impl::SetCursor( SvxIconChoiceCtrlEntry* pEntry, bool bSyncSingleSelection ) +void SvxIconChoiceCtrl_Impl::SetCursor( SvxIconChoiceCtrlEntry* pEntry ) { if( pEntry == pCursor ) { - if( pCursor && eSelectionMode == SINGLE_SELECTION && bSyncSingleSelection && + if( pCursor && eSelectionMode == SINGLE_SELECTION && !pCursor->IsSelected() ) SelectEntry( pCursor, true ); return; @@ -2059,14 +2055,14 @@ void SvxIconChoiceCtrl_Impl::SetCursor( SvxIconChoiceCtrlEntry* pEntry, bool bSy if( pOldCursor ) { pOldCursor->ClearFlags( SvxIconViewFlags::FOCUSED ); - if( eSelectionMode == SINGLE_SELECTION && bSyncSingleSelection ) + if( eSelectionMode == SINGLE_SELECTION ) SelectEntry( pOldCursor, false ); // deselect old cursor } if( pCursor ) { ToTop( pCursor ); pCursor->SetFlags( SvxIconViewFlags::FOCUSED ); - if( eSelectionMode == SINGLE_SELECTION && bSyncSingleSelection ) + if( eSelectionMode == SINGLE_SELECTION ) SelectEntry( pCursor, true ); ShowCursor( true ); } @@ -3089,15 +3085,15 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry() const return nullptr; } -void SvxIconChoiceCtrl_Impl::SelectAll( bool bSelect ) +void SvxIconChoiceCtrl_Impl::SelectAll() { bool bPaint = true; size_t nCount = aEntries.size(); - for( size_t nCur = 0; nCur < nCount && (bSelect || GetSelectionCount() ); nCur++ ) + for( size_t nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ]; - SelectEntry( pEntry, bSelect, true, true, bPaint ); + SelectEntry( pEntry, true/*bSelect*/, true, true, bPaint ); } nFlags &= (~F_ADD_MODE); pAnchor = nullptr; diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index c11e6f3..6829631 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -101,11 +101,11 @@ void SvtIconChoiceCtrl::dispose() Control::dispose(); } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, const Image& rImage, sal_uLong nPos, const Point* pPos ) +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, const Image& rImage, sal_uLong nPos ) { SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, SvxIconViewFlags::NONE); - _pImp->InsertEntry( pEntry, nPos, pPos ); + _pImp->InsertEntry( pEntry, nPos ); return pEntry; } diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index e6607c1..c808572 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -466,7 +466,7 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta ) ShowCursor( true ); } -void SvImpLBox::KeyUp( bool bPageUp, bool bNotifyScroll ) +void SvImpLBox::KeyUp( bool bPageUp ) { if( !aVerSBar->IsVisible() ) return; @@ -486,8 +486,7 @@ void SvImpLBox::KeyUp( bool bPageUp, bool bNotifyScroll ) return; nFlags &= (~F_FILLING); - if( bNotifyScroll ) - BeginScroll(); + BeginScroll(); aVerSBar->SetThumbPos( nThumbPos - nDelta ); if( bPageUp ) @@ -495,12 +494,11 @@ void SvImpLBox::KeyUp( bool bPageUp, bool bNotifyScroll ) else CursorUp(); - if( bNotifyScroll ) - EndScroll(); + EndScroll(); } -void SvImpLBox::KeyDown( bool bPageDown, bool bNotifyScroll ) +void SvImpLBox::KeyDown( bool bPageDown ) { if( !aVerSBar->IsVisible() ) return; @@ -523,8 +521,7 @@ void SvImpLBox::KeyDown( bool bPageDown, bool bNotifyScroll ) return; nFlags &= (~F_FILLING); - if( bNotifyScroll ) - BeginScroll(); + BeginScroll(); aVerSBar->SetThumbPos( nThumbPos+nDelta ); if( bPageDown ) @@ -532,8 +529,7 @@ void SvImpLBox::KeyDown( bool bPageDown, bool bNotifyScroll ) else CursorDown(); - if( bNotifyScroll ) - EndScroll(); + EndScroll(); } diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 9eafa91..8f723f4 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -562,17 +562,11 @@ SvTreeListEntry* SvTreeList::Next( SvTreeListEntry* pActEntry, sal_uInt16* pDept return nullptr; } -SvTreeListEntry* SvTreeList::Prev( SvTreeListEntry* pActEntry, sal_uInt16* pDepth ) const +SvTreeListEntry* SvTreeList::Prev( SvTreeListEntry* pActEntry ) const { DBG_ASSERT(pActEntry!=nullptr,"Entry?"); sal_uInt16 nDepth = 0; - bool bWithDepth = false; - if ( pDepth ) - { - nDepth = *pDepth; - bWithDepth = true; - } SvTreeListEntries* pActualList = &pActEntry->pParent->m_Children; sal_uLong nActualPos = pActEntry->GetChildListPos(); @@ -586,8 +580,6 @@ SvTreeListEntry* SvTreeList::Prev( SvTreeListEntry* pActEntry, sal_uInt16* pDept nDepth++; pActEntry = pActualList->back().get(); } - if ( bWithDepth ) - *pDepth = nDepth; return pActEntry; } if ( pActEntry->pParent == pRootItem ) @@ -598,8 +590,6 @@ SvTreeListEntry* SvTreeList::Prev( SvTreeListEntry* pActEntry, sal_uInt16* pDept if ( pActEntry ) { nDepth--; - if ( bWithDepth ) - *pDepth = nDepth; return pActEntry; } return nullptr; @@ -723,17 +713,11 @@ SvTreeListEntry* SvTreeList::NextVisible(const SvListView* pView,SvTreeListEntry // For performance reasons, this function assumes that the passed entry is // already visible. -SvTreeListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvTreeListEntry* pActEntry, sal_uInt16* pActDepth) const +SvTreeListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvTreeListEntry* pActEntry) const { DBG_ASSERT(pView&&pActEntry,"PrevVis:View/Entry?"); sal_uInt16 nDepth = 0; - bool bWithDepth = false; - if ( pActDepth ) - { - nDepth = *pActDepth; - bWithDepth = true; - } SvTreeListEntries* pActualList = &pActEntry->pParent->m_Children; sal_uLong nActualPos = pActEntry->GetChildListPos(); @@ -747,8 +731,6 @@ SvTreeListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvTreeListEntr nDepth++; pActEntry = pActualList->back().get(); } - if ( bWithDepth ) - *pActDepth = nDepth; return pActEntry; } @@ -759,21 +741,17 @@ SvTreeListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvTreeListEntr if ( pActEntry ) { nDepth--; - if ( bWithDepth ) - *pActDepth = nDepth; return pActEntry; } return nullptr; } -SvTreeListEntry* SvTreeList::LastVisible( const SvListView* pView, sal_uInt16* pDepth) const +SvTreeListEntry* SvTreeList::LastVisible( const SvListView* pView) const { DBG_ASSERT(pView,"LastVis:No View"); SvTreeListEntry* pEntry = Last(); while( pEntry && !IsEntryVisible( pView, pEntry ) ) pEntry = PrevVisible( pView, pEntry ); - if ( pEntry && pDepth ) - *pDepth = GetDepth( pEntry ); return pEntry; } diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 6ca8461..3f24375 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -653,20 +653,17 @@ static void ImplDrawSpinArrow(vcl::RenderContext& rRenderContext, const Rectangl } //end anonymous namespace -void Calendar::ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev ) +void Calendar::ImplDrawSpin(vcl::RenderContext& rRenderContext ) { rRenderContext.SetLineColor(); rRenderContext.SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor()); - if (bDrawPrev) - { - Rectangle aOutRect = maPrevRect; - aOutRect.Left() += 3; - aOutRect.Top() += 3; - aOutRect.Right() -= 3; - aOutRect.Bottom() -= 3; - ImplDrawSpinArrow(rRenderContext, aOutRect, true); - } - Rectangle aOutRect = maNextRect; + Rectangle aOutRect = maPrevRect; + aOutRect.Left() += 3; + aOutRect.Top() += 3; + aOutRect.Right() -= 3; + aOutRect.Bottom() -= 3; + ImplDrawSpinArrow(rRenderContext, aOutRect, true); + aOutRect = maNextRect; aOutRect.Left() += 3; aOutRect.Top() += 3; aOutRect.Right() -= 3; @@ -1976,7 +1973,7 @@ void Calendar::EndSelection() } } -Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine ) const +Size Calendar::CalcWindowSizePixel() const { OUString a99Text("99"); vcl::Font aOldFont = GetFont(); @@ -2013,7 +2010,6 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine ) const aSize.Width() += ((n99TextWidth+DAY_OFFX)*7) + nWeekWidth; aSize.Width() += MONTH_BORDERX*2; - aSize.Width() *= nCalcMonthPerLine; aSize.Height() = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2); aSize.Height() += nTextHeight + WEEKDAY_OFFY; diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index a275af7..f9d7f26 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -437,13 +437,13 @@ void ORoadmap::ChangeRoadmapItemID(ItemId _nID, ItemId _NewID) pItem->SetID( _NewID ); } -RoadmapItem* ORoadmap::GetByID(ItemId _nID, ItemIndex _nStartIndex) +RoadmapItem* ORoadmap::GetByID(ItemId _nID) { ItemId nLocID = 0; const HL_Vector& rItems = m_pImpl->getHyperLabels(); - for ( HL_Vector::const_iterator i = rItems.begin() + _nStartIndex; - i != rItems.end(); - ++i + for ( HL_Vector::const_iterator i = rItems.begin(); + i != rItems.end(); + ++i ) { nLocID = (*i)->GetID(); diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 0f3a9d0..926bf1a 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -305,8 +305,8 @@ public: static const Image& GetDefaultCollapsedNodeImage( ); const Size& GetOutputSize() const { return aOutputSize;} - void KeyUp( bool bPageUp, bool bNotifyScroll = true ); - void KeyDown( bool bPageDown, bool bNotifyScroll = true ); + void KeyUp( bool bPageUp ); + void KeyDown( bool bPageDown ); void Command( const CommandEvent& rCEvt ); void Invalidate(); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index f1c98ba..6288f8e 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -525,11 +525,10 @@ bool TransferDataContainer::HasAnyData() const void TransferDataContainer::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - const Link<sal_Int8,void>& rLnk, sal_Int32 nDragPointer ) + const Link<sal_Int8,void>& rLnk ) { pImpl->aFinshedLnk = rLnk; - TransferableHelper::StartDrag( pWindow, nDragSourceActions, - nDragPointer ); + TransferableHelper::StartDrag( pWindow, nDragSourceActions ); } commit 1fbc20dad2520862f8142f1cabae169bf1450b87 Author: Noel Grandin <[email protected]> Date: Fri Mar 4 10:11:14 2016 +0200 loplugin:unuseddefaultparam in svx Change-Id: Iacd4ed12c6c5dfdc2f31f85c8c1ce2cee8a8641f diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 01b4143..12db20a 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -943,10 +943,9 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( } AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(vcl::Window* pParent, - const SfxItemSet& rAttr, - SvxDistributeHorizontal eHor) + const SfxItemSet& rAttr) { - VclPtrInstance<SvxDistributeDialog> pDlg( pParent, rAttr, eHor, SvxDistributeVerticalNone); + VclPtrInstance<SvxDistributeDialog> pDlg( pParent, rAttr, SvxDistributeHorizontalNone, SvxDistributeVerticalNone); return new AbstractSvxDistributeDialog_Impl( pDlg ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 27eec40..d3d9092 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -508,8 +508,7 @@ public: const SdrView* pView, sal_uInt16 nAnchorTypes = 0 ) override; virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, - const SfxItemSet& rAttr, - SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone) override; + const SfxItemSet& rAttr) override; virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const css::uno::Reference < css::embed::XStorage >& xStor, const SvObjectServerList* pList = nullptr ) override; diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index e83b9db..774b550 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -296,16 +296,12 @@ public: long GetHeight() const; /** Returns the top-left output position of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges; - false = Returns output position of top-left corner of merged ranges. */ - Point GetCellPosition( size_t nCol, size_t nRow, bool bSimple = false ) const; + Returns output position of top-left corner of merged ranges. */ + Point GetCellPosition( size_t nCol, size_t nRow ) const; /** Returns the output size of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges; - false = Returns total output size of merged ranges. */ - Size GetCellSize( size_t nCol, size_t nRow, bool bSimple = false ) const; + Returns total output size of merged ranges. */ + Size GetCellSize( size_t nCol, size_t nRow ) const; /** Returns the output rectangle of the cell (nCol,nRow). Returns total output rectangle of merged ranges. */ @@ -353,8 +349,7 @@ public: If not NULL, only this color will be used to draw all frame borders. */ void DrawRange( OutputDevice& rDev, size_t nFirstCol, size_t nFirstRow, - size_t nLastCol, size_t nLastRow, - const Color* pForceColor = nullptr ) const; + size_t nLastCol, size_t nLastRow ) const; /** Draws the part of the array, that is inside the clipping range. */ void DrawArray( OutputDevice& rDev ) const; diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index da32313..8f535d5 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -182,8 +182,7 @@ protected: virtual void ObjectReleased() override; void CopyToClipboard( vcl::Window* pWindow ); - void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - sal_Int32 nDragPointer = DND_POINTER_NONE ); + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions ); }; enum class GalleryHintType diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 22a7499..5366f81 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -106,7 +106,7 @@ protected: SVX_DLLPRIVATE virtual void ImplClear() = 0; SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString& rEntry, sal_Int32 nPos ) = 0; SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) = 0; - SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const = 0; + SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos() const = 0; SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos ) const = 0; SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) = 0; SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const = 0; @@ -131,7 +131,7 @@ private: SVX_DLLPRIVATE virtual void ImplClear() override; SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString& rEntry, sal_Int32 nPos ) override; SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) override; - SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const override; + SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos() const override; SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos ) const override; SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) override; SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const override; @@ -170,7 +170,7 @@ private: SVX_DLLPRIVATE virtual void ImplClear() override; SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString& rEntry, sal_Int32 nPos ) override; SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) override; - SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const override; + SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectEntryPos() const override; SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos ) const override; SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) override; SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const override; diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 2beb916..0b4511c 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -209,15 +209,15 @@ public: // Set a logical enclosing rectangle for all marked objects. // It is not guaranteed if this succeeds, as a horizontal // line has always a height of 0 - void SetMarkedObjRect(const Rectangle& rRect, bool bCopy=false); + void SetMarkedObjRect(const Rectangle& rRect); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt); long GetMarkedObjRotate() const; void RotateMarkedObj(const Point& rRef, long nAngle, bool bCopy=false); void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false); - void MirrorMarkedObjHorizontal(bool bCopy=false); - void MirrorMarkedObjVertical(bool bCopy=false); + void MirrorMarkedObjHorizontal(); + void MirrorMarkedObjVertical(); long GetMarkedObjShear() const; void ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false); void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false); diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index d72df29..7ed149c 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -272,8 +272,7 @@ public: bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); } bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; - // Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD (ni) - SdrHdl* PickHandle(const Point& rPnt, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; + SdrHdl* PickHandle(const Point& rPnt) const; // Pick: Supported options for nOptions are: // SdrSearchOptions::DEEP SdrSearchOptions::ALSOONMASTER SdrSearchOptions::TESTMARKABLE SdrSearchOptions::TESTTEXTEDIT diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 4187119..b31d9bf 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -230,7 +230,7 @@ public: void SuggestTextFrameSize(Size aSuggestedTextFrameSize); virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) override; - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true) override; + virtual bool AdjustTextFrameWidthAndHeight() override; virtual bool IsAutoGrowHeight() const override; virtual bool IsAutoGrowWidth() const override; virtual void SetVerticalWriting( bool bVertical ) override; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 9b0d57d..68a3d85 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -380,7 +380,7 @@ protected: void ImpForcePlusData(); OUString GetAngleStr(long nAngle) const; - OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM) const; + OUString GetMetrStr(long nVal) const; /// @param bNotMyself = true: set only ObjList to dirty, don't mark this object as dirty. /// diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 74f5f3c..f3162ed 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -190,7 +190,7 @@ public: virtual void SetChanged() override; virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true) override; + virtual bool AdjustTextFrameWidthAndHeight() override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrTableObj* Clone() const override; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index a794b85..2adf994 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -347,7 +347,7 @@ public: virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true); + virtual bool AdjustTextFrameWidthAndHeight(); bool IsTextFrame() const { return bTextFrame; } bool IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } /// returns true if the PPT autofit of text into shape bounds is enabled. implies IsFitToSize()==false! diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 02bc055..c6617dd 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -284,8 +284,7 @@ public: sal_uInt16 nAnchorTypes = 0 ) = 0; virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, - const SfxItemSet& rAttr, - SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone)= 0; + const SfxItemSet& rAttr)= 0; virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) = 0; diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 41a5c32..aaf9575 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -87,8 +87,7 @@ public: void InsertTextEncoding( const rtl_TextEncoding nEnc ); void InsertTextEncoding( const rtl_TextEncoding nEnc, - const OUString& rEntry, - sal_Int32 nPos = LISTBOX_APPEND ); + const OUString& rEntry ); void SelectTextEncoding( const rtl_TextEncoding nEnc ); diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 0a58ab0..cf2cc05 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -126,8 +126,8 @@ public: bool IsBreak3DObjPossible() const; void Break3DObj(); - SfxItemSet Get3DAttributes(E3dScene* pInScene = nullptr) const; - void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = nullptr); + SfxItemSet Get3DAttributes() const; + void Set3DAttributes(const SfxItemSet& rAttr); }; #endif // INCLUDED_SVX_VIEW3D_HXX diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 3582652..611aa1b 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -599,7 +599,7 @@ void SvxRectCtlAccessibleContext::FireChildFocus( RECT_POINT eButton ) else mnSelectedChild = NOCHILDSELECTED; } -void SvxRectCtlAccessibleContext::selectChild( long nNew, bool bFireFocus ) +void SvxRectCtlAccessibleContext::selectChild( long nNew ) { ::osl::MutexGuard aGuard( m_aMutex ); if( nNew != mnSelectedChild ) @@ -612,7 +612,7 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew, bool bFireFocus ) { // deselect old selected child if one is selected pChild = mpChildren[ mnSelectedChild ]; if( pChild ) - pChild->setStateChecked( false, bFireFocus ); + pChild->setStateChecked( false ); } // select new child @@ -622,7 +622,7 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew, bool bFireFocus ) { pChild = mpChildren[ nNew ]; if( pChild ) - pChild->setStateChecked( true, bFireFocus ); + pChild->setStateChecked( true ); } } else diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index e2d9190..b194717 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -167,7 +167,7 @@ struct ArrayImpl long GetRowHeight( size_t nFirstRow, size_t nLastRow ) const; double GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple = false ) const; - double GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple = false ) const; + double GetVerDiagAngle( size_t nCol, size_t nRow ) const; }; ArrayImpl::ArrayImpl( size_t nWidth, size_t nHeight, bool bDiagDblClip ) : @@ -323,9 +323,9 @@ double ArrayImpl::GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple ) cons return fAngle; } -double ArrayImpl::GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const +double ArrayImpl::GetVerDiagAngle( size_t nCol, size_t nRow ) const { - double fAngle = GetHorDiagAngle( nCol, nRow, bSimple ); + double fAngle = GetHorDiagAngle( nCol, nRow ); return (fAngle > 0.0) ? (F_PI2 - fAngle) : 0.0; } @@ -806,19 +806,19 @@ long Array::GetHeight() const return GetRowPosition( mxImpl->mnHeight ) - GetRowPosition( 0 ); } -Point Array::GetCellPosition( size_t nCol, size_t nRow, bool bSimple ) const +Point Array::GetCellPosition( size_t nCol, size_t nRow ) const { - size_t nFirstCol = bSimple ? nCol : mxImpl->GetMergedFirstCol( nCol, nRow ); - size_t nFirstRow = bSimple ? nRow : mxImpl->GetMergedFirstRow( nCol, nRow ); + size_t nFirstCol = mxImpl->GetMergedFirstCol( nCol, nRow ); + size_t nFirstRow = mxImpl->GetMergedFirstRow( nCol, nRow ); return Point( GetColPosition( nFirstCol ), GetRowPosition( nFirstRow ) ); } -Size Array::GetCellSize( size_t nCol, size_t nRow, bool bSimple ) const +Size Array::GetCellSize( size_t nCol, size_t nRow ) const { - size_t nFirstCol = bSimple ? nCol : mxImpl->GetMergedFirstCol( nCol, nRow ); - size_t nFirstRow = bSimple ? nRow : mxImpl->GetMergedFirstRow( nCol, nRow ); - size_t nLastCol = bSimple ? nCol : mxImpl->GetMergedLastCol( nCol, nRow ); - size_t nLastRow = bSimple ? nRow : mxImpl->GetMergedLastRow( nCol, nRow ); + size_t nFirstCol = mxImpl->GetMergedFirstCol( nCol, nRow ); + size_t nFirstRow = mxImpl->GetMergedFirstRow( nCol, nRow ); + size_t nLastCol = mxImpl->GetMergedLastCol( nCol, nRow ); + size_t nLastRow = mxImpl->GetMergedLastRow( nCol, nRow ); return Size( GetColWidth( nFirstCol, nLastCol ) + 1, GetRowHeight( nFirstRow, nLastRow ) + 1 ); } @@ -1095,8 +1095,7 @@ void Array::DrawRange( drawinglayer::processor2d::BaseProcessor2D* pProcessor, } void Array::DrawRange( OutputDevice& rDev, - size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow, - const Color* pForceColor ) const + size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ) const { DBG_FRAME_CHECK_COLROW( nFirstCol, nFirstRow, "DrawRange" ); DBG_FRAME_CHECK_COLROW( nLastCol, nLastRow, "DrawRange" ); @@ -1134,7 +1133,7 @@ void Array::DrawRange( OutputDevice& rDev, GetCellStyleRight( _nLastCol, _nLastRow ), GetCellStyleBottom( _nLastCol, _nLastRow ), GetCellStyleLeft( _nFirstCol, _nLastRow ), GetCellStyleBottom( _nFirstCol, _nLastRow ), GetCellStyleRight( _nLastCol, _nFirstRow ), GetCellStyleTop( _nLastCol, _nFirstRow ), - pForceColor, mxImpl->mbDiagDblClip ); + nullptr, mxImpl->mbDiagDblClip ); } } } @@ -1192,7 +1191,7 @@ void Array::DrawRange( OutputDevice& rDev, if( pStart->Prim() && (aStartPos.X() <= aEndPos.X()) ) DrawHorFrameBorder( rDev, aStartPos, aEndPos, *pStart, aStartLFromTR, *pStartLFromT, *pStartLFromL, *pStartLFromB, aStartLFromBR, - aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL, pForceColor ); + aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL ); // re-init "*Start***" variables aStartPos = aEndPos; @@ -1217,7 +1216,7 @@ void Array::DrawRange( OutputDevice& rDev, if( pStart->Prim() && (aStartPos.X() <= aEndPos.X()) ) DrawHorFrameBorder( rDev, aStartPos, aEndPos, *pStart, aStartLFromTR, *pStartLFromT, *pStartLFromL, *pStartLFromB, aStartLFromBR, - aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL, pForceColor ); + aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL ); } // *** vertical frame borders *** @@ -1271,7 +1270,7 @@ void Array::DrawRange( OutputDevice& rDev, if( pStart->Prim() && (aStartPos.Y() <= aEndPos.Y()) ) DrawVerFrameBorder( rDev, aStartPos, aEndPos, *pStart, aStartTFromBL, *pStartTFromL, *pStartTFromT, *pStartTFromR, aStartTFromBR, - aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR, pForceColor ); + aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR ); // re-init "*Start***" variables aStartPos = aEndPos; @@ -1296,7 +1295,7 @@ void Array::DrawRange( OutputDevice& rDev, if( pStart->Prim() && (aStartPos.Y() <= aEndPos.Y()) ) DrawVerFrameBorder( rDev, aStartPos, aEndPos, *pStart, aStartTFromBL, *pStartTFromL, *pStartTFromT, *pStartTFromR, aStartTFromBR, - aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR, pForceColor ); + aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR ); } } diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 6f2a77c..cf4dca6 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -566,14 +566,14 @@ void SvxLanguageComboBox::ImplSetEntryData( sal_Int32 nPos, void* pData ) } -sal_Int32 SvxLanguageBox::ImplGetSelectEntryPos( sal_Int32 nSelIndex ) const +sal_Int32 SvxLanguageBox::ImplGetSelectEntryPos() const { - return GetSelectEntryPos( nSelIndex); + return GetSelectEntryPos(); } -sal_Int32 SvxLanguageComboBox::ImplGetSelectEntryPos( sal_Int32 nSelIndex ) const +sal_Int32 SvxLanguageComboBox::ImplGetSelectEntryPos() const { - return GetSelectEntryPos( nSelIndex); + return GetSelectEntryPos(); } diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index f167a13..71868ec 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -194,9 +194,9 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest() void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, - const OUString& rEntry, sal_Int32 nPos ) + const OUString& rEntry ) { - sal_Int32 nAt = InsertEntry( rEntry, nPos ); + sal_Int32 nAt = InsertEntry( rEntry ); SetEntryData( nAt, reinterpret_cast<void*>(nEnc) ); } diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 9da8e3f..b99ff18 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -96,7 +96,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) } } -SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene) const +SfxItemSet E3dView::Get3DAttributes() const { // Creating itemset with corresponding field SfxItemSet aSet( @@ -107,32 +107,24 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene) const sal_uInt32 nSelectedItems(0L); - if(pInScene) - { - // special scene - aSet.Put(pInScene->GetMergedItemSet()); - } - else - { - // get attributes from all selected objects - MergeAttrFromMarked(aSet, false); + // get attributes from all selected objects + MergeAttrFromMarked(aSet, false); - // calc flags for SID_ATTR_3D_INTERN - const SdrMarkList& rMarkList = GetMarkedObjectList(); - const size_t nMarkCnt(rMarkList.GetMarkCount()); + // calc flags for SID_ATTR_3D_INTERN + const SdrMarkList& rMarkList = GetMarkedObjectList(); + const size_t nMarkCnt(rMarkList.GetMarkCount()); - for(size_t a = 0; a < nMarkCnt; ++a) - { - SdrObject* pObj = GetMarkedObjectByIndex(a); - Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems); - } + for(size_t a = 0; a < nMarkCnt; ++a) + { + SdrObject* pObj = GetMarkedObjectByIndex(a); + Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems); } // Set SID_ATTR_3D_INTERN on the status of the selected objects aSet.Put(SfxUInt32Item(SID_ATTR_3D_INTERN, nSelectedItems)); // maintain default values - if(!nSelectedItems && !pInScene) + if(!nSelectedItems) { // Get defaults and apply SfxItemSet aDefaultSet(mpModel->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST); @@ -151,41 +143,33 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene) const return aSet; } -void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene) +void E3dView::Set3DAttributes( const SfxItemSet& rAttr) { sal_uInt32 nSelectedItems(0L); - if(pInScene) - { - pInScene->SetMergedItemSetAndBroadcast(rAttr); - } - else - { - // #i94832# removed usage of E3DModifySceneSnapRectUpdater here. - // They are not needed here, they are already handled in SetAttrToMarked + // #i94832# removed usage of E3DModifySceneSnapRectUpdater here. + // They are not needed here, they are already handled in SetAttrToMarked - // set at selected objects - SetAttrToMarked(rAttr, false/*bReplaceAll*/); + // set at selected objects + SetAttrToMarked(rAttr, false/*bReplaceAll*/); - // old run - const SdrMarkList& rMarkList = GetMarkedObjectList(); - const size_t nMarkCnt(rMarkList.GetMarkCount()); + // old run + const SdrMarkList& rMarkList = GetMarkedObjectList(); + const size_t nMarkCnt(rMarkList.GetMarkCount()); - for(size_t a = 0; a < nMarkCnt; ++a) - { - SdrObject* pObj = GetMarkedObjectByIndex(a); - Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems); - } + for(size_t a = 0; a < nMarkCnt; ++a) + { + SdrObject* pObj = GetMarkedObjectByIndex(a); + Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems); } // Maintain default values - if(!nSelectedItems && !pInScene) + if(!nSelectedItems) { // Set defaults SfxItemSet aDefaultSet(mpModel->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST); aDefaultSet.Put(rAttr); SetAttributes(aDefaultSet); - } } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 00f9e16..6fb1a9b 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -813,15 +813,12 @@ FmFormShell* FmXFormView::GetFormShell() const return m_pView ? m_pView->GetFormShell() : nullptr; } -void FmXFormView::AutoFocus( bool _bSync ) +void FmXFormView::AutoFocus() { if (m_nAutoFocusEvent) Application::RemoveUserEvent(m_nAutoFocusEvent); - if ( _bSync ) - OnAutoFocus( nullptr ); - else - m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus)); + m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus)); } diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 85bad9e..c7b16d6 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -586,8 +586,7 @@ void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow ) TransferableHelper::CopyToClipboard( pWindow ); } -void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - sal_Int32 nDragPointer ) +void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions ) { INetURLObject aURL; @@ -595,7 +594,7 @@ void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceA { mpTheme->SetDragging( true ); mpTheme->SetDragPos( mnObjectPos ); - TransferableHelper::StartDrag( pWindow, nDragSourceActions, nDragPointer ); + TransferableHelper::StartDrag( pWindow, nDragSourceActions ); } } diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 6bdad80..182d5a7 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -81,9 +81,9 @@ namespace svxform virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; private: - void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ) + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE ) { // don't allow this base class method to be called from outside - TransferableHelper::StartDrag(pWindow, nDragSourceActions, nDragPointer, nDragImage); + TransferableHelper::StartDrag(pWindow, nDragSourceActions, nDragPointer); } }; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index cb6c7e2..475a476 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -292,7 +292,7 @@ private: void cancelEvents(); /// the auto focus to the first (in terms of the tab order) control - void AutoFocus( bool _bSync = false ); + void AutoFocus(); DECL_LINK_TYPED( OnActivate, void*, void ); DECL_LINK_TYPED( OnAutoFocus, void*, void ); DECL_LINK_TYPED( OnDelayedErrorMessage, void*, void ); diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index acac415..f27191e 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -214,7 +214,7 @@ protected: @param nIndexOfChild Index of the new child which should be selected. */ - void selectChild( long nIndexOfChild, bool bFireFocus = true); + void selectChild( long nIndexOfChild ); public: /** Selects a new child by point. diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index ec09feb..47544bb 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -66,7 +66,7 @@ // EditView -void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) +void SdrEditView::SetMarkedObjRect(const Rectangle& rRect) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense."); if (rRect.IsEmpty()) return; @@ -85,16 +85,11 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) long h1=rRect.Bottom()-y1; OUString aStr; ImpTakeDescriptionStr(STR_EditPosSize,aStr); - if (bCopy) - aStr+=ImpGetResStr(STR_EditWithCopy); const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(aStr); - if (bCopy) - CopyMarkedObj(); - for (size_t nm=0; nm<nCount; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); @@ -433,20 +428,20 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b EndUndo(); } -void SdrEditView::MirrorMarkedObjHorizontal(bool bCopy) +void SdrEditView::MirrorMarkedObjHorizontal() { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); aPt2.Y()++; - MirrorMarkedObj(aCenter,aPt2,bCopy); + MirrorMarkedObj(aCenter,aPt2); } -void SdrEditView::MirrorMarkedObjVertical(bool bCopy) +void SdrEditView::MirrorMarkedObjVertical() { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); aPt2.X()++; - MirrorMarkedObj(aCenter,aPt2,bCopy); + MirrorMarkedObj(aCenter,aPt2); } long SdrEditView::GetMarkedObjShear() const diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index b01c621..1fcd763 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1338,15 +1338,13 @@ bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const return bRet; } -SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, SdrSearchOptions nOptions) const +SdrHdl* SdrMarkView::PickHandle(const Point& rPnt) const { if (mbSomeObjChgdFlag) { // recalculate handles, if necessary FlushComeBackTimer(); } - bool bBack(nOptions & SdrSearchOptions::BACKWARD); - bool bNext(nOptions & SdrSearchOptions::NEXT); Point aPt(rPnt); - return maHdlList.IsHdlListHit(aPt,bBack,bNext); + return maHdlList.IsHdlListHit(aPt); } bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, bool bToggle, bool bDeep) diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index cac8a52..8b6bd64 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2513,9 +2513,9 @@ bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) } return bRet; } -bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt) +bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight() { - Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, true/*bWdt*/ ); + Rectangle aNewTextRect = ImpCalculateTextFrame( true/*bHgt*/, true/*bWdt*/ ); bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != maRect ); if ( bRet ) { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 43ceb63..e8ee5c3 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1050,7 +1050,7 @@ OUString SdrObject::GetAngleStr(long nAngle) const return aStr; } -OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/) const +OUString SdrObject::GetMetrStr(long nVal) const { OUString aStr; if (pModel!=nullptr) { diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index c587c441..f78499f 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -274,10 +274,10 @@ bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) return bRet; } -bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt) +bool SdrTextObj::AdjustTextFrameWidthAndHeight() { Rectangle aNeuRect(maRect); - bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt); + bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect); if (bRet) { Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); maRect = aNeuRect; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index bd961fa..08d4e72 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
