diff options
48 files changed, 159 insertions, 219 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 78498537e4fd..a7d79ac15652 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -323,8 +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 Details& rDetails = detailsOOOa1) const; + OUString GetColRowString( bool bAbsolute = false ) const; }; inline void ScAddress::PutInOrder( ScAddress& rAddress ) @@ -534,7 +533,7 @@ public: /** Same as Move() but with sticky end col/row anchors. */ SC_DLLPUBLIC SAL_WARN_UNUSED_RESULT bool MoveSticky( SCsCOL aDeltaX, SCsROW aDeltaY, SCsTAB aDeltaZ, - ScRange& rErrorRange, ScDocument* pDocument = nullptr ); + ScRange& rErrorRange ); SC_DLLPUBLIC void ExtendTo( const ScRange& rRange ); SC_DLLPUBLIC bool Intersects( const ScRange& rRange ) const; // do two ranges intersect? diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx index 9798dac2de55..84ee916e0468 100644 --- a/sc/inc/cellform.hxx +++ b/sc/inc/cellform.hxx @@ -49,7 +49,7 @@ public: static OUString GetString( ScDocument& rDoc, const ScAddress& rPos, sal_uLong nFormat, Color** ppColor, SvNumberFormatter& rFormatter, bool bNullVals = true, - bool bFormula = false, ScForceTextFmt eForceTextFmt = ftDontForce, bool bUseStarFormat = false ); + bool bFormula = false, ScForceTextFmt eForceTextFmt = ftDontForce ); static void GetInputString( ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString, SvNumberFormatter& rFormatter, diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index fcbc1339f3bd..d66fb33401b6 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -175,8 +175,7 @@ public: OUString getUniqueName(const OUString& rPrefix) const; void ChangeListening( const OUString& rName, - const ScRangeListRef& rRangeListRef, - bool bDirty = false ); + const ScRangeListRef& rRangeListRef ); // use FreeUnused only the way it's used in ScDocument::UpdateChartListenerCollection void FreeUnused(); void FreeUno( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& rListener, diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 61bf99131c6c..5d61b7ccd5d6 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -127,7 +127,7 @@ public: void AdjustDateMode( const ScDocument& rDoc ); bool HasActionRange() const { return mbIsActionRange; } - void SetHasActionRange( bool bFlag = true ) { mbIsActionRange = bFlag; } + void SetHasActionRange() { mbIsActionRange = true; } void GetTheActionRange( sal_uLong& nFirst, sal_uLong& nLast ) const { nFirst = mnFirstAction; nLast = mnLastAction; } void SetTheActionRange( sal_uLong nFirst, sal_uLong nLast ) { mnFirstAction = nFirst; mnLastAction = nLast; } }; diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 0b560b9ef4f6..edef1809a867 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -345,7 +345,7 @@ public: svl::SharedString GetSharedString( SCROW nRow ) const; - void SetRawString( SCROW nRow, const OUString& rStr, bool bBroadcast = true ); + void SetRawString( SCROW nRow, const OUString& rStr ); void SetRawString( SCROW nRow, const svl::SharedString& rStr, bool bBroadcast = true ); void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const svl::SharedString& rStr, bool bBroadcast = true ); void SetValue( SCROW nRow, double fVal ); @@ -518,7 +518,7 @@ public: void StartListeningFormulaCells( sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, SCROW nRow1, SCROW nRow2, - SCROW* pStartRow = nullptr, SCROW* pEndRow = nullptr ); + SCROW* pStartRow = nullptr ); void EndListeningFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 06736b4d2b17..d18d3b587284 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -434,10 +434,9 @@ public: /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... bits) for all known address conventions. If more than one bit is given - in nFlags, all bits must match. If bTestLetterNumeric is false and - char>=128, no LetterNumeric test is done and false is returned. */ + in nFlags, all bits must match. */ static bool IsCharFlagAllConventions( - OUString const & rStr, sal_Int32 nPos, sal_uLong nFlags, bool bTestLetterNumeric = true ); + OUString const & rStr, sal_Int32 nPos, sal_uLong nFlags ); private: // FormulaCompiler diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 34aa83470003..3775f9ddf2d4 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -357,13 +357,10 @@ public: the data is not sorted. Is always done if regular expressions are involved. - @param bIgnoreMismatchOnLeadingStrings - Normally strings are sorted behind numerical - values. If this parameter is true, 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 - entry, e.g. column header, is ignored. + 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 + entry, e.g. column header, is ignored. @ATTENTION! StopOnMismatch, TestEqualCondition and the internal IgnoreMismatchOnLeadingStrings and query @@ -372,8 +369,7 @@ public: number format! */ bool FindEqualOrSortedLastInRange( SCCOL& nFoundCol, - SCROW& nFoundRow, bool bSearchForEqualAfterMismatch = false, - bool bIgnoreMismatchOnLeadingStrings = true ); + SCROW& nFoundRow, bool bSearchForEqualAfterMismatch = false ); }; class ScDocAttrIterator // all attribute areas diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index a50b0046553e..30a8d9fc744b 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -870,8 +870,7 @@ public: void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16 nError); SC_DLLPUBLIC void SetFormula( - const ScAddress& rPos, const ScTokenArray& rArray, - formula::FormulaGrammar::Grammar eGram = formula::FormulaGrammar::GRAM_DEFAULT ); + const ScAddress& rPos, const ScTokenArray& rArray ); SC_DLLPUBLIC void SetFormula( const ScAddress& rPos, const OUString& rFormula, @@ -1194,26 +1193,26 @@ public: SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr, const ScMarkData* pTabMark = nullptr ); - SC_DLLPUBLIC bool InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = nullptr ); + SC_DLLPUBLIC bool InsertRow( const ScRange& rRange ); void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr, const ScMarkData* pTabMark = nullptr ); SC_DLLPUBLIC void DeleteRow( const ScRange& rRange, - ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr ); + ScDocument* pRefUndoDoc = nullptr ); bool InsertCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr, const ScMarkData* pTabMark = nullptr ); - SC_DLLPUBLIC bool InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = nullptr ); + SC_DLLPUBLIC bool InsertCol( const ScRange& rRange ); void DeleteCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr, const ScMarkData* pTabMark = nullptr ); void DeleteCol( const ScRange& rRange, - ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr ); + ScDocument* pRefUndoDoc = nullptr ); bool CanInsertRow( const ScRange& rRange ) const; bool CanInsertCol( const ScRange& rRange ) const; @@ -1366,15 +1365,13 @@ public: const ScMarkData* pMarks = nullptr, bool bColRowFlags = true); void UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, - InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc, - const ScMarkData* pMarks = nullptr); + InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc); void CopyToDocument(const ScRange& rRange, InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = nullptr, bool bColRowFlags = true); void UndoToDocument(const ScRange& rRange, - InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc, - const ScMarkData* pMarks = nullptr); + InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc); void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, bool bNewScenario = false ); bool TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const; @@ -1411,7 +1408,7 @@ public: SC_DLLPUBLIC const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const ScPatternAttr* GetPattern( const ScAddress& rPos ) const; SC_DLLPUBLIC const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const; - const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); + const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark ); ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); SC_DLLPUBLIC void AddCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ); void RemoveCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ); @@ -1540,7 +1537,7 @@ public: SC_DLLPUBLIC void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, ScEditDataArray* pDataArray = nullptr ); void DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast = true ); - void DeleteSelectionTab( SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast = true ); + void DeleteSelectionTab( SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData& rMark ); SC_DLLPUBLIC void SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth ); SC_DLLPUBLIC void SetColWidthOnly( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth ); @@ -1553,9 +1550,9 @@ public: SC_DLLPUBLIC void SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bManual ); SC_DLLPUBLIC sal_uInt16 GetColWidth( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero = true ) const; - SC_DLLPUBLIC sal_uLong GetColWidth( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bHiddenAsZero = true ) const; + SC_DLLPUBLIC sal_uLong GetColWidth( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab ) const; SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero = true ) const; - SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const; + SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow ) const; SC_DLLPUBLIC sal_uLong GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHiddenAsZero = true ) const; SCROW GetRowForHeight( SCTAB nTab, sal_uLong nHeight ) const; sal_uLong GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, double fScale ) const; @@ -1618,7 +1615,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, SCCOL* pLastCol = nullptr) const; + bool ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = nullptr) 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/dpobject.hxx b/sc/inc/dpobject.hxx index a2fd066349bf..4ecdd8f3faf3 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -380,14 +380,11 @@ public: /** * Create a new name that's not yet used by any existing data pilot - * objects. All data pilot names are 'DataPilot' + <num>, and the nMin - * specifies the minimum number allowed. - * - * @param nMin minimum number allowed. + * objects. All data pilot names are 'DataPilot' + <num> * * @return new name for data pilot object. */ - OUString CreateNewName( sal_uInt16 nMin = 1 ) const; + OUString CreateNewName() const; void FreeTable(ScDPObject* pDPObj); SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj); diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index cdce6204d6c1..a34caebfda6e 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -152,16 +152,16 @@ public: const SfxItemSet& rDefaults, bool bRememberCopy = true ); /// Current defaults are not applied, new defaults are applied void SetTextNewDefaults( const EditTextObject& rTextObject, - SfxItemSet* pDefaults, bool bTakeOwnership = true ); + SfxItemSet* pDefaults ); /// Overwritten method to be able to apply defaults already set void SetText( const OUString& rText ); /// Current defaults are not applied, new defaults are applied void SetTextNewDefaults( const OUString& rText, - const SfxItemSet& rDefaults, bool bRememberCopy = true ); + const SfxItemSet& rDefaults ); /// Current defaults are not applied, new defaults are applied void SetTextNewDefaults( const OUString& rText, - SfxItemSet* pDefaults, bool bTakeOwnership = true ); + SfxItemSet* pDefaults ); /// Paragraph attributes that are not defaults are copied to /// character attributes and all paragraph attributes reset diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index d7fc6b6f8445..9f215f633621 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -103,8 +103,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, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 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 void ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index b236bad1d0c5..14f4b0871d47 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -629,7 +629,7 @@ SC_DLLPUBLIC static sal_Int32 FindUnquoted( const OUString& rString, sa semantics as FindUnquoted( const String&, ...) @returns: pointer to cChar if found, else NULL */ -SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote = '\'' ); +SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar ); static rtl_TextEncoding GetCharsetValue( const OUString& rCharSet ); static OUString GetCharsetString( rtl_TextEncoding eVal ); diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index b5936afeba76..e60ea1480f9f 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -155,7 +155,7 @@ public: static bool GetBoolProperty( const css::uno::Reference< css::beans::XPropertySet>& xProp, const OUString& rName, bool bDefault = false ); static sal_Int32 GetLongProperty( const css::uno::Reference< css::beans::XPropertySet>& xProp, - const OUString& rName, long nDefault = 0 ); + const OUString& rName ); static sal_Int32 GetEnumProperty( const css::uno::Reference< css::beans::XPropertySet>& xProp, const OUString& rName, long nDefault ); static OUString GetStringProperty( diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index 113467697c1b..3fc2ba375ae7 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -80,14 +80,12 @@ public: ScProgress(); #endif - bool SetStateText( sal_uLong nVal, const OUString &rVal, sal_uLong nNewRange = 0 ) + bool SetStateText( sal_uLong nVal, const OUString &rVal ) { if ( pProgress ) { - if ( nNewRange ) - nGlobalRange = nNewRange; CalcGlobalPercent( nVal ); - if ( !pProgress->SetStateText( nVal, rVal, nNewRange ) ) + if ( !pProgress->SetStateText( nVal, rVal ) ) bGlobalNoUserBreak = false; return bGlobalNoUserBreak; } diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index f6afd6b292b0..2a15ec87c413 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -118,8 +118,7 @@ public: sal_uInt32 GetUnoType() const; SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const ScAddress& rPos, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress&, - const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); + void UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& ); /** * @param nLocalTab sheet index where this name belongs, or -1 for global diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 4b6ca43c82ff..c572797bc6f6 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -107,8 +107,7 @@ public: static sal_Int32 GetTokenCount( const OUString& rString, - sal_Unicode cSeparator = ' ', - sal_Unicode cQuote = '\''); + sal_Unicode cSeparator = ' '); static void GetTokenByOffset( OUString& rToken, @@ -119,8 +118,7 @@ public: static void AppendTableName( OUStringBuffer& rBuf, - const OUString& rTabName, - sal_Unicode cQuote = '\''); + const OUString& rTabName); /// String to Range core static bool GetAddressFromString( @@ -153,8 +151,7 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeparator = ' ', - sal_Unicode cQuote = '\''); + sal_Unicode cSeparator = ' '); /// String to Range API static bool GetAddressFromString( @@ -163,16 +160,14 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeparator = ' ', - sal_Unicode cQuote = '\''); + sal_Unicode cSeparator = ' '); static bool GetRangeFromString( css::table::CellRangeAddress& rRange, const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeparator = ' ', - sal_Unicode cQuote = '\''); + sal_Unicode cSeparator = ' '); /// Range to String core static void GetStringFromAddress( @@ -196,8 +191,7 @@ public: const ScRangeList* pRangeList, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeparator = ' ', - sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D)); + sal_Unicode cSeparator = ' '); static void GetStringFromArea( OUString& rString, @@ -215,8 +209,7 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator = ' ', - bool bAppendStr = false, - sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); + bool bAppendStr = false ); static void GetStringFromRange( OUString& rString, const css::table::CellRangeAddress& rRange, @@ -230,8 +223,7 @@ public: const css::uno::Sequence< css::table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeparator = ' ', - sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); + sal_Unicode cSeparator = ' ' ); /// XML Range to Calc Range static void GetStringFromXMLRangeString( diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 52d8a62380e5..9216dbe916f2 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -140,7 +140,7 @@ public: virtual double GetStep() const = 0; virtual double GetMax() const = 0; virtual OUString GetStartStr() const = 0; - virtual void SetEdStartValEnabled(bool bFlag=false) = 0; + virtual void SetEdStartValEnabled(bool bFlag) = 0; }; class AbstractScGroupDlg : public VclAbstractDialog @@ -205,7 +205,7 @@ public: class AbstractScMetricInputDlg : public VclAbstractDialog { public: - virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const = 0; + virtual long GetInputValue() const = 0; }; class AbstractScMoveTableDlg : public VclAbstractDialog @@ -360,8 +360,7 @@ public: virtual AbstractScDataFormDlg * CreateScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell) = 0; - virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent, - InsertDeleteFlags nCheckDefaults = InsertDeleteFlags::NONE) = 0; + virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent) = 0; virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index bcb61f4aa3e7..496378e92b93 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -483,7 +483,7 @@ public: bool GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = empty bool GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; - bool GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes, bool bFullFormattedArea = false ) const; + bool GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const; bool GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, SCCOL& rEndCol, bool bNotes ) const; bool GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index dd1d1681ed14..892e52915f36 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -96,7 +96,7 @@ public: const ScGridOptions& GetGridOptions() const { return aGridOpt; } void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } - SvxGridItem* CreateGridItem( sal_uInt16 nId = SID_ATTR_GRID_OPTIONS ) const; + SvxGridItem* CreateGridItem() const; const ScViewOptions& operator= ( const ScViewOptions& rCpy ); bool operator== ( const ScViewOptions& rOpt ) const; diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 04848548de1e..f37ae4e54009 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2381,7 +2381,7 @@ void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError) AttachNewFormulaCell(it, nRow, *pCell); } -void ScColumn::SetRawString( SCROW nRow, const OUString& rStr, bool bBroadcast ) +void ScColumn::SetRawString( SCROW nRow, const OUString& rStr ) { if (!ValidRow(nRow)) return; @@ -2390,7 +2390,7 @@ void ScColumn::SetRawString( SCROW nRow, const OUString& rStr, bool bBroadcast ) if (!aSS.getData()) return; - SetRawString(nRow, aSS, bBroadcast); + SetRawString(nRow, aSS); } void ScColumn::SetRawString( SCROW nRow, const svl::SharedString& rStr, bool bBroadcast ) diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index 09e2e38e24c8..4cb643f93b37 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -1259,11 +1259,6 @@ public: { return mnStartRow; } - - SCROW getEndRow() const - { - return mnEndRow; - } }; class EndListeningFormulaCellsHandler @@ -1351,7 +1346,7 @@ public: void ScColumn::StartListeningFormulaCells( sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, - SCROW nRow1, SCROW nRow2, SCROW* pStartRow, SCROW* pEndRow ) + SCROW nRow1, SCROW nRow2, SCROW* pStartRow ) { StartListeningFormulaCellsHandler aFunc(rStartCxt, rEndCxt); sc::ProcessBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2); @@ -1360,11 +1355,6 @@ void ScColumn::StartListeningFormulaCells( // start row position may be smaller than nRow1 in case the formula // group starts before nRow1 position. *pStartRow = aFunc.getStartRow(); - - if (pEndRow) - // row position of the last cell that started listening, which may be - // greater than nRow2 in case the formula group extends beyond nRow2. - *pEndRow = aFunc.getEndRow(); } void ScColumn::EndListeningFormulaCells( diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 1b86461c1098..760d9b4a0ea3 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1277,8 +1277,7 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField() } bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, - SCROW& nFoundRow, bool bSearchForEqualAfterMismatch, - bool bIgnoreMismatchOnLeadingStringsP ) + SCROW& nFoundRow, bool bSearchForEqualAfterMismatch ) { // Set and automatically reset mpParam->mbRangeLookup when returning. We // could use comphelper::FlagRestorationGuard, but really, that one is @@ -1295,7 +1294,7 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, nFoundRow = MAXROW+1; SetStopOnMismatch( true ); // assume sorted keys SetTestEqualCondition( true ); - bIgnoreMismatchOnLeadingStrings = bIgnoreMismatchOnLeadingStringsP; + bIgnoreMismatchOnLeadingStrings = true; bool bLiteral = mpParam->eSearchType == utl::SearchParam::SRCH_NORMAL && mpParam->GetEntry(0).GetQueryItem().meType == ScQueryEntry::ByString; bool bBinary = bLiteral && mpParam->bByRow && (mpParam->GetEntry(0).eOp == diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 3e7c8d82512e..dc13be87861c 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1066,12 +1066,12 @@ void ScDocument::SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16 } void ScDocument::SetFormula( - const ScAddress& rPos, const ScTokenArray& rArray, formula::FormulaGrammar::Grammar eGram ) + const ScAddress& rPos, const ScTokenArray& rArray ) { if (!TableExists(rPos.Tab())) return; - maTabs[rPos.Tab()]->SetFormula(rPos.Col(), rPos.Row(), rArray, eGram); + maTabs[rPos.Tab()]->SetFormula(rPos.Col(), rPos.Row(), rArray, formula::FormulaGrammar::GRAM_DEFAULT); } void ScDocument::SetFormula( diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index cd284792b8a0..2f81db9d486e 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -506,7 +506,7 @@ public: void setCol(SCCOL nCol) { mrCalcPos.SetCol(nCol); } void setRow(SCROW nRow) { mrCalcPos.SetRow(nRow); } - void incTab(SCTAB nInc=1) { mrCalcPos.IncTab(nInc); } + void incTab() { mrCalcPos.IncTab(); } void incCol(SCCOL nInc=1) { mrCalcPos.IncCol(nInc); } void setOldMapMode(const MapMode& rOldMapMode) { maOldMapMode = rOldMapMode; } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index b61e011f680a..731c8c1df11c 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1310,12 +1310,11 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, return bRet; } -bool ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc ) +bool ScDocument::InsertRow( const ScRange& rRange ) { return InsertRow( 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) ); } void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, @@ -1408,12 +1407,12 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, pChartListenerCollection->UpdateDirtyCharts(); } -void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline ) +void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc ) { 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, pUndoOutline ); + pRefUndoDoc ); } bool ScDocument::CanInsertCol( const ScRange& rRange ) const @@ -1514,12 +1513,11 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab, return bRet; } -bool ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc ) +bool ScDocument::InsertCol( const ScRange& rRange ) { return InsertCol( 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) ); } void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, @@ -1601,12 +1599,12 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA pChartListenerCollection->UpdateDirtyCharts(); } -void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline ) +void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc ) { 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, pUndoOutline ); + pRefUndoDoc ); } // for Area-Links: Insert/delete cells, when the range is changed. @@ -2007,8 +2005,7 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, - InsertDeleteFlags nFlags, bool bOnlyMarked, ScDocument* pDestDoc, - const ScMarkData* pMarks) + InsertDeleteFlags nFlags, bool bOnlyMarked, ScDocument* pDestDoc) { PutInOrder( nCol1, nCol2 ); PutInOrder( nRow1, nRow2 ); @@ -2018,7 +2015,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, sc::AutoCalcSwitch aACSwitch(*pDestDoc, false); // avoid multiple calculations if (nTab1 > 0) - CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, InsertDeleteFlags::FORMULA, false, pDestDoc, pMarks ); + CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, InsertDeleteFlags::FORMULA, false, pDestDoc ); sc::CopyToDocContext aCxt(*pDestDoc); OSL_ASSERT( nTab2 < static_cast<SCTAB>(maTabs.size()) && nTab2 < static_cast<SCTAB>(pDestDoc->maTabs.size())); @@ -2026,11 +2023,11 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, { if (maTabs[i] && pDestDoc->maTabs[i]) maTabs[i]->UndoToTable(aCxt, nCol1, nRow1, nCol2, nRow2, nFlags, - bOnlyMarked, pDestDoc->maTabs[i], pMarks); + bOnlyMarked, pDestDoc->maTabs[i]); } if (nTab2 < MAXTAB) - CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,MAXTAB, InsertDeleteFlags::FORMULA, false, pDestDoc, pMarks ); + CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,MAXTAB, InsertDeleteFlags::FORMULA, false, pDestDoc ); } } @@ -2066,8 +2063,7 @@ void ScDocument::CopyToDocument(const ScRange& rRange, } void ScDocument::UndoToDocument(const ScRange& rRange, - InsertDeleteFlags nFlags, bool bOnlyMarked, ScDocument* pDestDoc, - const ScMarkData* pMarks) + InsertDeleteFlags nFlags, bool bOnlyMarked, ScDocument* pDestDoc) { sc::AutoCalcSwitch aAutoCalcSwitch(*this, false); @@ -2078,7 +2074,7 @@ void ScDocument::UndoToDocument(const ScRange& rRange, sc::CopyToDocContext aCxt(*pDestDoc); if (nTab1 > 0) - CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, InsertDeleteFlags::FORMULA, false, pDestDoc, pMarks ); + CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, InsertDeleteFlags::FORMULA, false, pDestDoc ); SCTAB nMinSizeBothTabs = static_cast<SCTAB>(std::min(maTabs.size(), pDestDoc->maTabs.size())); for (SCTAB i = nTab1; i <= nTab2 && i < nMinSizeBothTabs; i++) @@ -2086,11 +2082,11 @@ void ScDocument::UndoToDocument(const ScRange& rRange, if (maTabs[i] && pDestDoc->maTabs[i]) maTabs[i]->UndoToTable(aCxt, aNewRange.aStart.Col(), aNewRange.aStart.Row(), aNewRange.aEnd.Col(), aNewRange.aEnd.Row(), - nFlags, bOnlyMarked, pDestDoc->maTabs[i], pMarks); + nFlags, bOnlyMarked, pDestDoc->maTabs[i]); } if (nTab2 < static_cast<SCTAB>(maTabs.size())) - CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,maTabs.size(), InsertDeleteFlags::FORMULA, false, pDestDoc, pMarks ); + CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,maTabs.size(), InsertDeleteFlags::FORMULA, false, pDestDoc ); } // bUseRangeForVBA added for VBA api support to allow content of a specified @@ -4006,13 +4002,13 @@ sal_uInt16 ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) return 0; } -sal_uLong ScDocument::GetColWidth( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bHiddenAsZero ) const +sal_uLong ScDocument::GetColWidth( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab ) const { const ScTable* pTab = FetchTable(nTab); if (!pTab) return 0; - return pTab->GetColWidth(nStartCol, nEndCol, bHiddenAsZero); + return pTab->GetColWidth(nStartCol, nEndCol); } sal_uInt16 ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const @@ -4047,10 +4043,10 @@ sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero return 0; } -sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const +sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) - return maTabs[nTab]->GetRowHeight( nRow, pStartRow, pEndRow, bHiddenAsZero ); + return maTabs[nTab]->GetRowHeight( nRow, pStartRow, pEndRow ); OSL_FAIL("Wrong sheet number"); return 0; } @@ -4393,12 +4389,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, SCCOL* pLastCol) const +bool ScDocument::ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol) const { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) return false; - return maTabs[nTab]->ColFiltered(nCol, pFirstCol, pLastCol); + return maTabs[nTab]->ColFiltered(nCol, pFirstCol); } void ScDocument::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered) @@ -4943,10 +4939,10 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, bool return new ScPatternAttr( GetPool() ); // empty } -const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, bool bDeep ) +const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark ) { delete pSelectionAttr; - pSelectionAttr = CreateSelectionPattern( rMark, bDeep ); + pSelectionAttr = CreateSelectionPattern( rMark ); return pSelectionAttr; } @@ -5808,7 +5804,7 @@ void ScDocument::DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& } void ScDocument::DeleteSelectionTab( - SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast ) + SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData& rMark ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) { @@ -5838,7 +5834,7 @@ void ScDocument::DeleteSelectionTab( aCxt.purgeEmptyBroadcasters(); } - maTabs[nTab]->DeleteSelection(nDelFlag, rMark, bBroadcast); + maTabs[nTab]->DeleteSelection(nDelFlag, rMark); if (bDelContent) { diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index bff5524d9957..5cda7a0bd88b 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3573,7 +3573,7 @@ const ScDPObject* ScDPCollection::GetByName(const OUString& rName) const return nullptr; } -OUString ScDPCollection::CreateNewName( sal_uInt16 nMin ) const +OUString ScDPCollection::CreateNewName() const { OUString aBase("DataPilot"); @@ -3582,7 +3582,7 @@ OUString ScDPCollection::CreateNewName( sal_uInt16 nMin ) const { OUStringBuffer aBuf; aBuf.append(aBase); - aBuf.append(static_cast<sal_Int32>(nMin + nAdd)); + aBuf.append(static_cast<sal_Int32>(1 + nAdd)); OUString aNewName = aBuf.makeStringAndClear(); bool bFound = false; TablesType::const_iterator itr = maTables.begin(), itrEnd = maTables.end(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 43e22c109d92..03b6b01e730b 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -819,8 +819,9 @@ sal_Int32 ScGlobal::FindUnquoted( const OUString& rString, sal_Unicode cChar) return -1; } -const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote ) +const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar ) { + sal_Unicode cQuote = '\''; const sal_Unicode* p = pString; bool bQuoted = false; while (*p) diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 509ef41e8b31..efcf23ef4caf 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -173,7 +173,7 @@ public: /** Places the caption inside the passed rectangle, tries to keep the cell rectangle uncovered. Uses page area if 0 is passed. */ void AutoPlaceCaption( const Rectangle* pVisRect = nullptr ); /** Updates caption tail and textbox according to current cell position. Uses page area if 0 is passed. */ - void UpdateCaptionPos( const Rectangle* pVisRect = nullptr ); + void UpdateCaptionPos(); protected: /** Helper constructor for derived classes. */ @@ -323,7 +323,7 @@ void ScCaptionCreator::AutoPlaceCaption( const Rectangle* pVisRect ) FitCaptionToRect( pVisRect ); } -void ScCaptionCreator::UpdateCaptionPos( const Rectangle* pVisRect ) +void ScCaptionCreator::UpdateCaptionPos() { ScDrawLayer* pDrawLayer = mrDoc.GetDrawLayer(); @@ -345,7 +345,7 @@ void ScCaptionCreator::UpdateCaptionPos( const Rectangle* pVisRect ) mpCaption->SetTailPos( aTailPos ); mpCaption->SetLogicRect( aCaptRect ); // fit caption into draw page - FitCaptionToRect( pVisRect ); + FitCaptionToRect(); } // update cell position in caption user data diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index df8284aeea70..2d7951123227 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -563,7 +563,7 @@ bool ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const const SCCOL SC_COLUMNS_STOP = 30; -bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes, bool bFullFormattedArea ) const +bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const { bool bFound = false; SCCOL nMaxX = 0; @@ -605,7 +605,7 @@ bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes, bool bF for (i=0; i<=MAXCOL; i++) // Test attribute { SCROW nLastRow; - if (aCol[i].GetLastVisibleAttr( nLastRow, bFullFormattedArea )) + if (aCol[i].GetLastVisibleAttr( nLastRow )) { bFound = true; nMaxX = i; diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index dda96dea4968..8de331d65ea2 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -318,8 +318,7 @@ void DoubleRefToVars( const formula::FormulaToken* p, bool bDontCheckForTableOp = false ); ScDBRangeBase* PopDBDoubleRef(); void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, - SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, - bool bDontCheckForTableOp = false ); + SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2 ); void PopExternalSingleRef(sal_uInt16& rFileId, OUString& rTabName, ScSingleRefData& rRef); void PopExternalSingleRef(ScExternalRefCache::TokenRef& rToken, ScExternalRefCache::CellFormat* pFmt = nullptr); void PopExternalSingleRef(sal_uInt16& rFileId, OUString& rTabName, ScSingleRefData& rRef, diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx index cbc72f2186f4..ed98e53f5ad6 100644 --- a/sc/source/core/inc/jumpmatrix.hxx +++ b/sc/source/core/inc/jumpmatrix.hxx @@ -97,7 +97,7 @@ public: ScJumpMatrix( SCSIZE nColsP, SCSIZE nRowsP ); ~ScJumpMatrix(); void GetDimensions( SCSIZE& rCols, SCSIZE& rRows ) const; - void SetJump( SCSIZE nCol, SCSIZE nRow, double fBool, short nStart, short nNext, short nStop = SHRT_MAX ); + void SetJump( SCSIZE nCol, SCSIZE nRow, double fBool, short nStart, short nNext ); void GetJump( SCSIZE nCol, SCSIZE nRow, double& rBool, short& rStart, short& rNext, short& rStop ) const; void SetAllJumps( double fBool, short nStart, short nNext, short nStop = SHRT_MAX ); void SetJumpParameters( ScTokenVec* p ); diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 6849db3c0b0b..d4a69c776eff 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -2166,7 +2166,7 @@ bool ScRange::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange, ScDoc return b; } -bool ScRange::MoveSticky( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange, ScDocument* pDoc ) +bool ScRange::MoveSticky( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange ) { bool bColRange = (aStart.Col() < aEnd.Col()); bool bRowRange = (aStart.Row() < aEnd.Row()); @@ -2174,13 +2174,13 @@ bool ScRange::MoveSticky( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange, dy = 0; // Entire column not to be moved. if (dx && aStart.Col() == 0 && aEnd.Col() == MAXCOL) dx = 0; // Entire row not to be moved. - bool b1 = aStart.Move( dx, dy, dz, rErrorRange.aStart, pDoc ); + bool b1 = aStart.Move( dx, dy, dz, rErrorRange.aStart ); if (dx && bColRange && aEnd.Col() == MAXCOL) dx = 0; // End column sticky. if (dy && bRowRange && aEnd.Row() == MAXROW) dy = 0; // End row sticky. SCTAB nOldTab = aEnd.Tab(); - bool b2 = aEnd.Move( dx, dy, dz, rErrorRange.aEnd, pDoc ); + bool b2 = aEnd.Move( dx, dy, dz, rErrorRange.aEnd ); if (!b2) { // End column or row of a range may have become sticky. @@ -2235,31 +2235,30 @@ void ScRange::IncEndRowSticky( SCsROW nDelta ) aEnd.IncRow( nDelta); // was greater than MAXROW, caller should know.. } -OUString ScAddress::GetColRowString( bool bAbsolute, - const Details& rDetails ) const +OUString ScAddress::GetColRowString( bool bAbsolute ) const { OUStringBuffer aString; - switch( rDetails.eConv ) + switch( detailsOOOa1.eConv ) { default : case formula::FormulaGrammar::CONV_OOO: case formula::FormulaGrammar::CONV_XL_A1: case formula::FormulaGrammar::CONV_XL_OOX: - if (bAbsolute) - aString.append("$"); + if (bAbsolute) + aString.append("$"); - lcl_ScColToAlpha( aString, nCol); + lcl_ScColToAlpha( aString, nCol); - if ( bAbsolute ) - aString.append("$"); + if ( bAbsolute ) + aString.append("$"); - aString.append(OUString::number(nRow+1)); + aString.append(OUString::number(nRow+1)); break; case formula::FormulaGrammar::CONV_XL_R1C1: - lcl_r1c1_append_r ( aString, nRow, bAbsolute, rDetails ); - lcl_r1c1_append_c ( aString, nCol, bAbsolute, rDetails ); + lcl_r1c1_append_r ( aString, nRow, bAbsolute, detailsOOOa1 ); + lcl_r1c1_append_c ( aString, nCol, bAbsolute, detailsOOOa1 ); break; } diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx index 65eba23fa980..c5886765d07d 100644 --- a/sc/source/core/tool/cellform.cxx +++ b/sc/source/core/tool/cellform.cxx @@ -128,8 +128,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString OUString ScCellFormat::GetString( ScDocument& rDoc, const ScAddress& rPos, sal_uLong nFormat, Color** ppColor, - SvNumberFormatter& rFormatter, bool bNullVals, bool bFormula, ScForceTextFmt eForceTextFmt, - bool bUseStarFormat ) + SvNumberFormatter& rFormatter, bool bNullVals, bool bFormula, ScForceTextFmt eForceTextFmt ) { OUString aString; *ppColor = nullptr; @@ -140,7 +139,7 @@ OUString ScCellFormat::GetString( case CELLTYPE_STRING: { ScRefCellValue aCell(rDoc, rPos); - rFormatter.GetOutputString(aCell.mpString->getString(), nFormat, aString, ppColor, bUseStarFormat); + rFormatter.GetOutputString(aCell.mpString->getString(), nFormat, aString, ppColor); } break; case CELLTYPE_EDIT: @@ -165,7 +164,7 @@ OUString ScCellFormat::GetString( rFormatter.GetOutputString(nValue, 0, aTemp, ppColor); rFormatter.GetOutputString(aTemp, nFormat, aString, ppColor); } - else rFormatter.GetOutputString(nValue, nFormat, aString, ppColor, bUseStarFormat); + else rFormatter.GetOutputString(nValue, nFormat, aString, ppColor); } } break; @@ -203,12 +202,12 @@ OUString ScCellFormat::GetString( double fValue = pFCell->GetValue(); if (!bNullVals && fValue == 0.0) aString.clear(); else if (pFCell->IsHybridValueCell()) aString = pFCell->GetString().getString(); - else rFormatter.GetOutputString(fValue, nFormat, aString, ppColor, bUseStarFormat); + else rFormatter.GetOutputString(fValue, nFormat, aString, ppColor); } else { rFormatter.GetOutputString(pFCell->GetString().getString(), - nFormat, aString, ppColor, bUseStarFormat); + nFormat, aString, ppColor); } } } diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 4731d1e2de91..7efeb337fed5 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -480,7 +480,7 @@ OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const } void ScChartListenerCollection::ChangeListening( const OUString& rName, - const ScRangeListRef& rRangeListRef, bool bDirty ) + const ScRangeListRef& rRangeListRef ) { ScChartListener* pCL = findByName(rName); if (pCL) @@ -494,8 +494,6 @@ void ScChartListenerCollection::ChangeListening( const OUString& rName, insert(pCL); } pCL->StartListeningTo(); - if ( bDirty ) - pCL->SetDirty( true ); } namespace { diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 795e4e728087..7d9895f6c457 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -4554,7 +4554,7 @@ void ScCompiler::MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddr } bool ScCompiler::IsCharFlagAllConventions( - OUString const & rStr, sal_Int32 nPos, sal_uLong nFlags, bool bTestLetterNumeric ) + OUString const & rStr, sal_Int32 nPos, sal_uLong nFlags ) { sal_Unicode c = rStr[ nPos ]; sal_Unicode cLast = nPos > 0 ? rStr[ nPos-1 ] : 0; @@ -4570,10 +4570,8 @@ bool ScCompiler::IsCharFlagAllConventions( } return true; } - else if (bTestLetterNumeric) - return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); else - return false; + return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } void ScCompiler::CreateStringFromExternal( OUStringBuffer& rBuffer, const FormulaToken* pTokenP ) const diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 9464c9084034..9da65b285813 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -563,13 +563,13 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec } void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject, - SfxItemSet* pSet, bool bTakeOwnership ) + SfxItemSet* pSet ) { bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) SetUpdateMode( false ); EditEngine::SetText( rTextObject ); - SetDefaults( pSet, bTakeOwnership ); + SetDefaults( pSet ); if ( bUpdateMode ) SetUpdateMode( true ); } @@ -587,25 +587,25 @@ void ScEditEngineDefaulter::SetText( const OUString& rText ) } void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, - const SfxItemSet& rSet, bool bRememberCopy ) + const SfxItemSet& rSet ) { bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) SetUpdateMode( false ); EditEngine::SetText( rText ); - SetDefaults( rSet, bRememberCopy ); + SetDefaults( rSet ); if ( bUpdateMode ) SetUpdateMode( true ); } void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, - SfxItemSet* pSet, bool bTakeOwnership ) + SfxItemSet* pSet ) { bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) SetUpdateMode( false ); EditEngine::SetText( rText ); - SetDefaults( pSet, bTakeOwnership ); + SetDefaults( pSet ); if ( bUpdateMode ) SetUpdateMode( true ); } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index ef9aa923268f..d67a026d1586 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -1025,8 +1025,7 @@ ScDBRangeBase* ScInterpreter::PopDBDoubleRef() } void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, - SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, - bool bDontCheckForTableOp ) + SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2) { if( sp ) { @@ -1038,8 +1037,7 @@ void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, nGlobalError = p->GetError(); break; case svDoubleRef: - DoubleRefToVars( p, rCol1, rRow1, rTab1, rCol2, rRow2, rTab2, - bDontCheckForTableOp); + DoubleRefToVars( p, rCol1, rRow1, rTab1, rCol2, rRow2, rTab2); break; default: SetError( errIllegalParameter); diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx index f02612c2d5ab..b3e0ff652ce5 100644 --- a/sc/source/core/tool/jumpmatrix.cxx +++ b/sc/source/core/tool/jumpmatrix.cxx @@ -72,9 +72,9 @@ void ScJumpMatrix::GetDimensions(SCSIZE& rCols, SCSIZE& rRows) const } void ScJumpMatrix::SetJump(SCSIZE nCol, SCSIZE nRow, double fBool, - short nStart, short nNext, short nStop) + short nStart, short nNext) { - pJump[(sal_uLong)nCol * nRows + nRow].SetJump(fBool, nStart, nNext, nStop); + pJump[(sal_uLong)nCol * nRows + nRow].SetJump(fBool, nStart, nNext, SHRT_MAX); } void ScJumpMatrix::GetJump( diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index aa816024aabe..ba3e594b6418 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -268,12 +268,11 @@ void ScRangeData::GetSymbol( OUString& rSymbol, const ScAddress& rPos, const For rSymbol = aStr; } -void ScRangeData::UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& rPos, - const FormulaGrammar::Grammar eGrammar ) +void ScRangeData::UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& rPos ) { std::unique_ptr<ScTokenArray> pTemp( pCode->Clone() ); ScCompiler aComp( pDoc, rPos, *pTemp.get()); - aComp.SetGrammar(eGrammar); + aComp.SetGrammar(formula::FormulaGrammar::GRAM_DEFAULT); aComp.MoveRelWrap(GetMaxCol(), GetMaxRow()); aComp.CreateStringFromTokenArray( rBuffer ); } diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 8c1d138e5bad..93c8da31032a 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -413,7 +413,7 @@ void ScRangeStringConverter::GetTokenByOffset( } } -void ScRangeStringConverter::AppendTableName(OUStringBuffer& rBuf, const OUString& rTabName, sal_Unicode /* cQuote */) +void ScRangeStringConverter::AppendTableName(OUStringBuffer& rBuf, const OUString& rTabName) { // quote character is always "'" OUString aQuotedTab(rTabName); @@ -421,14 +421,14 @@ void ScRangeStringConverter::AppendTableName(OUStringBuffer& rBuf, const OUStrin rBuf.append(aQuotedTab); } -sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Unicode cSeparator, sal_Unicode cQuote ) +sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Unicode cSeparator ) { OUString sToken; sal_Int32 nCount = 0; sal_Int32 nOffset = 0; while( nOffset >= 0 ) { - GetTokenByOffset( sToken, rString, nOffset, cQuote, cSeparator ); + GetTokenByOffset( sToken, rString, nOffset, '\'', cSeparator ); if( nOffset >= 0 ) nCount++; } @@ -559,12 +559,11 @@ bool ScRangeStringConverter::GetAreaFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeparator, - sal_Unicode cQuote ) + sal_Unicode cSeparator ) { ScRange aScRange; bool bResult(false); - if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) + if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeparator ) && (nOffset >= 0) ) { rArea.nTab = aScRange.aStart.Tab(); rArea.nColStart = aScRange.aStart.Col(); @@ -582,12 +581,11 @@ bool ScRangeStringConverter::GetAddressFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeparator, - sal_Unicode cQuote ) + sal_Unicode cSeparator ) { ScAddress aScAddress; bool bResult(false); - if( GetAddressFromString( aScAddress, rAddressStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) + if( GetAddressFromString( aScAddress, rAddressStr, pDocument, eConv, nOffset, cSeparator ) && (nOffset >= 0) ) { ScUnoConversion::FillApiAddress( rAddress, aScAddress ); bResult = true; @@ -601,12 +599,11 @@ bool ScRangeStringConverter::GetRangeFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeparator, - sal_Unicode cQuote ) + sal_Unicode cSeparator ) { ScRange aScRange; bool bResult(false); - if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) + if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeparator ) && (nOffset >= 0) ) { ScUnoConversion::FillApiRange( rRange, aScRange ); bResult = true; @@ -655,8 +652,7 @@ void ScRangeStringConverter::GetStringFromRangeList( const ScRangeList* pRangeList, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeparator, - sal_uInt16 nFormatFlags ) + sal_Unicode cSeparator ) { OUString sRangeListStr; if( pRangeList ) @@ -665,7 +661,7 @@ void ScRangeStringConverter::GetStringFromRangeList( { const ScRange* pRange = (*pRangeList)[nIndex]; if( pRange ) - GetStringFromRange( sRangeListStr, *pRange, pDocument, eConv, cSeparator, true, nFormatFlags ); + GetStringFromRange( sRangeListStr, *pRange, pDocument, eConv, cSeparator, true ); } } rString = sRangeListStr; @@ -690,11 +686,10 @@ void ScRangeStringConverter::GetStringFromAddress( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator, - bool bAppendStr, - sal_uInt16 nFormatFlags ) + bool bAppendStr ) { ScAddress aScAddress( static_cast<SCCOL>(rAddress.Column), static_cast<SCROW>(rAddress.Row), rAddress.Sheet ); - GetStringFromAddress( rString, aScAddress, pDocument, eConv, cSeparator, bAppendStr, nFormatFlags ); + GetStringFromAddress( rString, aScAddress, pDocument, eConv, cSeparator, bAppendStr ); } void ScRangeStringConverter::GetStringFromRange( @@ -716,15 +711,14 @@ void ScRangeStringConverter::GetStringFromRangeList( const uno::Sequence< table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeparator, - sal_uInt16 nFormatFlags ) + sal_Unicode cSeparator ) { OUString sRangeListStr; sal_Int32 nCount = rRangeSeq.getLength(); for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { const table::CellRangeAddress& rRange = rRangeSeq[ nIndex ]; - GetStringFromRange( sRangeListStr, rRange, pDocument, eConv, cSeparator, true, nFormatFlags ); + GetStringFromRange( sRangeListStr, rRange, pDocument, eConv, cSeparator, true ); } rString = sRangeListStr; } diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 9ce779585220..e540e806b6fa 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -173,9 +173,9 @@ bool ScViewOptions::operator==( const ScViewOptions& rOpt ) const return bEqual; } -SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OPTIONS */ ) const +SvxGridItem* ScViewOptions::CreateGridItem() const { - SvxGridItem* pItem = new SvxGridItem( nId ); + SvxGridItem* pItem = new SvxGridItem( SID_ATTR_GRID_OPTIONS ); pItem->SetFieldDrawX ( aGridOpt.GetFieldDrawX() ); pItem->SetFieldDivisionX ( aGridOpt.GetFieldDivisionX() ); diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index eb5167491fa0..e1a197ab09fc 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -33,7 +33,7 @@ #include <osl/diagnose.h> void ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc, - const ScAddress& rOutPos, const rtl_TextEncoding eNach, sal_uInt32 nDifOption ) + const ScAddress& rOutPos, const rtl_TextEncoding eNach ) { SCCOL nEndCol; SCROW nEndRow; @@ -43,7 +43,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc, aStart.PutInOrder( aEnd ); - ScExportDif( rStream, pDoc, ScRange( aStart, aEnd ), eNach, nDifOption ); + ScExportDif( rStream, pDoc, ScRange( aStart, aEnd ), eNach ); } FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 92aee8f30a93..e2a385b98ab4 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -288,8 +288,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, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) 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 void ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 5078aed30061..02394b190f8e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -433,10 +433,9 @@ ScConditionalFormat* AbstractScCondFormatManagerDlg_Impl::GetCondFormatSelected( return pDlg->GetCondFormatSelected(); } -long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const +long AbstractScMetricInputDlg_Impl::GetInputValue() const { - - return pDlg->GetInputValue( eUnit ); + return pDlg->GetInputValue(); } sal_uInt16 AbstractScMoveTableDlg_Impl::GetSelectedDocument() const @@ -694,10 +693,9 @@ AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg(vcl::Wi return new AbstractScDataFormDlg_Impl(pDlg); } -AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(vcl::Window* pParent, - InsertDeleteFlags nCheckDefaults) +AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(vcl::Window* pParent) { - VclPtr<ScDeleteContentsDlg> pDlg = VclPtr<ScDeleteContentsDlg>::Create(pParent, nCheckDefaults); + VclPtr<ScDeleteContentsDlg> pDlg = VclPtr<ScDeleteContentsDlg>::Create(pParent, InsertDeleteFlags::NONE); return new AbstractScDeleteContentsDlg_Impl( pDlg ); } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 356f519ad01a..0f9e1feadb85 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -190,7 +190,7 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg virtual double GetStep() const override; virtual double GetMax() const override; virtual OUString GetStartStr() const override; - virtual void SetEdStartValEnabled(bool bFlag=false) override; + virtual void SetEdStartValEnabled(bool bFlag) override; }; class AbstractScGroupDlg_Impl : public AbstractScGroupDlg @@ -256,7 +256,7 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg { DECL_ABSTDLG_BASE( AbstractScMetricInputDlg_Impl, ScMetricInputDlg) - virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const override; + virtual long GetInputValue() const override; }; class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg @@ -425,8 +425,7 @@ public: virtual AbstractScDataFormDlg* CreateScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell) override; - virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent, - InsertDeleteFlags nCheckDefaults = InsertDeleteFlags::NONE) override; + virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent) override; virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index aa2e487e2967..460a92f3993b 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2222,7 +2222,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { virtual OUString GetHTMLRangeNameList( ScDocument*, const OUString& ) override { return OUString(); } virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, rtl_TextEncoding ) override { return eERR_INTERN; } - virtual void ScExportDif( SvStream&, ScDocument*, const ScAddress&, const rtl_TextEncoding, sal_uInt32 ) override {} + 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 void ScExportHTML( SvStream&, const OUString&, ScDocument*, const ScRange&, const rtl_TextEncoding, bool, const OUString&, OUString&, const OUString& ) override {} diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 848ec7b69adf..074286cc1f02 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -63,9 +63,9 @@ bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertyS } sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp, - const OUString& rName, long nDefault ) + const OUString& rName ) { - sal_Int32 nRet = nDefault; + sal_Int32 nRet = 0; if ( xProp.is() ) { try diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 4ce41c7b3a3c..88a620b7f104 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -720,7 +720,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( nStartCol != nEndCol && nStartRow != nEndRow ) { - pDlg->SetEdStartValEnabled(); + pDlg->SetEdStartValEnabled(false); } if ( pDlg->Execute() == RET_OK ) |