[Libreoffice-commits] core.git: 6 commits - sc/inc sc/qa sc/source sdext/source sfx2/source slideshow/source starmath/inc starmath/source svtools/source svx/source
Noel Grandin
noel at peralex.com
Wed Mar 23 07:13:48 UTC 2016
sc/inc/dociter.hxx | 3
sc/inc/document.hxx | 23 -
sc/inc/dptabres.hxx | 4
sc/inc/editutil.hxx | 5
sc/inc/externalrefmgr.hxx | 2
sc/inc/filter.hxx | 2
sc/inc/formulacell.hxx | 2
sc/inc/olinetab.hxx | 4
sc/inc/pivot.hxx | 2
sc/inc/postit.hxx | 2
sc/inc/rechead.hxx | 6
sc/inc/scabstdlg.hxx | 7
sc/inc/segmenttree.hxx | 6
sc/qa/unit/ucalc.cxx | 14
sc/qa/unit/ucalc_formula.cxx | 32 -
sc/qa/unit/ucalc_sharedformula.cxx | 8
sc/source/core/data/dociter.cxx | 4
sc/source/core/data/documen2.cxx | 2
sc/source/core/data/documen3.cxx | 18
sc/source/core/data/documen4.cxx | 5
sc/source/core/data/documen9.cxx | 4
sc/source/core/data/document.cxx | 43 --
sc/source/core/data/dpobject.cxx | 2
sc/source/core/data/dptabres.cxx | 14
sc/source/core/data/formulacell.cxx | 4
sc/source/core/data/olinetab.cxx | 8
sc/source/core/data/pivot2.cxx | 4
sc/source/core/data/postit.cxx | 12
sc/source/core/data/segmenttree.cxx | 12
sc/source/core/data/stlsheet.cxx | 2
sc/source/core/data/table2.cxx | 12
sc/source/core/data/table3.cxx | 2
sc/source/core/data/table7.cxx | 2
sc/source/core/data/validat.cxx | 4
sc/source/core/inc/interpre.hxx | 6
sc/source/core/tool/editutil.cxx | 8
sc/source/core/tool/interpr2.cxx | 8
sc/source/core/tool/rechead.cxx | 4
sc/source/filter/excel/read.cxx | 2
sc/source/filter/excel/xechart.cxx | 6
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xename.cxx | 9
sc/source/filter/excel/xepivot.cxx | 6
sc/source/filter/excel/xeroot.cxx | 2
sc/source/filter/excel/xestyle.cxx | 10
sc/source/filter/excel/xichart.cxx | 6
sc/source/filter/excel/xistream.cxx | 4
sc/source/filter/excel/xladdress.cxx | 4
sc/source/filter/excel/xlescher.cxx | 15
sc/source/filter/excel/xlroot.cxx | 2
sc/source/filter/html/htmlimp.cxx | 4
sc/source/filter/inc/formulabase.hxx | 3
sc/source/filter/inc/ftools.hxx | 2
sc/source/filter/inc/xechart.hxx | 2
sc/source/filter/inc/xepivot.hxx | 2
sc/source/filter/inc/xichart.hxx | 2
sc/source/filter/inc/xistream.hxx | 6
sc/source/filter/inc/xladdress.hxx | 4
sc/source/filter/inc/xlescher.hxx | 2
sc/source/filter/oox/formulabase.cxx | 4
sc/source/filter/rtf/eeimpars.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlstyli.cxx | 4
sc/source/filter/xml/xmlstyli.hxx | 3
sc/source/ui/Accessibility/AccessibleText.cxx | 2
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 6
sc/source/ui/app/inputhdl.cxx | 115 ++---
sc/source/ui/attrdlg/scdlgfact.cxx | 13
sc/source/ui/attrdlg/scdlgfact.hxx | 7
sc/source/ui/cctrl/cbuttonw.cxx | 5
sc/source/ui/cctrl/checklistmenu.cxx | 4
sc/source/ui/cctrl/editfield.cxx | 4
sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 2
sc/source/ui/docshell/dbdocfun.cxx | 7
sc/source/ui/docshell/dbdocimp.cxx | 5
sc/source/ui/docshell/docfunc.cxx | 54 +-
sc/source/ui/docshell/docsh2.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 4
sc/source/ui/docshell/docsh5.cxx | 2
sc/source/ui/docshell/docsh6.cxx | 51 --
sc/source/ui/docshell/externalrefmgr.cxx | 8
sc/source/ui/docshell/impex.cxx | 4
sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 2
sc/source/ui/inc/cbutton.hxx | 5
sc/source/ui/inc/checklistmenu.hxx | 2
sc/source/ui/inc/crdlg.hxx | 2
sc/source/ui/inc/dbdocfun.hxx | 5
sc/source/ui/inc/dbfunc.hxx | 2
sc/source/ui/inc/docfunc.hxx | 24 -
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/inc/editfield.hxx | 3
sc/source/ui/inc/gridwin.hxx | 2
sc/source/ui/inc/inputhdl.hxx | 2
sc/source/ui/inc/olinewin.hxx | 4
sc/source/ui/inc/tabview.hxx | 2
sc/source/ui/inc/undobase.hxx | 3
sc/source/ui/inc/undocell.hxx | 2
sc/source/ui/inc/undodat.hxx | 3
sc/source/ui/inc/viewdata.hxx | 5
sc/source/ui/inc/viewfunc.hxx | 15
sc/source/ui/inc/warnbox.hxx | 5
sc/source/ui/miscdlgs/crdlg.cxx | 7
sc/source/ui/miscdlgs/warnbox.cxx | 6
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/undo/undobase.cxx | 4
sc/source/ui/undo/undoblk.cxx | 2
sc/source/ui/undo/undoblk2.cxx | 2
sc/source/ui/undo/undocell.cxx | 8
sc/source/ui/undo/undodat.cxx | 5
sc/source/ui/unoobj/cellsuno.cxx | 26 -
sc/source/ui/unoobj/datauno.cxx | 4
sc/source/ui/unoobj/docuno.cxx | 4
sc/source/ui/unoobj/textuno.cxx | 6
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/vba/vbarange.cxx | 8
sc/source/ui/vba/vbarange.hxx | 2
sc/source/ui/view/cellsh1.cxx | 1
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/dbfunc.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 4
sc/source/ui/view/gridwin.cxx | 215 ++--------
sc/source/ui/view/gridwin2.cxx | 6
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/olinewin.cxx | 8
sc/source/ui/view/printfun.cxx | 2
sc/source/ui/view/tabview.cxx | 26 -
sc/source/ui/view/viewdata.cxx | 34 -
sc/source/ui/view/viewfun2.cxx | 22 -
sc/source/ui/view/viewfun3.cxx | 44 --
sc/source/ui/view/viewfunc.cxx | 23 -
sdext/source/minimizer/optimizerdialog.cxx | 14
sdext/source/minimizer/optimizerdialog.hxx | 2
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 33 -
sdext/source/presenter/PresenterScrollBar.cxx | 10
sdext/source/presenter/PresenterScrollBar.hxx | 3
sfx2/source/bastyp/progress.cxx | 18
slideshow/source/engine/screenupdater.cxx | 9
slideshow/source/engine/slide/layermanager.cxx | 24 -
slideshow/source/engine/slide/layermanager.hxx | 9
slideshow/source/engine/slide/shapemanagerimpl.cxx | 2
starmath/inc/cursor.hxx | 2
starmath/source/cursor.cxx | 17
svtools/source/brwbox/brwbox2.cxx | 6
svtools/source/brwbox/datwin.cxx | 4
svtools/source/brwbox/datwin.hxx | 5
svtools/source/config/colorcfg.cxx | 6
svtools/source/config/extcolorcfg.cxx | 6
svtools/source/config/miscopt.cxx | 9
svtools/source/contnr/iconviewimpl.cxx | 6
svtools/source/contnr/imivctl.hxx | 12
svtools/source/contnr/imivctl1.cxx | 79 +--
svtools/source/contnr/svimpbox.cxx | 6
svtools/source/graphic/grfcache.cxx | 4
svtools/source/graphic/grfcache.hxx | 5
svtools/source/graphic/grfmgr2.cxx | 2
svtools/source/inc/iconviewimpl.hxx | 3
svtools/source/inc/svimpbox.hxx | 2
svtools/source/table/tablecontrol_impl.cxx | 20
svtools/source/table/tablecontrol_impl.hxx | 4
svtools/source/table/tablegeometry.hxx | 7
svtools/source/uno/treecontrolpeer.cxx | 12
svtools/source/uno/treecontrolpeer.hxx | 2
svx/source/table/celltypes.hxx | 6
163 files changed, 682 insertions(+), 945 deletions(-)
New commits:
commit 26012ae8f65ca16e584b3688b0f1f9e76e97db84
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 22 15:56:13 2016 +0200
loplugin:constantparam in sc
Change-Id: I437367b8c6960db730a69c020ba82792a9170d01
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 856d938..20775a5 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -470,8 +470,7 @@ private:
public:
ScHorizontalValueIterator( ScDocument* pDocument,
- const ScRange& rRange,
- bool bTextAsZero = false );
+ const ScRange& rRange );
~ScHorizontalValueIterator();
/// Does NOT reset rValue if no value found!
bool GetNext( double& rValue, sal_uInt16& rErr );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 825e511..6153a2b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -912,8 +912,7 @@ public:
const ScMarkData& rMark,
const OUString& rFormula,
const ScTokenArray* p = nullptr,
- const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT,
- bool bDirtyFlag=true );
+ const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT );
SC_DLLPUBLIC void InsertTableOp(const ScTabOpParam& rParam, // multi-operation
SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark);
@@ -1513,7 +1512,7 @@ public:
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY );
- bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
+ bool IsStyleSheetUsed( const ScStyleSheet& rStyle ) const;
SC_DLLPUBLIC bool ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
@@ -1522,10 +1521,8 @@ public:
SCCOL nEndCol, SCROW nEndRow,
SCTAB nTab, sal_Int16 nFlags );
- SC_DLLPUBLIC void SetPattern( const ScAddress&, const ScPatternAttr& rAttr,
- bool bPutToPool = false );
- SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr,
- bool bPutToPool = false );
+ SC_DLLPUBLIC void SetPattern( const ScAddress&, const ScPatternAttr& rAttr );
+ SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr );
void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
sal_uInt16 nFormatNo, const ScMarkData& rMark );
@@ -1654,11 +1651,7 @@ public:
SCCOL GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const;
- // if bCareManualSize is set then the row
- // heights are compared only if the manual size flag for
- // the row is set. If the bCareManualSize is not set then
- // the row heights are always compared.
- SCROW GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCareManualSize = true) const;
+ SCROW GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart) const;
// returns whether to export a Default style for this col or not
// nDefault is setted to one position in the current row where the Default style is
@@ -1756,7 +1749,7 @@ public:
* database range that contains the specified cell position.
*/
void GetFilterEntries(
- SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates);
+ SCCOL nCol, SCROW nRow, SCTAB nTab, std::vector<ScTypedStrData>& rStrings, bool& rHasDates);
SC_DLLPUBLIC void GetFilterEntriesArea(
SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bCaseSens,
@@ -1958,7 +1951,7 @@ public:
* recalculated.
*/
SC_DLLPUBLIC void CalcFormulaTree(
- bool bOnlyForced = false, bool bProgressBar = true, bool bSetAllDirty = true );
+ bool bOnlyForced = false, bool bProgressBar = true, bool bSetAllDirty = true );
void ClearFormulaTree();
void AppendToFormulaTrack( ScFormulaCell* pCell );
void RemoveFromFormulaTrack( ScFormulaCell* pCell );
@@ -2204,7 +2197,7 @@ private:
void DeleteDrawLayer();
SC_DLLPUBLIC bool DrawGetPrintArea( ScRange& rRange, bool bSetHor, bool bSetVer ) const;
void DrawMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
- void DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, bool bSkipNotes = false );
+ void DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
void UpdateDrawPrinter();
void UpdateDrawLanguages();
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index d2e0b99..900fa3e 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -260,7 +260,7 @@ private:
bool mbAllChildren:1;
public:
LateInitParams( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev,
- bool bRow, bool bInitChild = true, bool bAllChildren = false);
+ bool bRow);
~LateInitParams();
void SetInitChild( bool b ) { mbInitChild = b; }
@@ -350,7 +350,7 @@ private:
sal_uInt16 nMemberStep; // step to show details
public:
ScDPResultMember(
- const ScDPResultData* pData, const ScDPParentDimData& rParentDimData, bool bForceSub ); //! Ref
+ const ScDPResultData* pData, const ScDPParentDimData& rParentDimData ); //! Ref
ScDPResultMember( const ScDPResultData* pData, bool bForceSub );
~ScDPResultMember();
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 340d579..5eee49f 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -224,7 +224,7 @@ private:
ScHeaderFieldData aData;
public:
- ScHeaderEditEngine( SfxItemPool* pEnginePool, bool bDeleteEnginePool = false );
+ ScHeaderEditEngine( SfxItemPool* pEnginePool );
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) override;
void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; }
@@ -237,8 +237,7 @@ class ScNoteEditEngine : public ScEditEngineDefaulter
public:
ScNoteEditEngine( SfxItemPool* pEnginePool,
- SfxItemPool* pTextObjectPool = nullptr,
- bool bDeleteEnginePool = false );
+ SfxItemPool* pTextObjectPool = nullptr );
};
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 14f2a2b..ff00b47 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -266,7 +266,7 @@ public:
* Set a table as referenced, used only during store-to-file.
* @returns <TRUE/> if ALL tables of ALL documents are marked.
*/
- bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets, bool bPermanent );
+ bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets );
void setAllCacheTableReferencedStati( bool bReferenced );
bool areAllCacheTablesReferenced() const { return maReferenced.mbAllReferenced;}
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 4f93743..8ea69de 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -98,7 +98,7 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin {
// various import helpers
virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0;
- virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) = 0;
+ virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) = 0;
virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) = 0;
// various export filters
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 2d4c047..7f93444 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -158,7 +158,7 @@ public:
virtual ~ScFormulaCell();
ScFormulaCell* Clone() const;
- ScFormulaCell* Clone( const ScAddress& rPos, int nCloneFlags ) const;
+ ScFormulaCell* Clone( const ScAddress& rPos ) const;
ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos );
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index 27ec0d3..6b48244 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -111,7 +111,7 @@ public:
SCCOLROW nBlockStart, SCCOLROW nBlockEnd, size_t& rFindLevel) const;
bool Insert( SCCOLROW nStartPos, SCCOLROW nEndPos, bool& rSizeChanged,
- bool bHidden = false, bool bVisible = true );
+ bool bHidden = false );
bool Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, bool& rSizeChanged );
ScOutlineEntry* GetEntry(size_t nLevel, size_t nIndex);
@@ -136,7 +136,7 @@ public:
bool ManualAction(
SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, const ScTable& rTable, bool bCol);
- void finalizeImport(ScTable& rTable, bool bCol);
+ void finalizeImport(ScTable& rTable);
void RemoveAll();
};
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index f0dd99b..c0c21cc 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -120,7 +120,7 @@ struct ScPivotField
css::sheet::DataPilotFieldReference maFieldRef;
- explicit ScPivotField( SCCOL nNewCol = 0, sal_uInt16 nNewFuncMask = PIVOT_FUNC_NONE );
+ explicit ScPivotField( SCCOL nNewCol = 0 );
ScPivotField( const ScPivotField& r );
long getOriginalDim() const;
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 5b111c4..8a7dec8 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -60,7 +60,7 @@ public:
/** Creates an empty note and its caption object and places it according to
the passed cell position. */
- explicit ScPostIt( ScDocument& rDoc, const ScAddress& rPos, bool bShown );
+ explicit ScPostIt( ScDocument& rDoc, const ScAddress& rPos );
/** Copy constructor. Clones the note and its caption to a new document. */
explicit ScPostIt( ScDocument& rDoc, const ScAddress& rPos, const ScPostIt& rNote );
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index b5e5cb7..9d2ac12 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -70,12 +70,12 @@ class ScMultipleWriteHeader
private:
SvStream& rStream;
SvMemoryStream aMemStream;
- sal_uLong nDataPos;
+ sal_uLong nDataPos;
sal_uInt32 nDataSize;
- sal_uLong nEntryStart;
+ sal_uLong nEntryStart;
public:
- ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0);
+ ScMultipleWriteHeader(SvStream& rNewStream);
~ScMultipleWriteHeader();
void StartEntry();
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index c515d5b..8b46a09 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -372,15 +372,13 @@ public:
sal_uInt16 nPossDir) = 0;
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( vcl::Window* pParent,
- bool bUnGroup = false,
- bool bRows = true ) = 0;
+ bool bUnGroup = false ) = 0;
virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent,
int nId,
bool bDisallowCellMove = false ) = 0;
virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent,
- InsertDeleteFlags nCheckDefaults = InsertDeleteFlags::NONE,
const OUString* pStrTitle = nullptr ) = 0;
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData,
@@ -421,8 +419,7 @@ public:
ScDPObject& rDPObj,
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData,
- const ScDPNameVec& rDataFields,
- bool bEnableLayout ) = 0;
+ const ScDPNameVec& rDataFields ) = 0;
virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent,
int nId,
diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 7e8025c..25eecec 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -71,7 +71,7 @@ public:
bool getRangeData(SCROW nRow, RangeData& rData) const;
bool getRangeDataLeaf(SCROW nRow, RangeData& rData);
void removeSegment(SCROW nRow1, SCROW nRow2);
- void insertSegment(SCROW nRow, SCROW nSize, bool bSkipStartBoundary);
+ void insertSegment(SCROW nRow, SCROW nSize);
SCROW findLastTrue() const;
@@ -96,7 +96,7 @@ public:
bool setFalse(SCCOL nCol1, SCCOL nCol2);
bool getRangeData(SCCOL nCol, RangeData& rData);
void removeSegment(SCCOL nCol1, SCCOL nCol2);
- void insertSegment(SCCOL nCol, SCCOL nSize, bool bSkipStartBoundary);
+ void insertSegment(SCCOL nCol, SCCOL nSize);
private:
::std::unique_ptr<ScFlatBoolSegmentsImpl> mpImpl;
@@ -139,7 +139,7 @@ public:
sal_uInt32 getSumValue(SCROW nRow1, SCROW nRow2);
bool getRangeData(SCROW nRow, RangeData& rData);
void removeSegment(SCROW nRow1, SCROW nRow2);
- void insertSegment(SCROW nRow, SCROW nSize, bool bSkipStartBoundary);
+ void insertSegment(SCROW nRow, SCROW nSize);
SCROW findLastTrue(sal_uInt16 nValue) const;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 77a42e6..5dba406 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4184,7 +4184,7 @@ void Test::testCopyPasteRepeatOneFormula()
}
// Delete row at row 1 to shift the cells up.
- rFunc.DeleteCells(aRowOne, &aMark, DEL_DELROWS, true, true);
+ rFunc.DeleteCells(aRowOne, &aMark, DEL_DELROWS, true);
// Check the formula results again.
for (SCROW i = 0; i < 10; ++i)
@@ -4637,7 +4637,7 @@ void Test::testAutoFill()
m_pDoc->SetValue(ScAddress(0,0,0), 1.0);
ScRange aRange(0,0,0,0,5,0);
aMarkData.SetMarkArea(aRange);
- rFunc.FillSeries(aRange, &aMarkData, FILL_TO_BOTTOM, FILL_AUTO, FILL_DAY, MAXDOUBLE, 1.0, MAXDOUBLE, true, true);
+ rFunc.FillSeries(aRange, &aMarkData, FILL_TO_BOTTOM, FILL_AUTO, FILL_DAY, MAXDOUBLE, 1.0, MAXDOUBLE, true);
CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(0,0,0)));
CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(0,1,0)));
CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(ScAddress(0,2,0)));
@@ -5092,7 +5092,7 @@ void Test::testNoteDeleteRow()
ScDocFunc& rDocFunc = getDocShell().GetDocFunc();
ScMarkData aMark;
aMark.SelectOneTable(0);
- rDocFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true, true);
+ rDocFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true);
// Check to make sure the notes have shifted upward.
pNote = m_pDoc->GetNote(ScAddress(1,1,0));
@@ -5121,7 +5121,7 @@ void Test::testNoteDeleteRow()
CPPUNIT_ASSERT_EQUAL(OUString("Second Note"), pNote->GetText());
// Delete row 3.
- rDocFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true, true);
+ rDocFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true);
pNote = m_pDoc->GetNote(ScAddress(1,2,0));
CPPUNIT_ASSERT_MESSAGE("B3 should have a note.", pNote);
@@ -5767,7 +5767,7 @@ void Test::testTransliterateText()
aMark.SetMarkArea(ScRange(0,0,0,0,2,0));
ScDocFunc& rFunc = getDocShell().GetDocFunc();
rFunc.TransliterateText(
- aMark, i18n::TransliterationModules_LOWERCASE_UPPERCASE, true, true);
+ aMark, i18n::TransliterationModules_LOWERCASE_UPPERCASE, true);
CPPUNIT_ASSERT_EQUAL(OUString("MIKE"), m_pDoc->GetString(ScAddress(0,0,0)));
CPPUNIT_ASSERT_EQUAL(OUString("NOAH"), m_pDoc->GetString(ScAddress(0,1,0)));
@@ -5828,7 +5828,7 @@ void Test::testFormulaToValue()
// Convert B5:C6 to static values, and check the result.
ScDocFunc& rFunc = getDocShell().GetDocFunc();
ScRange aConvRange(1,4,0,2,5,0); // B5:C6
- rFunc.ConvertFormulaToValue(aConvRange, true, false);
+ rFunc.ConvertFormulaToValue(aConvRange, false);
{
// Expected output table content. 0 = empty cell
@@ -5987,7 +5987,7 @@ void Test::testFormulaToValue2()
// Convert B3:B5 to a value.
ScDocFunc& rFunc = getDocShell().GetDocFunc();
ScRange aConvRange(1,2,0,1,4,0); // B3:B5
- rFunc.ConvertFormulaToValue(aConvRange, true, false);
+ rFunc.ConvertFormulaToValue(aConvRange, false);
{
// Expected output table content. 0 = empty cell
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index e8ff482..2282fda 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2474,7 +2474,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftLeft()
ScMarkData aMark;
aMark.SelectOneTable(0);
ScDocFunc& rFunc = getDocShell().GetDocFunc();
- bool bDeleted = rFunc.DeleteCells(ScRange(3,0,0,4,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ bool bDeleted = rFunc.DeleteCells(ScRange(3,0,0,4,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
CPPUNIT_ASSERT(bDeleted);
aPos.IncCol(-2);
@@ -2493,7 +2493,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftLeft()
CPPUNIT_FAIL("Wrong formula!");
// Delete columns C:D (left end of the reference).
- bDeleted = rFunc.DeleteCells(ScRange(2,0,0,3,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(2,0,0,3,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
CPPUNIT_ASSERT(bDeleted);
aPos.IncCol(-2);
@@ -2509,7 +2509,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftLeft()
CPPUNIT_FAIL("Wrong formula!");
// Delete columns B:E (overlaps on the left).
- bDeleted = rFunc.DeleteCells(ScRange(1,0,0,4,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(1,0,0,4,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
CPPUNIT_ASSERT(bDeleted);
aPos.IncCol(-4);
@@ -2537,7 +2537,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftLeft()
CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
// Delete columns F:H (right end of the reference).
- bDeleted = rFunc.DeleteCells(ScRange(5,0,0,7,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(5,0,0,7,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
CPPUNIT_ASSERT(bDeleted);
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(aPos));
@@ -2551,7 +2551,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftLeft()
CPPUNIT_FAIL("Wrong formula!");
// Delete columns G:I (overlaps on the right).
- bDeleted = rFunc.DeleteCells(ScRange(6,0,0,8,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(6,0,0,8,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
CPPUNIT_ASSERT(bDeleted);
CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc->GetValue(aPos));
@@ -2587,7 +2587,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftUp()
ScMarkData aMark;
aMark.SelectOneTable(0);
ScDocFunc& rFunc = getDocShell().GetDocFunc();
- bool bDeleted = rFunc.DeleteCells(ScRange(0,3,0,MAXCOL,4,0), &aMark, DEL_CELLSUP, true, true);
+ bool bDeleted = rFunc.DeleteCells(ScRange(0,3,0,MAXCOL,4,0), &aMark, DEL_CELLSUP, true);
CPPUNIT_ASSERT(bDeleted);
aPos.IncRow(-2);
@@ -2606,7 +2606,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftUp()
CPPUNIT_FAIL("Wrong formula!");
// Delete rows 3:4 (top end of the reference).
- bDeleted = rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,3,0), &aMark, DEL_CELLSUP, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,3,0), &aMark, DEL_CELLSUP, true);
CPPUNIT_ASSERT(bDeleted);
aPos.IncRow(-2);
@@ -2622,7 +2622,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftUp()
CPPUNIT_FAIL("Wrong formula!");
// Delete rows 2:5 (overlaps on the top).
- bDeleted = rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,4,0), &aMark, DEL_CELLSUP, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,4,0), &aMark, DEL_CELLSUP, true);
CPPUNIT_ASSERT(bDeleted);
aPos.IncRow(-4);
@@ -2650,7 +2650,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftUp()
CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
// Delete rows 6:8 (bottom end of the reference).
- bDeleted = rFunc.DeleteCells(ScRange(0,5,0,MAXCOL,7,0), &aMark, DEL_CELLSUP, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(0,5,0,MAXCOL,7,0), &aMark, DEL_CELLSUP, true);
CPPUNIT_ASSERT(bDeleted);
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(aPos));
@@ -2664,7 +2664,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftUp()
CPPUNIT_FAIL("Wrong formula!");
// Delete rows 7:9 (overlaps on the bottom).
- bDeleted = rFunc.DeleteCells(ScRange(0,6,0,MAXCOL,8,0), &aMark, DEL_CELLSUP, true, true);
+ bDeleted = rFunc.DeleteCells(ScRange(0,6,0,MAXCOL,8,0), &aMark, DEL_CELLSUP, true);
CPPUNIT_ASSERT(bDeleted);
CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc->GetValue(aPos));
@@ -3043,14 +3043,14 @@ void Test::testFormulaRefUpdateNameDeleteRow()
// Delete row 3.
ScMarkData aMark;
aMark.SelectOneTable(0);
- rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true, true);
+ rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true);
// The reference in the name should get updated to B2:B3.
aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$3"), aExpr);
// Delete row 3 again.
- rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true, true);
+ rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true);
aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$2"), aExpr);
@@ -3078,7 +3078,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$4"), aExpr);
// Delete row 2-3.
- rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true, true);
+ rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,2,0), &aMark, DEL_CELLSUP, true);
aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$2"), aExpr);
@@ -3097,7 +3097,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
ScMarkData aMark2;
aMark2.SelectOneTable(1);
- rFunc.DeleteCells(ScRange(0,2,1,MAXCOL,2,1), &aMark2, DEL_CELLSUP, true, true);
+ rFunc.DeleteCells(ScRange(0,2,1,MAXCOL,2,1), &aMark2, DEL_CELLSUP, true);
pName = m_pDoc->GetRangeName()->findByUpperName("MYRANGE");
CPPUNIT_ASSERT(pName);
@@ -5118,7 +5118,7 @@ void Test::testFormulaDepTrackingDeleteRow()
ScDocFunc& rFunc = getDocShell().GetDocFunc();
ScMarkData aMark;
aMark.SelectOneTable(0);
- rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true, true);
+ rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true);
pBC = m_pDoc->GetBroadcaster(ScAddress(0,3,0));
CPPUNIT_ASSERT_MESSAGE("Broadcaster at A5 should have shifted to A4.", pBC);
@@ -5176,7 +5176,7 @@ void Test::testFormulaDepTrackingDeleteCol()
ScDocFunc& rFunc = getDocShell().GetDocFunc();
ScMarkData aMark;
aMark.SelectOneTable(0);
- rFunc.DeleteCells(ScRange(0,0,0,0,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ rFunc.DeleteCells(ScRange(0,0,0,0,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
{
// Expected output table content. 0 = empty cell
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index d543deb..8ae2cf9 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -681,7 +681,7 @@ void Test::testSharedFormulasRefUpdateRangeDeleteRow()
ScDocFunc& rFunc = getDocShell().GetDocFunc();
ScMarkData aMark;
aMark.SelectOneTable(0);
- rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_DELROWS, true, true);
+ rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DEL_DELROWS, true);
// Make sure C1:C4 belong to the same group.
pFC = m_pDoc->GetFormulaCell(ScAddress(2,0,0));
@@ -787,7 +787,7 @@ void Test::testSharedFormulasRefUpdateExternal()
ScDocFunc& rDocFunc = getDocShell().GetDocFunc();
ScMarkData aMark;
aMark.SelectOneTable(0);
- rDocFunc.DeleteCells(ScRange(0,0,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true, true);
+ rDocFunc.DeleteCells(ScRange(0,0,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true);
// Check the shifted formula cells now in A5:A8.
if (!checkFormula(*m_pDoc, ScAddress(0,4,0), "'file:///extdata.fake'#$Data.A1"))
@@ -1049,7 +1049,7 @@ void Test::testSharedFormulasDeleteColumns()
CPPUNIT_ASSERT_EQUAL(11.0, m_pDoc->GetValue(ScAddress(2,0,0)));
// Delete column B.
- rFunc.DeleteCells(ScRange(1,0,0,1,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ rFunc.DeleteCells(ScRange(1,0,0,1,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
CPPUNIT_ASSERT_EQUAL(OUString("#REF!"), m_pDoc->GetString(ScAddress(1,0,0)));
// The reference should still point to row 1 but the column status should be set to 'deleted'.
@@ -1092,7 +1092,7 @@ void Test::testSharedFormulasDeleteColumns()
}
// Delete column B.
- rFunc.DeleteCells(ScRange(1,0,0,1,MAXROW,0), &aMark, DEL_CELLSLEFT, true, true);
+ rFunc.DeleteCells(ScRange(1,0,0,1,MAXROW,0), &aMark, DEL_CELLSLEFT, true);
for (SCROW i = 0; i <= 1; ++i)
{
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f9387c7..828baec 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -2169,14 +2169,14 @@ void ScHorizontalCellIterator::SkipInvalid()
}
ScHorizontalValueIterator::ScHorizontalValueIterator( ScDocument* pDocument,
- const ScRange& rRange, bool bTextZero ) :
+ const ScRange& rRange ) :
pDoc( pDocument ),
nNumFmtIndex(0),
nEndTab( rRange.aEnd.Tab() ),
nNumFmtType( css::util::NumberFormat::UNDEFINED ),
bNumValid( false ),
bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() ),
- bTextAsZero( bTextZero )
+ bTextAsZero( false )
{
SCCOL nStartCol = rRange.aStart.Col();
SCROW nStartRow = rRange.aStart.Row();
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index fd8c5cd..971ae28 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -898,7 +898,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
SetAllFormulasDirty(aFormulaDirtyCxt);
if (pDrawLayer) // Skip cloning Note caption object
- DrawCopyPage( static_cast<sal_uInt16>(nOldPos), static_cast<sal_uInt16>(nNewPos), true );
+ DrawCopyPage( static_cast<sal_uInt16>(nOldPos), static_cast<sal_uInt16>(nNewPos) );
if (pDPCollection)
pDPCollection->CopyToTab(nOldPos, nNewPos);
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 4374d7b..79b4733 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1488,7 +1488,7 @@ void ScDocument::GetFilterSelCount( SCCOL nCol, SCROW nRow, SCTAB nTab, SCSIZE&
* Entries for AutoFilter listbox
*/
void ScDocument::GetFilterEntries(
- SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates)
+ SCCOL nCol, SCROW nRow, SCTAB nTab, std::vector<ScTypedStrData>& rStrings, bool& rHasDates)
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] && pDBCollection )
{
@@ -1510,17 +1510,15 @@ void ScDocument::GetFilterEntries(
pDBData->GetQueryParam( aParam );
// Return all filter entries, if a filter condition is connected with a boolean OR
- if ( bFilter )
+ bool bFilter = true;
+ SCSIZE nEntryCount = aParam.GetEntryCount();
+ for ( SCSIZE i = 0; i < nEntryCount && aParam.GetEntry(i).bDoQuery; ++i )
{
- SCSIZE nEntryCount = aParam.GetEntryCount();
- for ( SCSIZE i = 0; i < nEntryCount && aParam.GetEntry(i).bDoQuery; ++i )
+ ScQueryEntry& rEntry = aParam.GetEntry(i);
+ if ( rEntry.eConnect != SC_AND )
{
- ScQueryEntry& rEntry = aParam.GetEntry(i);
- if ( rEntry.eConnect != SC_AND )
- {
- bFilter = false;
- break;
- }
+ bFilter = false;
+ break;
}
}
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index adf38d3..e17fada 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -259,8 +259,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
const ScMarkData& rMark,
const OUString& rFormula,
const ScTokenArray* pArr,
- const formula::FormulaGrammar::Grammar eGram,
- bool bDirtyFlag )
+ const formula::FormulaGrammar::Grammar eGram )
{
PutInOrder(nCol1, nCol2);
PutInOrder(nRow1, nRow2);
@@ -280,7 +279,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
pCell = new ScFormulaCell(this, aPos, *pArr, eGram, MM_FORMULA);
else
pCell = new ScFormulaCell( this, aPos, rFormula, eGram, MM_FORMULA );
- pCell->SetMatColsRows( nCol2 - nCol1 + 1, nRow2 - nRow1 + 1, bDirtyFlag );
+ pCell->SetMatColsRows( nCol2 - nCol1 + 1, nRow2 - nRow1 + 1 );
ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
SCTAB nMax = static_cast<SCTAB>(maTabs.size());
for (; itr != itrEnd && *itr < nMax; ++itr)
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 3185a2d..5d64307 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -261,10 +261,10 @@ void ScDocument::DrawMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
pDrawLayer->ScMovePage(nOldPos,nNewPos);
}
-void ScDocument::DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, bool bSkipNotes )
+void ScDocument::DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
{
// page is already created in ScTable ctor
- pDrawLayer->ScCopyPage( nOldPos, nNewPos, bSkipNotes );
+ pDrawLayer->ScCopyPage( nOldPos, nNewPos, true/*bSkipNotes*/ );
}
void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 53544c5..af7ae4f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -4487,7 +4487,7 @@ SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const
return 0;
}
-SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCareManualSize) const
+SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart) const
{
if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab])
return 0;
@@ -4522,8 +4522,7 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCa
if (((nStartFlags & CR_MANUALBREAK) != (nFlags & CR_MANUALBREAK)) ||
((nStartFlags & CR_MANUALSIZE) != (nFlags & CR_MANUALSIZE)) ||
(bStartHidden != bHidden) ||
- (bCareManualSize && (nStartFlags & CR_MANUALSIZE) && (nStartHeight != nHeight)) ||
- (!bCareManualSize && ((nStartHeight != nHeight))))
+ (nStartHeight != nHeight))
return nRow;
}
@@ -4830,21 +4829,18 @@ void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool b
}
}
-bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const
+bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle ) const
{
if ( bStyleSheetUsageInvalid || rStyle.GetUsage() == ScStyleSheet::UNKNOWN )
{
- if ( bGatherAllStyles )
- {
- SfxStyleSheetIterator aIter( xPoolHelper->GetStylePool(),
+ SfxStyleSheetIterator aIter( xPoolHelper->GetStylePool(),
SFX_STYLE_FAMILY_PARA );
- for ( const SfxStyleSheetBase* pStyle = aIter.First(); pStyle;
- pStyle = aIter.Next() )
- {
- const ScStyleSheet* pScStyle = dynamic_cast<const ScStyleSheet*>( pStyle );
- if ( pScStyle )
- pScStyle->SetUsage( ScStyleSheet::NOTUSED );
- }
+ for ( const SfxStyleSheetBase* pStyle = aIter.First(); pStyle;
+ pStyle = aIter.Next() )
+ {
+ const ScStyleSheet* pScStyle = dynamic_cast<const ScStyleSheet*>( pStyle );
+ if ( pScStyle )
+ pScStyle->SetUsage( ScStyleSheet::NOTUSED );
}
bool bIsUsed = false;
@@ -4853,16 +4849,13 @@ bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllSt
for (; it != maTabs.end(); ++it)
if (*it)
{
- if ( (*it)->IsStyleSheetUsed( rStyle, bGatherAllStyles ) )
+ if ( (*it)->IsStyleSheetUsed( rStyle, true/*bGatherAllStyles*/ ) )
{
- if ( !bGatherAllStyles )
- return true;
bIsUsed = true;
}
}
- if ( bGatherAllStyles )
- bStyleSheetUsageInvalid = false;
+ bStyleSheetUsageInvalid = false;
return bIsUsed;
}
@@ -4892,20 +4885,18 @@ bool ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow,
return false;
}
-void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr,
- bool bPutToPool )
+void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr )
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()))
if (maTabs[nTab])
- maTabs[nTab]->SetPattern( nCol, nRow, rAttr, bPutToPool );
+ maTabs[nTab]->SetPattern( nCol, nRow, rAttr, true/*bPutToPool*/ );
}
-void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr,
- bool bPutToPool )
+void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr )
{
SCTAB nTab = rPos.Tab();
if ( nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
- maTabs[nTab]->SetPattern( rPos, rAttr, bPutToPool );
+ maTabs[nTab]->SetPattern( rPos, rAttr, true/*bPutToPool*/ );
}
ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, bool bDeep )
@@ -6386,7 +6377,7 @@ ScPostIt* ScDocument::GetOrCreateNote(const ScAddress& rPos)
}
ScPostIt* ScDocument::CreateNote(const ScAddress& rPos)
{
- ScPostIt* pPostIt = new ScPostIt(*this, rPos, false);
+ ScPostIt* pPostIt = new ScPostIt(*this, rPos);
SetNote(rPos, pPostIt);
return pPostIt;
}
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 5cda7a0..fdc7ecb 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2189,7 +2189,7 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
}
if (bAddData && !bDataFound)
- aFields.push_back(ScPivotField(PIVOT_DATA_FIELD, 0));
+ aFields.push_back(ScPivotField(PIVOT_DATA_FIELD));
rFields.swap(aFields);
}
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index d1eeccc..136a5b6 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -915,13 +915,13 @@ ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDi
}
ScDPResultMember::ScDPResultMember(
- const ScDPResultData* pData, const ScDPParentDimData& rParentDimData, bool bForceSub ) :
+ const ScDPResultData* pData, const ScDPParentDimData& rParentDimData ) :
pResultData( pData ),
aParentDimData( rParentDimData ),
pChildDimension( nullptr ),
pDataRoot( nullptr ),
bHasElements( false ),
- bForceSubTotal( bForceSub ),
+ bForceSubTotal( false ),
bHasHiddenDetails( false ),
bInitialized( false ),
bAutoHidden( false ),
@@ -3953,7 +3953,7 @@ SCROW ScDPResultMember::GetDataId( ) const
ScDPResultMember* ScDPResultDimension::AddMember(const ScDPParentDimData &aData )
{
- ScDPResultMember* pMember = new ScDPResultMember( pResultData, aData, false );
+ ScDPResultMember* pMember = new ScDPResultMember( pResultData, aData );
SCROW nDataIndex = pMember->GetDataId();
maMemberArray.push_back( pMember );
@@ -3967,7 +3967,7 @@ ScDPResultMember* ScDPResultDimension::InsertMember(ScDPParentDimData *pMemberDa
SCROW nInsert = 0;
if ( !lcl_SearchMember( maMemberArray, pMemberData->mnOrder , nInsert ) )
{
- ScDPResultMember* pNew = new ScDPResultMember( pResultData, *pMemberData, false );
+ ScDPResultMember* pNew = new ScDPResultMember( pResultData, *pMemberData );
maMemberArray.insert( maMemberArray.begin()+nInsert, pNew );
SCROW nDataIndex = pMemberData->mpMemberDesc->GetItemDataId();
@@ -4051,12 +4051,12 @@ ResultMembers::~ResultMembers()
}
LateInitParams::LateInitParams(
- const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, bool bRow, bool bInitChild, bool bAllChildren ) :
+ const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, bool bRow ) :
mppDim( ppDim ),
mppLev( ppLev ),
mbRow( bRow ),
- mbInitChild( bInitChild ),
- mbAllChildren( bAllChildren )
+ mbInitChild( true ),
+ mbAllChildren( false )
{
}
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 4f602d6..00badf0 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1025,9 +1025,9 @@ ScFormulaCell* ScFormulaCell::Clone() const
return new ScFormulaCell(*this, *pDocument, aPos);
}
-ScFormulaCell* ScFormulaCell::Clone( const ScAddress& rPos, int nCloneFlags ) const
+ScFormulaCell* ScFormulaCell::Clone( const ScAddress& rPos ) const
{
- return new ScFormulaCell(*this, *pDocument, rPos, nCloneFlags);
+ return new ScFormulaCell(*this, *pDocument, rPos, SC_CLONECELL_DEFAULT);
}
size_t ScFormulaCell::GetHash() const
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 1d94b79..5cd71f8 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -184,7 +184,7 @@ void ScOutlineArray::FindEntry(
}
bool ScOutlineArray::Insert(
- SCCOLROW nStartCol, SCCOLROW nEndCol, bool& rSizeChanged, bool bHidden, bool bVisible )
+ SCCOLROW nStartCol, SCCOLROW nEndCol, bool& rSizeChanged, bool bHidden )
{
rSizeChanged = false;
@@ -283,7 +283,7 @@ bool ScOutlineArray::Insert(
}
ScOutlineEntry aNewEntry(nStartCol, nEndCol+1-nStartCol, bHidden);
- aNewEntry.SetVisible( bVisible );
+ aNewEntry.SetVisible( true );
aCollections[nLevel].insert(aNewEntry);
return true;
@@ -769,7 +769,7 @@ void ScOutlineArray::RemoveAll()
nDepth = 0;
}
-void ScOutlineArray::finalizeImport(ScTable& rTable, bool bCol)
+void ScOutlineArray::finalizeImport(ScTable& rTable)
{
ScSubOutlineIterator aIter( this );
ScOutlineEntry* pEntry;
@@ -781,7 +781,7 @@ void ScOutlineArray::finalizeImport(ScTable& rTable, bool bCol)
SCCOLROW nEntryStart = pEntry->GetStart();
SCCOLROW nEntryEnd = pEntry->GetEnd();
- SCCOLROW nEnd = rTable.LastHiddenColRow(nEntryStart, bCol);
+ SCCOLROW nEnd = rTable.LastHiddenColRow(nEntryStart, false/*bCol*/);
bool bAllHidden = (nEntryEnd <= nEnd && nEnd <
::std::numeric_limits<SCCOLROW>::max());
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 6720473..6c06c69 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -95,10 +95,10 @@ OUString ScDPLabelData::getDisplayName() const
// ScPivotField
-ScPivotField::ScPivotField(SCCOL nNewCol, sal_uInt16 nNewFuncMask) :
+ScPivotField::ScPivotField(SCCOL nNewCol) :
nCol(nNewCol),
mnOriginalDim(-1),
- nFuncMask(nNewFuncMask),
+ nFuncMask(0),
mnDupCount(0)
{}
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index efcf23e..8eb8331 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -159,7 +159,7 @@ class ScCaptionCreator
{
public:
/** Create a new caption. The caption will not be inserted into the document. */
- explicit ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bShown, bool bTailFront );
+ explicit ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bTailFront );
/** Manipulate an existing caption. */
explicit ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, SdrCaptionObj& rCaption );
@@ -199,13 +199,13 @@ private:
bool mbNegPage;
};
-ScCaptionCreator::ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bShown, bool bTailFront ) :
+ScCaptionCreator::ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bTailFront ) :
mrDoc( rDoc ),
maPos( rPos ),
mpCaption( nullptr )
{
Initialize();
- CreateCaption( bShown, bTailFront );
+ CreateCaption( true/*bShown*/, bTailFront );
}
ScCaptionCreator::ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, SdrCaptionObj& rCaption ) :
@@ -475,9 +475,9 @@ ScNoteData::~ScNoteData()
{
}
-ScPostIt::ScPostIt( ScDocument& rDoc, const ScAddress& rPos, bool bShown ) :
+ScPostIt::ScPostIt( ScDocument& rDoc, const ScAddress& rPos ) :
mrDoc( rDoc ),
- maNoteData( bShown )
+ maNoteData( false )
{
AutoStamp();
CreateCaption( rPos );
@@ -775,7 +775,7 @@ SdrCaptionObj* ScNoteUtil::CreateTempCaption(
rVisRect.Bottom() - SC_NOTECAPTION_BORDERDIST_TEMP );
// create the caption object
- ScCaptionCreator aCreator( rDoc, rPos, true, bTailFront );
+ ScCaptionCreator aCreator( rDoc, rPos, bTailFront );
SdrCaptionObj* pCaption = aCreator.GetCaption();
// insert caption into page (needed to set caption text)
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 563689a..d9e60bc 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -373,9 +373,9 @@ void ScFlatBoolRowSegments::removeSegment(SCROW nRow1, SCROW nRow2)
mpImpl->removeSegment(static_cast<SCCOLROW>(nRow1), static_cast<SCCOLROW>(nRow2));
}
-void ScFlatBoolRowSegments::insertSegment(SCROW nRow, SCROW nSize, bool bSkipStartBoundary)
+void ScFlatBoolRowSegments::insertSegment(SCROW nRow, SCROW nSize)
{
- mpImpl->insertSegment(static_cast<SCCOLROW>(nRow), static_cast<SCCOLROW>(nSize), bSkipStartBoundary);
+ mpImpl->insertSegment(static_cast<SCCOLROW>(nRow), static_cast<SCCOLROW>(nSize), true/*bSkipStartBoundary*/);
}
SCROW ScFlatBoolRowSegments::findLastTrue() const
@@ -424,9 +424,9 @@ void ScFlatBoolColSegments::removeSegment(SCCOL nCol1, SCCOL nCol2)
mpImpl->removeSegment(static_cast<SCCOLROW>(nCol1), static_cast<SCCOLROW>(nCol2));
}
-void ScFlatBoolColSegments::insertSegment(SCCOL nCol, SCCOL nSize, bool bSkipStartBoundary)
+void ScFlatBoolColSegments::insertSegment(SCCOL nCol, SCCOL nSize)
{
- mpImpl->insertSegment(static_cast<SCCOLROW>(nCol), static_cast<SCCOLROW>(nSize), bSkipStartBoundary);
+ mpImpl->insertSegment(static_cast<SCCOLROW>(nCol), static_cast<SCCOLROW>(nSize), true/*bSkipStartBoundary*/);
}
ScFlatUInt16RowSegments::ForwardIterator::ForwardIterator(ScFlatUInt16RowSegments& rSegs) :
@@ -501,9 +501,9 @@ void ScFlatUInt16RowSegments::removeSegment(SCROW nRow1, SCROW nRow2)
mpImpl->removeSegment(static_cast<SCCOLROW>(nRow1), static_cast<SCCOLROW>(nRow2));
}
-void ScFlatUInt16RowSegments::insertSegment(SCROW nRow, SCROW nSize, bool bSkipStartBoundary)
+void ScFlatUInt16RowSegments::insertSegment(SCROW nRow, SCROW nSize)
{
- mpImpl->insertSegment(static_cast<SCCOLROW>(nRow), static_cast<SCCOLROW>(nSize), bSkipStartBoundary);
+ mpImpl->insertSegment(static_cast<SCCOLROW>(nRow), static_cast<SCCOLROW>(nSize), false/*bSkipStartBoundary*/);
}
SCROW ScFlatUInt16RowSegments::findLastTrue(sal_uInt16 nValue) const
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index d60979c..0c3a7e1 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -255,7 +255,7 @@ bool ScStyleSheet::IsUsed() const
// Always query the document to let it decide if a rescan is necessary,
// and store the state.
ScDocument* pDoc = static_cast<ScStyleSheetPool*>(pPool)->GetDocument();
- if ( pDoc && pDoc->IsStyleSheetUsed( *this, true ) )
+ if ( pDoc && pDoc->IsStyleSheetUsed( *this ) )
eUsage = USED;
else
eUsage = NOTUSED;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index e5e7aef..4a6536a 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -157,7 +157,7 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
{
if (mpRowHeights && pRowFlags)
{
- mpRowHeights->insertSegment(nStartRow, nSize, false);
+ mpRowHeights->insertSegment(nStartRow, nSize);
sal_uInt8 nNewFlags = pRowFlags->Insert( nStartRow, nSize);
// only copy manual size flag, clear all others
if (nNewFlags && (nNewFlags != CR_MANUALSIZE))
@@ -168,8 +168,8 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
if (pOutlineTable)
pOutlineTable->InsertRow( nStartRow, nSize );
- mpFilteredRows->insertSegment(nStartRow, nSize, true);
- mpHiddenRows->insertSegment(nStartRow, nSize, true);
+ mpFilteredRows->insertSegment(nStartRow, nSize);
+ mpHiddenRows->insertSegment(nStartRow, nSize);
if (!maRowManualBreaks.empty())
{
@@ -290,8 +290,8 @@ void ScTable::InsertCol(
if (pOutlineTable)
pOutlineTable->InsertCol( nStartCol, nSize );
- mpHiddenCols->insertSegment(nStartCol, static_cast<SCCOL>(nSize), true);
- mpFilteredCols->insertSegment(nStartCol, static_cast<SCCOL>(nSize), true);
+ mpHiddenCols->insertSegment(nStartCol, static_cast<SCCOL>(nSize));
+ mpFilteredCols->insertSegment(nStartCol, static_cast<SCCOL>(nSize));
if (!maColManualBreaks.empty())
{
@@ -3549,7 +3549,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n
else
{
aCell.release(*pDocument, aDest);
- pDocument->SetPattern( aDest, *GetPattern( nCol, nRow ), true );
+ pDocument->SetPattern( aDest, *GetPattern( nCol, nRow ) );
}
++nDestX;
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 6cdeace..9c6171a 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -749,7 +749,7 @@ void fillSortedColumnArray(
assert(rCell.mpAttr);
ScAddress aOldPos = rCell.maCell.mpFormula->aPos;
- ScFormulaCell* pNew = rCell.maCell.mpFormula->Clone( aCellPos, SC_CLONECELL_DEFAULT);
+ ScFormulaCell* pNew = rCell.maCell.mpFormula->Clone( aCellPos );
if (pArray->IsUpdateRefs())
{
pNew->CopyAllBroadcasters(*rCell.maCell.mpFormula);
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index c6f6f9f..067cbdc 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -243,7 +243,7 @@ void ScTable::finalizeOutlineImport()
{
if (pOutlineTable && pRowFlags)
{
- pOutlineTable->GetRowArray().finalizeImport(*this, false);
+ pOutlineTable->GetRowArray().finalizeImport(*this);
}
}
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 278ae4e..953af5c 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -555,8 +555,8 @@ namespace {
class ScStringTokenIterator
{
public:
- inline explicit ScStringTokenIterator( ScTokenArray& rTokArr, bool bSkipEmpty = true ) :
- mrTokArr( rTokArr ), mbSkipEmpty( bSkipEmpty ), mbOk( true ) {}
+ inline explicit ScStringTokenIterator( ScTokenArray& rTokArr ) :
+ mrTokArr( rTokArr ), mbSkipEmpty( true ), mbOk( true ) {}
/** Returns the string of the first string token or NULL on error or empty token array. */
rtl_uString* First();
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index b7d9a71..fb998b8 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -628,11 +628,9 @@ void ScDebugVar();
If true, the date passed must be a valid Gregorian calendar date. No
two-digit expanding or rollover is done.
- @param bCheckGregorian
- If true, date must be Gregorian, i.e. >= 1582-10-15.
- If false, don't care, any valid date >= 0-1-1 will do.
+ Date must be Gregorian, i.e. >= 1582-10-15.
*/
-double GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool bStrict, bool bCheckGregorian );
+double GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool bStrict );
void ScGetActDate();
void ScGetActTime();
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 82dd082..d5a50ad 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -791,8 +791,8 @@ ScHeaderFieldData::ScHeaderFieldData()
eNumType = SVX_ARABIC;
}
-ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, bool bDeleteEnginePoolP )
- : ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP )
+ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP )
+ : ScEditEngineDefaulter( pEnginePoolP,true/*bDeleteEnginePoolP*/ )
{
}
@@ -883,8 +883,8 @@ void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_Int32, sal
}
ScNoteEditEngine::ScNoteEditEngine( SfxItemPool* pEnginePoolP,
- SfxItemPool* pTextObjectPool, bool bDeleteEnginePoolP ) :
- ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP )
+ SfxItemPool* pTextObjectPool ) :
+ ScEditEngineDefaulter( pEnginePoolP, false/*bDeleteEnginePoolP*/ )
{
if ( pTextObjectPool )
SetEditTextObjectPool( pTextObjectPool );
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 8781b0b..f25c14f3 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -60,7 +60,7 @@ using namespace formula;
// Date and Time
double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
- bool bStrict, bool bCheckGregorian )
+ bool bStrict )
{
if ( nYear < 100 && !bStrict )
nYear = pFormatter->ExpandTwoDigitYear( nYear );
@@ -90,7 +90,7 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int1
Date aDate( nD, nM, nY);
if (!bStrict)
aDate += nDay - 1;
- if ((!bCheckGregorian && aDate.IsValidDate()) || (bCheckGregorian && aDate.IsValidAndGregorian()))
+ if (aDate.IsValidAndGregorian())
return (double) (aDate - *(pFormatter->GetNullDate()));
else
{
@@ -303,7 +303,7 @@ void ScInterpreter::ScEasterSunday()
O = H + L - 7 * M + 114;
nDay = sal::static_int_cast<sal_Int16>( O % 31 + 1 );
nMonth = sal::static_int_cast<sal_Int16>( int(O / 31) );
- PushDouble( GetDateSerial( nYear, nMonth, nDay, true, true ) );
+ PushDouble( GetDateSerial( nYear, nMonth, nDay, true ) );
}
}
@@ -553,7 +553,7 @@ void ScInterpreter::ScGetDate()
PushIllegalArgument();
else
{
- PushDouble(GetDateSerial(nYear, nMonth, nDay, false, true));
+ PushDouble(GetDateSerial(nYear, nMonth, nDay, false));
}
}
}
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index 4736e5d..dbf3bff 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -105,11 +105,11 @@ sal_uLong ScMultipleReadHeader::BytesLeft() const
return 0;
}
-ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault) :
+ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream) :
rStream( rNewStream ),
aMemStream( 4096, 4096 )
{
- nDataSize = nDefault;
+ nDataSize = 0;
rStream.WriteUInt32( nDataSize );
nDataPos = rStream.Tell();
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 93ed6df..96b8ebf 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -875,7 +875,7 @@ FltError ImportExcel8::Read()
if( maStrm.GetRecId() != EXC_ID_EOF )
XclTools::SkipSubStream( maStrm );
// #i29930# show warning box
- GetAddressConverter().CheckScTab( nScTab, true );
+ GetAddressConverter().CheckScTab( nScTab );
eAkt = EXC_STATE_END;
}
else
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index a4978a7..c6da8e8 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1112,11 +1112,11 @@ XclExpChFrLabelProps::XclExpChFrLabelProps( const XclExpChRoot& rRoot ) :
{
}
-void XclExpChFrLabelProps::Convert( const ScfPropertySet& rPropSet, bool bShowSeries,
+void XclExpChFrLabelProps::Convert( const ScfPropertySet& rPropSet,
bool bShowCateg, bool bShowValue, bool bShowPercent, bool bShowBubble )
{
// label value flags
- ::set_flag( maData.mnFlags, EXC_CHFRLABELPROPS_SHOWSERIES, bShowSeries );
+ ::set_flag( maData.mnFlags, EXC_CHFRLABELPROPS_SHOWSERIES, false );
::set_flag( maData.mnFlags, EXC_CHFRLABELPROPS_SHOWCATEG, bShowCateg );
::set_flag( maData.mnFlags, EXC_CHFRLABELPROPS_SHOWVALUE, bShowValue );
::set_flag( maData.mnFlags, EXC_CHFRLABELPROPS_SHOWPERCENT, bShowPercent );
@@ -1282,7 +1282,7 @@ bool XclExpChText::ConvertDataLabel( const ScfPropertySet& rPropSet,
if( bShowAny && (GetBiff() == EXC_BIFF8) )
{
mxLabelProps.reset( new XclExpChFrLabelProps( GetChRoot() ) );
- mxLabelProps->Convert( rPropSet, false, bShowCateg, bShowValue, bShowPercent, bShowBubble );
+ mxLabelProps->Convert( rPropSet, bShowCateg, bShowValue, bShowPercent, bShowBubble );
}
// restrict to combinations allowed in CHTEXT
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index a835a43..44ec01e 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -324,7 +324,7 @@ void XclExpDffEmbeddedAnchor::ImplSetFlags( const SdrObject& /*rSdrObj*/ )
void XclExpDffEmbeddedAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit )
{
- maAnchor.SetRect( maPageSize, mnScaleX, mnScaleY, rRect, eMapUnit, true );
+ maAnchor.SetRect( maPageSize, mnScaleX, mnScaleY, rRect, eMapUnit );
}
XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ) :
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index d490555..56da620 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -156,7 +156,7 @@ private:
/** Returns the index of an existing built-in NAME record with the passed definition, otherwise 0. */
sal_uInt16 FindBuiltInNameIdx( const OUString& rName,
- const XclTokenArray& rTokArr, bool bDBRange ) const;
+ const XclTokenArray& rTokArr ) const;
/** Returns an unused name for the passed name. */
OUString GetUnusedName( const OUString& rName ) const;
@@ -471,12 +471,11 @@ sal_uInt16 XclExpNameManagerImpl::FindNamedExpIndex( SCTAB nTab, sal_uInt16 nScI
}
sal_uInt16 XclExpNameManagerImpl::FindBuiltInNameIdx(
- const OUString& rName, const XclTokenArray& rTokArr, bool bDBRange ) const
+ const OUString& rName, const XclTokenArray& rTokArr ) const
{
/* Get built-in index from the name. Special case: the database range
'unnamed' will be mapped to Excel's built-in '_FilterDatabase' name. */
- sal_Unicode cBuiltIn = (bDBRange && (rName == STR_DB_LOCAL_NONAME)) ?
- EXC_BUILTIN_FILTERDATABASE : XclTools::GetBuiltInDefNameIndex( rName );
+ sal_Unicode cBuiltIn = XclTools::GetBuiltInDefNameIndex( rName );
if( cBuiltIn < EXC_BUILTIN_UNKNOWN )
{
@@ -557,7 +556,7 @@ sal_uInt16 XclExpNameManagerImpl::CreateName( SCTAB nTab, const ScRangeData& rRa
cannot be done earlier. If a built-in name is found, the created NAME
record for this name and all following records in the list must be
deleted, otherwise they may contain wrong name list indexes. */
- sal_uInt16 nBuiltInIdx = FindBuiltInNameIdx( rName, *xTokArr, false );
+ sal_uInt16 nBuiltInIdx = FindBuiltInNameIdx( rName, *xTokArr );
if( nBuiltInIdx != 0 )
{
// delete the new NAME records
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 5b3fe07..b72cd6e 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -903,13 +903,13 @@ XclExpPTItem::XclExpPTItem( const XclExpPCField& rCacheField, sal_uInt16 nCacheI
maItemInfo.maVisName.mbUseCache = mpCacheItem != nullptr;
}
-XclExpPTItem::XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUseCache ) :
+XclExpPTItem::XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx ) :
XclExpRecord( EXC_ID_SXVI, 8 ),
mpCacheItem( nullptr )
{
maItemInfo.mnType = nItemType;
maItemInfo.mnCacheIdx = nCacheIdx;
- maItemInfo.maVisName.mbUseCache = bUseCache;
+ maItemInfo.maVisName.mbUseCache = true;
}
OUString XclExpPTItem::GetItemName() const
@@ -1156,7 +1156,7 @@ XclExpPTItem* XclExpPTField::GetItemAcc( const OUString& rName )
void XclExpPTField::AppendSubtotalItem( sal_uInt16 nItemType )
{
- maItemList.AppendNewRecord( new XclExpPTItem( nItemType, EXC_SXVI_DEFAULT_CACHE, true ) );
+ maItemList.AppendNewRecord( new XclExpPTItem( nItemType, EXC_SXVI_DEFAULT_CACHE ) );
++maFieldInfo.mnItemCount;
}
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index d3762369..05d6fef 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -242,7 +242,7 @@ void XclExpRoot::InitializeGlobals()
uno::Reference< lang::XMultiServiceFactory > xModelFactory( xComponent, uno::UNO_QUERY);
// OOXML is also BIFF8 function-wise
oox::xls::OpCodeProvider aOpCodeProvider( xModelFactory,
- oox::xls::FILTER_OOXML, oox::xls::BIFF8, false, true);
+ oox::xls::FILTER_OOXML, oox::xls::BIFF8, false);
// Compiler mocks about non-matching ctor or conversion from
// Sequence<...> to Sequence<const ...> if directly created or passed,
// conversion through Any works around.
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index e9197e2..b0cc8de 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -284,11 +284,11 @@ private:
sal_uInt32 GetNearestListColor( sal_uInt32 nIndex ) const;
/** Returns in rnIndex the palette index of the color nearest to rColor.
- @param bDefaultOnly true = Searches for default colors only (colors never replaced).
+ Searches for default colors only (colors never replaced).
@return The distance from passed color to found color. */
sal_Int32 GetNearestPaletteColor(
sal_uInt32& rnIndex,
- const Color& rColor, bool bDefaultOnly ) const;
+ const Color& rColor ) const;
/** Returns in rnFirst and rnSecond the palette indexes of the two colors nearest to rColor.
@return The minimum distance from passed color to found colors. */
sal_Int32 GetNearPaletteColors(
@@ -380,7 +380,7 @@ void XclExpPaletteImpl::Finalize()
// find nearest unused default color for each unprocessed list color
for( nIndex = 0; nIndex < nCount; ++nIndex )
aNearestVec[ nIndex ].mnDist = aRemapVec[ nIndex ].mbProcessed ? SAL_MAX_INT32 :
- GetNearestPaletteColor( aNearestVec[ nIndex ].mnPalIndex, mxColorList->at( nIndex )->GetColor(), true );
+ GetNearestPaletteColor( aNearestVec[ nIndex ].mnPalIndex, mxColorList->at( nIndex )->GetColor() );
// find the list color which is nearest to a default color
sal_uInt32 nFound = 0;
for( nIndex = 1; nIndex < nCount; ++nIndex )
@@ -704,7 +704,7 @@ sal_uInt32 XclExpPaletteImpl::GetNearestListColor( sal_uInt32 nIndex ) const
}
sal_Int32 XclExpPaletteImpl::GetNearestPaletteColor(
- sal_uInt32& rnIndex, const Color& rColor, bool bDefaultOnly ) const
+ sal_uInt32& rnIndex, const Color& rColor ) const
{
rnIndex = 0;
sal_Int32 nDist = SAL_MAX_INT32;
@@ -712,7 +712,7 @@ sal_Int32 XclExpPaletteImpl::GetNearestPaletteColor(
for( XclPaletteColorVec::const_iterator aIt = maPalette.begin(), aEnd = maPalette.end();
aIt != aEnd; ++aIt )
{
- if( !bDefaultOnly || !aIt->mbUsed )
+ if( !aIt->mbUsed )
{
sal_Int32 nCurrDist = lclGetColorDistance( rColor, aIt->maColor );
if( nCurrDist < nDist )
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index cf1738c..18d7afb 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1551,9 +1551,9 @@ void XclImpChDataFormat::ConvertLine( ScfPropertySet& rPropSet, XclChObjectType
ConvertLineBase( GetChRoot(), rPropSet, eObjType );
}
-void XclImpChDataFormat::ConvertArea( ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx, bool bUsePicFmt ) const
+void XclImpChDataFormat::ConvertArea( ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx ) const
{
- ConvertAreaBase( GetChRoot(), rPropSet, EXC_CHOBJTYPE_FILLEDSERIES, nFormatIdx, bUsePicFmt );
+ ConvertAreaBase( GetChRoot(), rPropSet, EXC_CHOBJTYPE_FILLEDSERIES, nFormatIdx );
}
void XclImpChDataFormat::RemoveUnusedFormats( const XclChExtTypeInfo& rTypeInfo )
@@ -2070,7 +2070,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
for( sal_uInt16 nPointIdx = 0, nPointCount = mxValueLink->GetCellCount(); nPointIdx < nPointCount; ++nPointIdx )
{
ScfPropertySet aPointProp = lclGetPointPropSet( xDataSeries, nPointIdx );
- mxSeriesFmt->ConvertArea( aPointProp, bVarPointFmt ? nPointIdx : mnSeriesIdx, false );
+ mxSeriesFmt->ConvertArea( aPointProp, bVarPointFmt ? nPointIdx : mnSeriesIdx );
}
}
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 1c9ab9c..7873eef 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -394,7 +394,7 @@ XclBiff XclImpStream::DetectBiffVersion( SvStream& rStrm )
return eBiff;
}
-XclImpStream::XclImpStream( SvStream& rInStrm, const XclImpRoot& rRoot, bool bContLookup ) :
+XclImpStream::XclImpStream( SvStream& rInStrm, const XclImpRoot& rRoot ) :
mrStrm( rInStrm ),
mrRoot( rRoot ),
mnGlobRecId( EXC_ID_UNKNOWN ),
@@ -410,7 +410,7 @@ XclImpStream::XclImpStream( SvStream& rInStrm, const XclImpRoot& rRoot, bool bCo
mnRawRecSize( 0 ),
mnRawRecLeft( 0 ),
mcNulSubst( '?' ),
- mbCont( bContLookup ),
+ mbCont( true ),
mbUseDecr( false ),
mbValidRec( false ),
mbValid( false )
diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx
index 145a081..df10c67 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -136,10 +136,10 @@ XclAddressConverterBase::~XclAddressConverterBase()
{
}
-void XclAddressConverterBase::CheckScTab( SCTAB nScTab, bool bWarn )
+void XclAddressConverterBase::CheckScTab( SCTAB nScTab )
{
bool bValid = (0 <= nScTab) && (nScTab <= maMaxPos.Tab());
- if( !bValid && bWarn )
+ if( !bValid )
{
mbTabTrunc |= (nScTab > maMaxPos.Tab()); // do not warn for deleted refs
mrTracer.TraceInvalidTab( nScTab, maMaxPos.Tab() );
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 1f22271..e13ff85 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -178,7 +178,7 @@ void XclObjAnchor::SetRect( const XclRoot& rRoot, SCTAB nScTab, const Rectangle&
}
void XclObjAnchor::SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY,
- const Rectangle& rRect, MapUnit eMapUnit, bool bDffAnchor )
+ const Rectangle& rRect, MapUnit eMapUnit )
{
double fScale = 1.0;
switch( eMapUnit )
@@ -191,16 +191,13 @@ void XclObjAnchor::SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32
/* In objects with DFF client anchor, the position of the shape is stored
in the cell address components of the client anchor. In old BIFF3-BIFF5
objects, the position is stored in the offset components of the anchor. */
- (bDffAnchor ? maFirst.mnCol : mnLX) = lclGetEmbeddedScale( rPageSize.Width(), nScaleX, rRect.Left(), fScale );
- (bDffAnchor ? maFirst.mnRow : mnTY) = lclGetEmbeddedScale( rPageSize.Height(), nScaleY, rRect.Top(), fScale );
- (bDffAnchor ? maLast.mnCol : mnRX) = lclGetEmbeddedScale( rPageSize.Width(), nScaleX, rRect.Right(), fScale );
- (bDffAnchor ? maLast.mnRow : mnBY) = lclGetEmbeddedScale( rPageSize.Height(), nScaleY, rRect.Bottom(), fScale );
+ maFirst.mnCol = lclGetEmbeddedScale( rPageSize.Width(), nScaleX, rRect.Left(), fScale );
+ maFirst.mnRow = lclGetEmbeddedScale( rPageSize.Height(), nScaleY, rRect.Top(), fScale );
+ maLast.mnCol = lclGetEmbeddedScale( rPageSize.Width(), nScaleX, rRect.Right(), fScale );
+ maLast.mnRow = lclGetEmbeddedScale( rPageSize.Height(), nScaleY, rRect.Bottom(), fScale );
// for safety, clear the other members
- if( bDffAnchor )
- mnLX = mnTY = mnRX = mnBY = 0;
- else
- Set( 0, 0, 0, 0 );
+ mnLX = mnTY = mnRX = mnBY = 0;
}
XclObjLineData::XclObjLineData() :
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 986050e..4e9835d 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -360,7 +360,7 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const
{
if( !mrData.mxHFEditEngine.get() )
{
- mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool(), true ) );
+ mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool() ) );
ScHeaderEditEngine& rEE = *mrData.mxHFEditEngine;
rEE.SetRefMapMode( MAP_TWIP ); // headers/footers use twips as default metric
rEE.SetUpdateMode( false );
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 2be6faa..3baae4f 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -54,9 +54,9 @@ FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUStri
return nErr;
}
-ScEEAbsImport *ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight )
+ScEEAbsImport *ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange )
{
- return new ScHTMLImport( pDocP, rBaseURL, rRange, bCalcWidthHeight );
+ return new ScHTMLImport( pDocP, rBaseURL, rRange, true/*bCalcWidthHeight*/ );
}
ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) :
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 1eee9bc..daaeceb 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -596,8 +596,7 @@ class OpCodeProvider : public FunctionProvider // not derived from WorkbookHelpe
public:
explicit OpCodeProvider(
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory,
- FilterType eFilter, BiffType eBiff, bool bImportFilter,
- bool bCallerKnowsAboutMacroExport = false );
+ FilterType eFilter, BiffType eBiff, bool bImportFilter );
virtual ~OpCodeProvider();
/** Returns the structure containing all token op-codes for operators and
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index bb6b1c1..6a36b3d 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -283,7 +283,7 @@ public:
SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override;
virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) override;
- virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) override;
+ virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) override;
virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) override;
// various export filters
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index 11423c0..509ff0f 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -449,7 +449,7 @@ public:
/** Converts separator and the passed data label flags. */
void Convert(
- const ScfPropertySet& rPropSet, bool bShowSeries,
+ const ScfPropertySet& rPropSet,
bool bShowCateg, bool bShowValue,
bool bShowPercent, bool bShowBubble );
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 1683f3f..f959991 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -237,7 +237,7 @@ class XclExpPTItem : public XclExpRecord
{
public:
explicit XclExpPTItem( const XclExpPCField& rCacheField, sal_uInt16 nCacheIdx );
- explicit XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUseCache );
+ explicit XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx );
/** Returns the internal name of this item. */
OUString GetItemName() const;
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 9b0dd19..233a8d8 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -669,7 +669,7 @@ public:
/** Writes the line format only, e.g. for trend lines or error bars. */
void ConvertLine( ScfPropertySet& rPropSet, XclChObjectType eObjType ) const;
/** Writes the area format only for the series or a data point. */
- void ConvertArea( ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx, bool bUsePicFmt ) const;
+ void ConvertArea( ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx ) const;
private:
/** Removes unused formatting (e.g. pie distance in a bar chart). */
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index e498b74..4fa50b0 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -240,12 +240,10 @@ public:
/** Constructs the Excel record import stream using a TOOLS stream object.
@param rInStrm The system input stream. Will be set to its start position.
- Must exist as long as this object exists.
- @param bContLookup Automatic CONTINUE lookup on/off. */
+ Must exist as long as this object exists */
explicit XclImpStream(
SvStream& rInStrm,
- const XclImpRoot& rRoot,
- bool bContLookup = true );
+ const XclImpRoot& rRoot );
~XclImpStream();
diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx
index 7021cbd..b0c65a3 100644
--- a/sc/source/filter/inc/xladdress.hxx
+++ b/sc/source/filter/inc/xladdress.hxx
@@ -146,10 +146,10 @@ public:
/** Checks if the passed sheet index is valid.
@param nScTab The sheet index to check.
- @param bWarn true = Sets the internal flag that produces a warning box
+ Sets the internal flag that produces a warning box
after loading/saving the file, if the sheet index is not valid.
*/
- void CheckScTab( SCTAB nScTab, bool bWarn );
+ void CheckScTab( SCTAB nScTab );
protected:
XclTracer& mrTracer; /// Tracer for invalid addresses.
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 07f7aa3..dd007ce 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -300,7 +300,7 @@ struct XclObjAnchor : public XclRange
/** Initializes the anchor coordinates for an embedded draw page. */
void SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY,
- const Rectangle& rRect, MapUnit eMapUnit, bool bDffAnchor );
+ const Rectangle& rRect, MapUnit eMapUnit );
};
inline SvStream& operator>>( SvStream& rStrm, XclObjAnchor& rAnchor )
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 2e1a4a9..72470fc 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -1471,8 +1471,8 @@ bool OpCodeProviderImpl::initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, c
}
OpCodeProvider::OpCodeProvider( const Reference< XMultiServiceFactory >& rxModelFactory,
- FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) :
- FunctionProvider( eFilter, eBiff, bImportFilter, bCallerKnowsAboutMacroExport ),
+ FilterType eFilter, BiffType eBiff, bool bImportFilter ) :
+ FunctionProvider( eFilter, eBiff, bImportFilter, true/*bCallerKnowsAboutMacroExport*/ ),
mxOpCodeImpl( new OpCodeProviderImpl( getFuncs(), rxModelFactory ) )
{
}
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index e31c215..8200745 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -309,7 +309,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
const ScStyleSheet* pStyleSheet =
mpDoc->GetPattern( nCol, nRow, nTab )->GetStyleSheet();
aAttr.SetStyleSheet( const_cast<ScStyleSheet*>(pStyleSheet) );
- mpDoc->SetPattern( nCol, nRow, nTab, aAttr, true );
+ mpDoc->SetPattern( nCol, nRow, nTab, aAttr );
// Add data
if (bSimple)
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 350f3b6..e4e45c7 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2569,7 +2569,7 @@ void ScXMLExport::_ExportAutoStyles()
pRowStyles->AddFieldStyleName(nTable, nRow, nIndex);
}
sal_Int32 nOld(nRow);
- nRow = pDoc->GetNextDifferentChangedRow(sal::static_int_cast<SCTAB>(nTable), static_cast<SCROW>(nRow), false);
+ nRow = pDoc->GetNextDifferentChangedRow(sal::static_int_cast<SCTAB>(nTable), static_cast<SCROW>(nRow));
if (nRow > nOld + 1)
pRowStyles->AddFieldStyleName(nTable, nOld + 1, nIndex, nRow - 1);
}
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 55916f1..7e39f25 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -1050,8 +1050,8 @@ void ScMasterPageContext::Finish( bool bOverwrite )
ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList,
- SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) :
- XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
+ SvXMLStylesContext& rStyles, sal_uInt16 nFamily ) :
+ XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, false/*bDefaultStyle*/ ),
nLastSheet(-1)
{
}
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index b76a5f5..023dc0d 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -247,8 +247,7 @@ public:
ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
- SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
- bool bDefaultStyle = false );
+ SvXMLStylesContext& rStyles, sal_uInt16 nFamily );
virtual ~ScCellTextStyleContext();
// override FillPropertySet to store style information
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 5ff874e..0ff3317 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1436,7 +1436,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
{
SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges();
- ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, true );
+ ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool );
pHdrEngine->EnableUndo( false );
pHdrEngine->SetRefMapMode( MAP_TWIP );
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index 96c0040..d6b7d36 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -90,11 +90,11 @@ void FormulaTemplate::applyNumber(const OUString& aVariable, sal_Int32 aValue)
mTemplate = mTemplate.replaceAll(aVariable, OUString::number(aValue));
}
-AddressWalker::AddressWalker(ScAddress aInitialAddress, bool aTrackRange) :
+AddressWalker::AddressWalker(ScAddress aInitialAddress) :
mCurrentAddress(aInitialAddress),
mMinimumAddress(aInitialAddress),
mMaximumAddress(aInitialAddress),
- mTrackRange(aTrackRange)
+ mTrackRange(true)
{
mAddressStack.push_back(mCurrentAddress);
}
@@ -157,7 +157,7 @@ void AddressWalker::push(SCCOL aRelativeCol, SCROW aRelativeRow, SCTAB aRelative
AddressWalkerWriter::AddressWalkerWriter(ScAddress aInitialAddress, ScDocShell* pDocShell, ScDocument* pDocument,
formula::FormulaGrammar::Grammar eGrammar ) :
- AddressWalker(aInitialAddress, true),
+ AddressWalker(aInitialAddress),
mpDocShell(pDocShell),
mpDocument(pDocument),
meGrammar(eGrammar)
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 5e0814b..b8db1ee 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2891,7 +2891,7 @@ void ScInputHandler::EnterHandler( ScEnterMode nBlockMode )
if ( bOldMod && pExecuteSh && pCellAttrs && !bForget )
{
// Combine with input?
- pExecuteSh->ApplySelectionPattern( *pCellAttrs, true, true );
+ pExecuteSh->ApplySelectionPattern( *pCellAttrs, true );
pExecuteSh->AdjustBlockHeight();
}
@@ -3424,7 +3424,7 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false
return bUsed;
}
-void ScInputHandler::InputCommand( const CommandEvent& rCEvt, bool bForce )
+void ScInputHandler::InputCommand( const CommandEvent& rCEvt )
{
if ( rCEvt.GetCommand() == CommandEventId::CursorPos )
{
@@ -3458,77 +3458,74 @@ void ScInputHandler::InputCommand( const CommandEvent& rCEvt, bool bForce )
}
else
{
- if ( bForce || eMode != SC_INPUT_NONE )
+ if (!bOptLoaded)
{
- if (!bOptLoaded)
- {
- bAutoComplete = SC_MOD()->GetAppOptions().GetAutoComplete();
- bOptLoaded = true;
- }
+ bAutoComplete = SC_MOD()->GetAppOptions().GetAutoComplete();
+ bOptLoaded = true;
+ }
- HideTip();
- HideTipBelow();
+ HideTip();
+ HideTipBelow();
- if ( bSelIsRef )
- {
- RemoveSelection();
- bSelIsRef = false;
- }
+ if ( bSelIsRef )
+ {
+ RemoveSelection();
+ bSelIsRef = false;
+ }
- UpdateActiveView();
- bool bNewView = DataChanging( 0, true );
+ UpdateActiveView();
+ bool bNewView = DataChanging( 0, true );
- if (!bProtected) // changes allowed
+ if (!bProtected) // changes allowed
+ {
+ if (bNewView) // create new edit view
{
- if (bNewView) // create new edit view
- {
- if (pActiveViewSh)
- pActiveViewSh->GetViewData().GetDocShell()->PostEditView( pEngine, aCursorPos );
- UpdateActiveView();
- if (eMode==SC_INPUT_NONE)
- if (pTableView || pTopView)
+ if (pActiveViewSh)
+ pActiveViewSh->GetViewData().GetDocShell()->PostEditView( pEngine, aCursorPos );
+ UpdateActiveView();
+ if (eMode==SC_INPUT_NONE)
+ if (pTableView || pTopView)
+ {
+ OUString aStrLoP;
+ if (pTableView)
{
- OUString aStrLoP;
- if (pTableView)
- {
- pTableView->GetEditEngine()->SetText( aStrLoP );
- pTableView->SetSelection( ESelection(0,0, 0,0) );
- }
- if (pTopView)
- {
- pTopView->GetEditEngine()->SetText( aStrLoP );
- pTopView->SetSelection( ESelection(0,0, 0,0) );
- }
+ pTableView->GetEditEngine()->SetText( aStrLoP );
+ pTableView->SetSelection( ESelection(0,0, 0,0) );
}
- SyncViews();
- }
+ if (pTopView)
+ {
+ pTopView->GetEditEngine()->SetText( aStrLoP );
+ pTopView->SetSelection( ESelection(0,0, 0,0) );
+ }
+ }
+ SyncViews();
+ }
- if (pTableView || pTopView)
- {
- if (pTableView)
- pTableView->Command( rCEvt );
- if (pTopView)
- pTopView->Command( rCEvt );
+ if (pTableView || pTopView)
+ {
+ if (pTableView)
+ pTableView->Command( rCEvt );
+ if (pTopView)
+ pTopView->Command( rCEvt );
- if ( rCEvt.GetCommand() == CommandEventId::EndExtTextInput )
- {
- // AutoInput after ext text input
+ if ( rCEvt.GetCommand() == CommandEventId::EndExtTextInput )
+ {
+ // AutoInput after ext text input
- if (pFormulaData)
- miAutoPosFormula = pFormulaData->end();
- if (pColumnData)
- miAutoPosColumn = pColumnData->end();
+ if (pFormulaData)
+ miAutoPosFormula = pFormulaData->end();
+ if (pColumnData)
+ miAutoPosColumn = pColumnData->end();
- if (bFormulaMode)
- UseFormulaData();
- else
- UseColData();
- }
+ if (bFormulaMode)
+ UseFormulaData();
+ else
+ UseColData();
}
-
- DataChanged(); // calls UpdateParenthesis()
- InvalidateAttribs(); //! in DataChanged ?
}
+
+ DataChanged(); // calls UpdateParenthesis()
+ InvalidateAttribs(); //! in DataChanged ?
}
if (pTopView && eMode != SC_INPUT_NONE)
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index a778894..9f6b795 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -714,10 +714,9 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( vc
}
AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( vcl::Window* pParent,
- bool bUnGroup,
- bool bRows )
+ bool bUnGroup )
{
- VclPtr<ScGroupDlg> pDlg = VclPtr<ScGroupDlg>::Create( pParent, bUnGroup, bRows);
+ VclPtr<ScGroupDlg> pDlg = VclPtr<ScGroupDlg>::Create( pParent, bUnGroup, true/*bRows*/);
return new AbstractScGroupDlg_Impl( pDlg );
}
@@ -741,10 +740,9 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( v
}
AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( vcl::Window* pParent,
- InsertDeleteFlags nCheckDefaults,
const OUString* pStrTitle )
{
- VclPtr<ScInsertContentsDlg> pDlg = VclPtr<ScInsertContentsDlg>::Create(pParent, nCheckDefaults, pStrTitle);
+ VclPtr<ScInsertContentsDlg> pDlg = VclPtr<ScInsertContentsDlg>::Create(pParent, InsertDeleteFlags::NONE, pStrTitle);
return new AbstractScInsertContentsDlg_Impl( pDlg );
}
@@ -823,10 +821,9 @@ AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg (
ScDPObject& rDPObj,
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData,
- const ScDPNameVec& rDataFields,
- bool bEnableLayout )
+ const ScDPNameVec& rDataFields )
{
- VclPtr<ScDPSubtotalDlg> pDlg = VclPtr<ScDPSubtotalDlg>::Create( pParent, rDPObj, rLabelData, rFuncData, rDataFields, bEnableLayout );
+ VclPtr<ScDPSubtotalDlg> pDlg = VclPtr<ScDPSubtotalDlg>::Create( pParent, rDPObj, rLabelData, rFuncData, rDataFields, true/*bEnableLayout*/ );
return new AbstractScDPSubtotalDlg_Impl( pDlg );
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 9c45952..7a84d73 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -437,15 +437,13 @@ public:
double fMax,
sal_uInt16 nPossDir) override;
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( vcl::Window* pParent,
- bool bUnGroup = false,
- bool bRows = true) override;
+ bool bUnGroup = false) override;
virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent,
int nId,
bool bDisallowCellMove = false ) override;
virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent,
- InsertDeleteFlags nCheckDefaults = InsertDeleteFlags::NONE,
const OUString* pStrTitle = nullptr ) override;
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData,
@@ -487,8 +485,7 @@ public:
ScDPObject& rDPObj,
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData,
- const ScDPNameVec& rDataFields,
- bool bEnableLayout ) override;
+ const ScDPNameVec& rDataFields ) override;
virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent,
int nId,
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index 436aa4e..ad22426 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -49,8 +49,7 @@ void ScDDComboBoxButton::SetOptSizePixel()
}
void ScDDComboBoxButton::Draw( const Point& rAt,
- const Size& rSize,
- bool bState )
+ const Size& rSize )
{
if ( rSize.Width() == 0 || rSize.Height() == 0 )
return;
@@ -82,7 +81,7 @@ void ScDDComboBoxButton::Draw( const Point& rAt,
aInnerRect.Top() = aInnerCenter.Y() - (aInnerSize.Width()>>1);
aInnerRect.Bottom()= aInnerCenter.Y() + (aInnerSize.Width()>>1);
- ImpDrawArrow( aInnerRect, bState );
+ ImpDrawArrow( aInnerRect, false/*bState*/ );
// restore old state
pOut->EnableMapMode( bOldEnable );
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 88d4669..be5f356 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -294,11 +294,11 @@ Reference<XAccessible> ScMenuFloatingWindow::CreateAccessible()
return mxAccessible;
}
-void ScMenuFloatingWindow::addMenuItem(const OUString& rText, bool bEnabled, Action* pAction)
+void ScMenuFloatingWindow::addMenuItem(const OUString& rText, Action* pAction)
{
MenuItemData aItem;
aItem.maText = rText;
- aItem.mbEnabled = bEnabled;
+ aItem.mbEnabled = true;
aItem.mpAction.reset(pAction);
maMenuItems.push_back(aItem);
}
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 13419e8..ea8f112 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -66,10 +66,10 @@ bool ScDoubleField::GetValue( double& rfValue ) const
return bOk;
}
-void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces, bool bEraseTrailingDecZeros )
+void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces )
{
SetText( ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G,
- nDecPlaces, lclGetDecSep(), bEraseTrailingDecZeros ) );
+ nDecPlaces, lclGetDecSep(), true/*bEraseTrailingDecZeros*/ ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index a4173e9..c53590d 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -57,7 +57,7 @@ bool ScPivotLayoutTreeList::DoubleClickHdl()
mpParent->PushDataFieldNames(aDataFieldNames);
std::unique_ptr<AbstractScDPSubtotalDlg> pDialog(
- pFactory->CreateScDPSubtotalDlg(this, mpParent->maPivotTableObject, rCurrentLabelData, rCurrentFunctionData, aDataFieldNames, true));
+ pFactory->CreateScDPSubtotalDlg(this, mpParent->maPivotTableObject, rCurrentLabelData, rCurrentFunctionData, aDataFieldNames));
if (pDialog->Execute() == RET_OK)
{
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index d3c7553..05ea76a 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -277,13 +277,14 @@ void ScDBDocFunc::ModifyAllDBData( const ScDBCollection& rNewColl, const std::ve
}
}
-bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab )
+bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bApi, bool bIsUnnamed, SCTAB aTab )
{
//! auch fuer ScDBFunc::RepeatDB benutzen!
bool bDone = false;
ScDocument& rDoc = rDocShell.GetDocument();
- if (bRecord && !rDoc.IsUndoEnabled())
+ bool bRecord = true;
+ if (!rDoc.IsUndoEnabled())
bRecord = false;
ScDBData* pDBData = nullptr;
if (bIsUnnamed)
@@ -1627,7 +1628,7 @@ void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessD
aImportParam.nType = static_cast<sal_uInt8>( ( nCommandType == sdb::CommandType::QUERY ) ? ScDbQuery : ScDbTable );
aImportParam.bImport = true;
- bool bContinue = DoImport( nTab, aImportParam, &rDescriptor, true );
+ bool bContinue = DoImport( nTab, aImportParam, &rDescriptor );
// DB-Operationen wiederholen
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index e05b81f..52cb9ed 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -116,13 +116,14 @@ bool ScDBDocFunc::DoImportUno( const ScAddress& rPos,
}
bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
- const svx::ODataAccessDescriptor* pDescriptor, bool bRecord )
+ const svx::ODataAccessDescriptor* pDescriptor )
{
ScDocument& rDoc = rDocShell.GetDocument();
ScChangeTrack *pChangeTrack = nullptr;
ScRange aChangedRange;
- if (bRecord && !rDoc.IsUndoEnabled())
+ bool bRecord = true;
+ if (!rDoc.IsUndoEnabled())
bRecord = false;
ScDBData* pDBData = rDoc.GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index c61141a..81e7caa 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -645,7 +645,7 @@ bool ScDocFunc::DeleteContents(
}
bool ScDocFunc::DeleteCell(
- const ScAddress& rPos, const ScMarkData& rMark, InsertDeleteFlags nFlags, bool bRecord, bool bApi )
+ const ScAddress& rPos, const ScMarkData& rMark, InsertDeleteFlags nFlags, bool bRecord )
{
ScDocShellModificator aModificator(rDocShell);
@@ -657,8 +657,7 @@ bool ScDocFunc::DeleteCell(
ScEditableTester aTester(&rDoc, rPos.Col(), rPos.Row(), rPos.Col(), rPos.Row(), rMark);
if (!aTester.IsEditable())
{
- if (!bApi)
- rDocShell.ErrorMessage(aTester.GetMessageId());
+ rDocShell.ErrorMessage(aTester.GetMessageId());
return false;
}
@@ -713,11 +712,12 @@ bool ScDocFunc::DeleteCell(
}
bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
- bool bRecord, bool bApi )
+ bool bApi )
{
ScDocShellModificator aModificator( rDocShell );
ScDocument& rDoc = rDocShell.GetDocument();
+ bool bRecord = true;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list