diff options
47 files changed, 102 insertions, 105 deletions
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index dbafbf7d1553..d88a1cc8f636 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1435,7 +1435,7 @@ void ScFiltersTest::testBrokenQuotesCSV() SfxFilterFlags nFormatType = getFileFormats()[CSV].nFormatType; SotClipboardFormatId nClipboardId = bool(nFormatType) ? SotClipboardFormatId::STARCALC_8 : SotClipboardFormatId::NONE; ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName, OUString(), aFilterType, - nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT); + nFormatType, nClipboardId); CPPUNIT_ASSERT_MESSAGE("Failed to load fdo48621_broken_quotes.csv", xDocSh.Is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1462,7 +1462,7 @@ void ScFiltersTest::testCellValueXLSX() SfxFilterFlags nFormatType = getFileFormats()[XLSX].nFormatType; SotClipboardFormatId nClipboardId = bool(nFormatType) ? SotClipboardFormatId::STARCALC_8 : SotClipboardFormatId::NONE; ScDocShellRef xDocSh = ScBootstrapFixture::load( aFileName, aFilterName, OUString(), aFilterType, - nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT); + nFormatType, nClipboardId); CPPUNIT_ASSERT_MESSAGE("Failed to load cell-value.xlsx", xDocSh.Is()); ScDocument& rDoc = xDocSh->GetDocument(); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 9e5e5774fed4..60dfd24c1ac9 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3790,7 +3790,7 @@ void Test::testCutPasteRefUndo() pUndoDoc->InitUndo(m_pDoc, 0, 0); // Do the pasting of 12 into C2. This should update A2 to reference C2. - m_pDoc->CopyFromClip(ScAddress(2,1,0), aMark, IDF_CONTENTS, pUndoDoc, &aClipDoc, true, false); + m_pDoc->CopyFromClip(ScAddress(2,1,0), aMark, IDF_CONTENTS, pUndoDoc, &aClipDoc); CPPUNIT_ASSERT_EQUAL(12.0, m_pDoc->GetValue(0,1,0)); if (!checkFormula(*m_pDoc, ScAddress(0,1,0), "C2")) @@ -5130,7 +5130,7 @@ void Test::testNoteLifeCycle() ScDocument aClipDoc(SCDOCMODE_CLIP); ScMarkData aMarkData; aMarkData.SelectOneTable(0); - m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMarkData, false, false, true, true); + m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMarkData, false, false, true); ScPostIt* pClipNote = aClipDoc.GetNote(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to copy note to the clipboard.", pClipNote); @@ -5210,7 +5210,7 @@ void Test::testNoteCopyPaste() ScDocument aClipDoc(SCDOCMODE_CLIP); aClipDoc.ResetClip(m_pDoc, &aMark); ScClipParam aClipParam(aCopyRange, false); - m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark, false, false, false, true); + m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark); // Make sure the notes are in the clipboard. pNote = aClipDoc.GetNote(ScAddress(1,1,0)); @@ -5894,7 +5894,7 @@ void Test::testCondCopyPasteSheetBetweenDoc() m_pDoc->AddCondFormat(pFormat, 0); ScDocument aDoc; - aDoc.TransferTab(m_pDoc, 0, 0, true); + aDoc.TransferTab(m_pDoc, 0, 0); ScConditionalFormatList* pList = aDoc.GetCondFormList(0); CPPUNIT_ASSERT_EQUAL(size_t(1), pList->size()); diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 38b34d3929a5..f27f34cd6ef5 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -2170,7 +2170,7 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) rSet.ClearItem(nId); if ( aNewPattern == *pDefPattern ) - SetPatternArea( nThisRow, nAttrRow, pDefPattern, false ); + SetPatternArea( nThisRow, nAttrRow, pDefPattern ); else SetPatternArea( nThisRow, nAttrRow, &aNewPattern, true ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 5711c45e7de3..53f5b304f803 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4138,7 +4138,7 @@ void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkDa if ( maTabs[nTab] && ( !pTabMark || pTabMark->GetTableSelect(nTab) ) ) { maTabs[nTab]->SetOptimalHeightOnly(rCxt, 0, MAXROW, &aProgress, nProgressStart); - maTabs[nTab]->SetDrawPageSize(true); + maTabs[nTab]->SetDrawPageSize(); nProgressStart += maTabs[nTab]->GetWeightedCount(); } } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 0ed03201dd92..edabda2f99bc 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -1227,7 +1227,7 @@ void ScPatternAttr::SetStyleSheet( ScStyleSheet* pNewStyle, bool bClearDirectFor { for (sal_uInt16 i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END; i++) { - if (rStyleSet.GetItemState(i, true) == SfxItemState::SET) + if (rStyleSet.GetItemState(i) == SfxItemState::SET) rPatternSet.ClearItem(i); } } diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 356805e60cff..65a64d679cbe 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -810,7 +810,6 @@ static void lcl_appendCellRangeAddress( void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, const OUString& rXMLRange, ScDocument* pDoc ) { FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - const sal_Unicode cSep = ' '; const sal_Unicode cSepNew = ScCompiler::GetNativeSymbolChar(ocSep); OUStringBuffer aRetStr; @@ -820,7 +819,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con while (nOffset >= 0) { OUString aToken; - GetTokenByOffset(aToken, rXMLRange, nOffset, cSep); + GetTokenByOffset(aToken, rXMLRange, nOffset); if (nOffset < 0) break; diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 1cc23139673e..e3c18f02e7e0 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1181,7 +1181,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, { case EXC_CHOBJLINK_TITLE: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_TITLE ); break; case EXC_CHOBJLINK_YAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE, 1 ); break; - case EXC_CHOBJLINK_XAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE, 0 ); break; + case EXC_CHOBJLINK_XAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE ); break; case EXC_CHOBJLINK_ZAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE, 2 ); break; } diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index f274326bd9c8..215da0534bcd 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -618,7 +618,7 @@ void ScHTMLExport::WriteBody() { aGrfNm = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), - aGrfNm, URIHelper::GetMaybeFileHdl(), true, false); + aGrfNm, URIHelper::GetMaybeFileHdl()); if ( HasCId() ) MakeCIdURL( aGrfNm ); aLink = aGrfNm; @@ -637,7 +637,7 @@ void ScHTMLExport::WriteBody() else aGrfNm = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), - aGrfNm, URIHelper::GetMaybeFileHdl(), true, false); + aGrfNm, URIHelper::GetMaybeFileHdl()); aLink = aGrfNm; } if( !aLink.isEmpty() ) diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 07afbe37bc14..3e9c17e7934f 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -157,10 +157,10 @@ void PageSettings::importPageSetup( const Relations& rRelations, const Attribute maModel.mnPaperSize = rAttribs.getInteger( XML_paperSize, 1 ); aStr = rAttribs.getString ( XML_paperWidth, OUString() ); ::sax::Converter::convertMeasure( - maModel.mnPaperWidth, aStr, util::MeasureUnit::MM_100TH); + maModel.mnPaperWidth, aStr); aStr = rAttribs.getString ( XML_paperHeight, OUString() ); ::sax::Converter::convertMeasure( - maModel.mnPaperHeight, aStr, util::MeasureUnit::MM_100TH ); + maModel.mnPaperHeight, aStr ); maModel.mnCopies = rAttribs.getInteger( XML_copies, 1 ); maModel.mnScale = rAttribs.getInteger( XML_scale, 100 ); maModel.mnFirstPage = rAttribs.getInteger( XML_firstPageNumber, 1 ); @@ -185,10 +185,10 @@ void PageSettings::importChartPageSetup( const Relations& rRelations, const Attr maModel.mnPaperSize = rAttribs.getInteger( XML_paperSize, 1 ); aStr = rAttribs.getString ( XML_paperWidth, OUString() ); ::sax::Converter::convertMeasure( - maModel.mnPaperWidth, aStr, util::MeasureUnit::MM_100TH ); + maModel.mnPaperWidth, aStr ); aStr = rAttribs.getString ( XML_paperHeight, OUString() ); ::sax::Converter::convertMeasure( - maModel.mnPaperHeight, aStr, util::MeasureUnit::MM_100TH ); + maModel.mnPaperHeight, aStr ); maModel.mnCopies = rAttribs.getInteger( XML_copies, 1 ); maModel.mnFirstPage = rAttribs.getInteger( XML_firstPageNumber, 1 ); maModel.mnHorPrintRes = rAttribs.getInteger( XML_horizontalDpi, 600 ); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 9ec4c0c41f41..0853d35b61e1 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3092,7 +3092,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) OUString sFormattedString(lcl_GetFormattedString(pDoc, aCell.maCellAddress)); OUString sCellString = aCell.maBaseCell.getString(pDoc); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - sCellString, sFormattedString, true, true); + sCellString, sFormattedString); if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( sCellString, sFormattedString, false, true, XML_NAMESPACE_CALC_EXT); diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 682debe381ad..7744dda8cde6 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1255,7 +1255,7 @@ void ScAccessibleSpreadsheet::SelectCell(sal_Int32 nRow, sal_Int32 nCol, bool bD mpViewShell->SetTabNo( maRange.aStart.Tab() ); mpViewShell->DoneBlockMode( true ); // continue selecting - mpViewShell->InitBlockMode( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), maRange.aStart.Tab(), bDeselect, false, false ); + mpViewShell->InitBlockMode( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), maRange.aStart.Tab(), bDeselect ); mpViewShell->SelectionChanged(); } @@ -1494,8 +1494,8 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) mpViewShell->SetTabNo( maRange.aStart.Tab() ); mpViewShell->DoneBlockMode( true ); // continue selecting - mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), false, true, false ); - mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true, false ); + mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), false, true ); + mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true ); mpViewShell->SelectionChanged(); return sal_True; } @@ -1532,7 +1532,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) mpViewShell->SetTabNo( maRange.aStart.Tab() ); mpViewShell->DoneBlockMode( true ); // continue selecting mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), false, true, false, true ); - mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true, false ); + mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true ); mpViewShell->SelectionChanged(); mpViewShell->DoneBlockMode( true ); return sal_True; diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index 1a3420650edb..a5e9520e5d36 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -149,8 +149,8 @@ void ScAnalysisOfVarianceDialog::FactorChanged() { if (mpSingleFactorRadio->IsChecked()) { - mpGroupByRowsRadio->Enable(true); - mpGroupByColumnsRadio->Enable(true); + mpGroupByRowsRadio->Enable(); + mpGroupByColumnsRadio->Enable(); mpRowsPerSampleField->Enable(false); meFactor = SINGLE_FACTOR; } diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 2b3d22426173..ebffefe8323d 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -329,11 +329,11 @@ void ScSamplingDialog::ToggleSamplingMethod() if (mpRandomMethodRadio->IsChecked()) { mpPeriod->Enable(false); - mpSampleSize->Enable(true); + mpSampleSize->Enable(); } else if (mpPeriodicMethodRadio->IsChecked()) { - mpPeriod->Enable(true); + mpPeriod->Enable(); mpSampleSize->Enable(false); } } diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index ade33871b2a2..23b4db51b659 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -649,7 +649,7 @@ void ScTransferObj::InitDocShell(bool bLimitToPageSize) rDestDoc.CopyFromClip( aDestRange, aDestMark, IDF_ALL, NULL, pDoc, false ); pDoc->SetClipArea( aDestRange, bWasCut ); - StripRefs( pDoc, nStartX,nStartY, nEndX,nEndY, &rDestDoc, 0 ); + StripRefs( pDoc, nStartX,nStartY, nEndX,nEndY, &rDestDoc ); ScRange aMergeRange = aDestRange; rDestDoc.ExtendMerge( aMergeRange, true ); diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 359c9ed6bf3e..ede2a3a2e932 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1241,7 +1241,7 @@ IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, EdModifyHdl, Edit&, void) if ( aLabelDisp.toAsciiLowerCase().indexOf( aSearchText ) != -1 ) { - maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, true ); + maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent ); ++nSelCount; } else @@ -1425,7 +1425,7 @@ void ScCheckListMenuWindow::addDateMember(const OUString& rsName, double nVal, b SvTreeListEntry* pDayEntry = maChecks->FindEntry(pMonthEntry, aDayName); if (!pDayEntry) { - maChecks->InsertEntry(aDayName, pMonthEntry, false); + maChecks->InsertEntry(aDayName, pMonthEntry); Member aMemDay; aMemDay.maName = aDayName; aMemDay.maRealName = rsName; diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 882cec04d277..d581bd895342 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -51,7 +51,7 @@ void ScCondFormatManagerWindow::Init() { for(ScConditionalFormatList::iterator itr = mpFormatList->begin(); itr != mpFormatList->end(); ++itr) { - SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(**itr), TREELIST_APPEND, 0xffff ); + SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(**itr) ); maMapLBoxEntryToCondIndex.insert(std::pair<SvTreeListEntry*,sal_Int32>(pEntry, (*itr)->GetKey())); } } diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 101e6a6e5c43..263e460a7789 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -411,7 +411,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa pLbCharSet->SetSelectHdl( LINK( this, ScImportAsciiDlg, CharSetHdl ) ); pLbCustomLang->SetLanguageList( - SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, false, false); + SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, false); pLbCustomLang->InsertLanguage(LANGUAGE_SYSTEM); pLbCustomLang->SelectLanguage(static_cast<LanguageType>(nLanguage)); diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 900eb07cb22a..f6d1bdfce5ef 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -81,7 +81,7 @@ void ScTextImportOptionsDlg::init() m_pRbAutomatic->Check(); m_pLbCustomLang->SetLanguageList( - SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, false, false); + SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, false); LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType(); m_pLbCustomLang->SelectLanguage(eLang); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 52a8c7186ba5..495982851949 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1766,7 +1766,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, if ( bRecord ) { pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pRefUndoDoc->InitUndo( &rDoc, 0, nTabCount-1, false ); + pRefUndoDoc->InitUndo( &rDoc, 0, nTabCount-1 ); // pRefUndoDoc is filled in InsertCol / InsertRow @@ -2355,7 +2355,7 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, } pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pRefUndoDoc->InitUndo( &rDoc, 0, nTabCount-1, false ); + pRefUndoDoc->InitUndo( &rDoc, 0, nTabCount-1 ); pUndoData = new ScRefUndoData( &rDoc ); @@ -2408,7 +2408,7 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, pRefUndoDoc->DeleteAreaTab(nUndoStartCol,nUndoStartRow,nUndoEndCol,nUndoEndRow, *itr, IDF_ALL); // alle Tabellen anlegen, damit Formeln kopiert werden koennen: - pUndoDoc->AddUndoTab( 0, nTabCount-1, false ); + pUndoDoc->AddUndoTab( 0, nTabCount-1 ); // kopieren mit bColRowFlags=false (#54194#) pRefUndoDoc->CopyToDocument(0,0,0,MAXCOL,MAXROW,MAXTAB,IDF_FORMULA,false,pUndoDoc,NULL,false); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 0937cc6da64c..4c2c62e7ddb7 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -1105,7 +1105,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) // Unterstreichung - eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, true ); + eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE ); if ( eState == SfxItemState::DONTCARE ) { rDestSet.InvalidateItem( SID_ULINE_VAL_NONE ); diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 02fb2c9fea2a..86885ac16f3b 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -438,7 +438,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if (pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK)) { pView->UnmarkAllObj(); - pView->MarkObj(pObj,pPV,false); + pView->MarkObj(pObj,pPV); return true; } } diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index b7996f533f26..7e3582439f8d 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -333,7 +333,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) pView->UnmarkAllObj(); ScViewData& rViewData = pViewShell->GetViewData(); rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD); - pView->MarkObj(pObj,pPV,false); + pView->MarkObj(pObj,pPV); pHdl=pView->PickHandle(aMDPos); pView->BegDragObj(aMDPos, nullptr, pHdl); diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 32c6dd94504e..86923ab3ce32 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -254,7 +254,7 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/) IMPL_LINK_TYPED( ScDataFormDlg, Impl_DataModifyHdl, Edit&, rEdit, void) { if ( rEdit.IsModified() ) - m_pBtnRestore->Enable( true ); + m_pBtnRestore->Enable(); } IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) @@ -363,14 +363,14 @@ void ScDataFormDlg::SetButtonState() } else { - m_pBtnDelete->Enable( true ); - m_pBtnNext->Enable( true ); + m_pBtnDelete->Enable(); + m_pBtnNext->Enable(); } if (nCurrentRow == nStartRow + 1) m_pBtnPrev->Enable( false ); else - m_pBtnPrev->Enable( true ); + m_pBtnPrev->Enable(); m_pBtnRestore->Enable( false ); if ( maEdits.size()>=1 && maEdits[0] != nullptr ) diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 177db44b9d17..38425944bf5c 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -138,7 +138,7 @@ void ScHighlightChgDlg::Init() OUString aRefStr(pRangeEntry->Format(ABS_DREF3D, pDoc)); m_pFilterCtr->SetRange(aRefStr); } - m_pFilterCtr->Enable(true); + m_pFilterCtr->Enable(); HighlightHandle(m_pHighlightBox); } @@ -189,7 +189,7 @@ IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) { if(m_pHighlightBox->IsChecked()) { - m_pFilterCtr->Enable(true); + m_pFilterCtr->Enable(); m_pCbAccept->Enable(); m_pCbReject->Enable(); } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 3e3ed9951daa..4d25cdad020a 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -143,7 +143,7 @@ void ScMoveTableDlg::CheckNewTabName() if (aNewName.isEmpty()) { // New sheet name is empty. This is not good. - pFtWarn->Show(true); + pFtWarn->Show(); pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetText(msStrTabNameEmpty); pBtnOk->Disable(); @@ -153,7 +153,7 @@ void ScMoveTableDlg::CheckNewTabName() if (!ScDocument::ValidTabName(aNewName)) { // New sheet name contains invalid characters. - pFtWarn->Show(true); + pFtWarn->Show(); pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetText(msStrTabNameInvalid); pBtnOk->Disable(); @@ -175,7 +175,7 @@ void ScMoveTableDlg::CheckNewTabName() if ( bFound ) { - pFtWarn->Show(true); + pFtWarn->Show(); pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetText(msStrTabNameUsed); pBtnOk->Disable(); diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 1244b093c6a5..080e8c4eeed1 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -109,20 +109,20 @@ void ScRetypePassDlg::SetDataFromDocument(const ScDocument& rDoc) maTableItems.push_back(aTabItem); VclPtr<VclHBox> pSheet = VclPtr<VclHBox>::Create(mpSheetsBox, false, 12); - pSheet->Show(true); + pSheet->Show(); VclPtr<FixedText> pFtSheetName = VclPtr<FixedText>::Create(pSheet); - pFtSheetName->Show(true); + pFtSheetName->Show(); pFtSheetName->SetStyle(WB_VCENTER); FixedText* pFtSheetStatus = VclPtr<FixedText>::Create(pSheet); - pFtSheetStatus->Show(true); + pFtSheetStatus->Show(); pFtSheetStatus->SetStyle(WB_VCENTER); VclPtr<PushButton> pBtnSheet = VclPtr<PushButton>::Create(static_cast<vcl::Window*>(pSheet)); pBtnSheet->SetText(ScResId(STR_RETYPE)); pBtnSheet->SetClickHdl(LINK(this, ScRetypePassDlg, RetypeBtnHdl)); pBtnSheet->Disable(); - pBtnSheet->Show(true); + pBtnSheet->Show(); maSheets.push_back(pSheet); } diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 30b77beaae85..4f0d33adc2c2 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -119,7 +119,7 @@ void ScRangeManagerTable::setInitListener( InitListener* pListener ) void ScRangeManagerTable::addEntry(const ScRangeNameLine& rLine, bool bSetCurEntry) { - SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(rLine), TREELIST_APPEND, 0xffff); + SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(rLine)); if (bSetCurEntry) SetCurEntry(pEntry); } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 7ddc4c8719c2..862a59367c78 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -216,7 +216,7 @@ void ScCalcOptionsDialog::CoupleEmptyAsZeroToStringConversion() case ScCalcConfig::StringConversion::LOCALE: // Reset to the value the user selected before. maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero; - mpEmptyAsZero->Enable(true); + mpEmptyAsZero->Enable(); mpEmptyAsZero->Check( mbSelectedEmptyStringAsZero); break; } diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index d1a12fc96939..1b87ed40a282 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -234,7 +234,7 @@ void ScEditWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& r pEdView->Paint(rRect); if( HasFocus() ) - pEdView->ShowCursor(true); + pEdView->ShowCursor(); } void ScEditWindow::MouseMove( const MouseEvent& rMEvt ) @@ -282,7 +282,7 @@ void ScEditWindow::Command( const CommandEvent& rCEvt ) void ScEditWindow::GetFocus() { - pEdView->ShowCursor(true); + pEdView->ShowCursor(); pActiveEdWnd = this; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index d0776bdfd3ba..7f308af58276 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -68,7 +68,7 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, #define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl) #define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl) -#define WAS_DEFAULT(w,s) (SfxItemState::DEFAULT==(s).GetItemState((w),true)) +#define WAS_DEFAULT(w,s) (SfxItemState::DEFAULT==(s).GetItemState((w))) #define GET_BOOL(sid,set) static_cast<const SfxBoolItem&>((set).Get(GetWhich((sid)))).GetValue() #define GET_USHORT(sid,set) (sal_uInt16)static_cast<const SfxUInt16Item&>((set).Get(GetWhich((sid)))).GetValue() #define GET_SHOW(sid,set) ( ScVObjMode( static_cast<const ScViewObjectModeItem&>((set).Get(GetWhich((sid)))).GetValue() ) \ @@ -185,7 +185,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) // scaling: nWhich = GetWhich(SID_SCATTR_PAGE_SCALE); - if ( rCoreSet->GetItemState( nWhich, true ) >= SfxItemState::DEFAULT ) + if ( rCoreSet->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { sal_uInt16 nScale = static_cast<const SfxUInt16Item&>(rCoreSet->Get(nWhich)).GetValue(); if( nScale > 0 ) @@ -194,7 +194,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO); - if ( rCoreSet->GetItemState( nWhich, true ) >= SfxItemState::DEFAULT ) + if ( rCoreSet->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet->Get( nWhich ) ); sal_uInt16 nWidth = rItem.GetWidth(); @@ -210,7 +210,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES); - if ( rCoreSet->GetItemState( nWhich, true ) >= SfxItemState::DEFAULT ) + if ( rCoreSet->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { sal_uInt16 nPages = static_cast<const SfxUInt16Item&>(rCoreSet->Get(nWhich)).GetValue(); if( nPages > 0 ) diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 023f52971bd4..2815372168d3 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -321,7 +321,7 @@ void ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) pPasteUndo->Repeat( rTarget ); } else - static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->InsertCells( eCmd, true ); + static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->InsertCells( eCmd ); } } @@ -1388,7 +1388,7 @@ void ScUndoDragDrop::Redo() // do not clone objects and note captions into clipdoc (see above) // but at least copy notes ScClipParam aClipParam(aSrcRange, bCut); - rDoc.CopyToClip(aClipParam, pClipDoc.get(), &aSourceMark, false, bKeepScenarioFlags, false, true); + rDoc.CopyToClip(aClipParam, pClipDoc.get(), &aSourceMark, false, bKeepScenarioFlags); if (bCut) { diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index bf35142c4f6f..2cc11515ec69 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -164,7 +164,7 @@ void ScUndoWidthOrHeight::Redo() void ScUndoWidthOrHeight::Repeat(SfxRepeatTarget& rTarget) { if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) - static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, true ); + static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize ); } bool ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 27fd815e32cc..4ad03d771fc9 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -488,7 +488,7 @@ void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) if (pLineOuter) rViewShell.ApplyPatternLines( *pApplyPattern, pLineOuter, pLineInner ); else - rViewShell.ApplySelectionPattern( *pApplyPattern, true ); + rViewShell.ApplySelectionPattern( *pApplyPattern ); } } @@ -761,7 +761,7 @@ void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); bool bCont = false; - rViewShell.MergeCells( false, bCont, true ); + rViewShell.MergeCells( false, bCont ); } } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index d95a94422d9e..205d90285751 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -136,9 +136,9 @@ void ScUndoCursorAttr::DoChange( const ScPatternAttr* pWhichPattern, const share } const SfxItemSet& rApplySet = pApplyPattern->GetItemSet(); - bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, true ) != SfxItemState::DEFAULT || - rApplySet.GetItemState( ATTR_CONDITIONAL, true ) != SfxItemState::DEFAULT ); - bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, true ) != SfxItemState::DEFAULT ); + bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW ) != SfxItemState::DEFAULT || + rApplySet.GetItemState( ATTR_CONDITIONAL ) != SfxItemState::DEFAULT ); + bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY ) != SfxItemState::DEFAULT ); sal_uInt16 nFlags = SC_PF_TESTMERGE; if (bPaintExt) @@ -564,9 +564,9 @@ void ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget) ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); if (bInsert) - rViewShell.InsertPageBreak(bColumn, true); + rViewShell.InsertPageBreak(bColumn); else - rViewShell.DeletePageBreak(bColumn, true); + rViewShell.DeletePageBreak(bColumn); } } diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index e34fac8894c2..47731ec9a4e3 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -315,7 +315,7 @@ void ScUndoOutlineLevel::Redo() void ScUndoOutlineLevel::Repeat(SfxRepeatTarget& rTarget) { if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) - static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, true ); + static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->SelectLevel( bColumns, nLevel ); } bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 2bec7444755f..d31c882681e9 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2265,8 +2265,6 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRang OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXMLRange ) throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { - const sal_Unicode cSep = ' '; - if (!m_pDocument) { // #i74062# When loading flat XML, this is called before the referenced sheets are in the document, @@ -2277,7 +2275,7 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXM while( nOffset >= 0 ) { OUString sToken; - ScRangeStringConverter::GetTokenByOffset( sToken, sXMLRange, nOffset, cSep ); + ScRangeStringConverter::GetTokenByOffset( sToken, sXMLRange, nOffset ); if( nOffset >= 0 ) { // convert one address (remove dots) diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index fd077f61929f..337d98514d14 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -153,7 +153,7 @@ static bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, aSourceMark.SelectOneTable( nSrcTab ); // for CopyToClip aSourceMark.SetMarkArea( rSrcRange ); ScClipParam aClipParam(rSrcRange, false); - pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark, false); + pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark); if ( pClipDoc->HasAttrib( 0,0,nSrcTab, MAXCOL,MAXROW,nSrcTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index f190dc4fc8f8..3244d4596e5d 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1160,7 +1160,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - std::unique_ptr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent(), false)); + std::unique_ptr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent())); OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) bColumns = pDlg->GetColsChecked(); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index f087fe8f149d..dca465866afb 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -1130,7 +1130,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) // underline - SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, true ); + SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE ); if ( eState == SfxItemState::DONTCARE ) { rSet.InvalidateItem( SID_ULINE_VAL_NONE ); @@ -1172,7 +1172,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) pViewData->GetBindings().Invalidate( SID_SET_SUPER_SCRIPT ); pViewData->GetBindings().Invalidate( SID_SET_SUB_SCRIPT ); - eState = aAttribs.GetItemState( EE_CHAR_KERNING, true ); + eState = aAttribs.GetItemState( EE_CHAR_KERNING ); pViewData->GetBindings().Invalidate( SID_ATTR_CHAR_KERNING ); if ( eState == SfxItemState::DONTCARE ) { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index d2f8e91b215b..2f192fbc33ac 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2175,7 +2175,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) // underline - eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true ); + eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE ); if ( eState == SfxItemState::DONTCARE ) { rSet.InvalidateItem( SID_ULINE_VAL_NONE ); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index f3c878a16da0..d36dbb54eb76 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -170,7 +170,7 @@ public: void SetShrinkScale( long nScale, SvtScriptType nScript ); bool HasCondHeight() const { return pCondSet && SfxItemState::SET == - pCondSet->GetItemState( ATTR_FONT_HEIGHT, true ); } + pCondSet->GetItemState( ATTR_FONT_HEIGHT ); } bool HasEditCharacters() const; @@ -1432,7 +1432,7 @@ static SvxCellHorJustify getAlignmentFromContext( SvxCellHorJustify eInHorJust, void ScOutputData::DrawStrings( bool bPixelToLogic ) { - LayoutStrings(bPixelToLogic, true); + LayoutStrings(bPixelToLogic); } Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScAddress &rAddress) @@ -3022,7 +3022,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) if ( eType != OUTTYPE_PRINTER || ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) || ( rParam.mpCondSet && SfxItemState::SET == - rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) ) + rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT) ) ) bClip = true; else bSimClip = true; @@ -3234,7 +3234,7 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const Size& aCellSize, if ( eType != OUTTYPE_PRINTER || ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) || ( rParam.mpCondSet && SfxItemState::SET == - rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) ) + rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT) ) ) bClip = true; else bSimClip = true; @@ -3996,7 +3996,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) if ( eType != OUTTYPE_PRINTER || ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) || ( rParam.mpCondSet && SfxItemState::SET == - rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) ) + rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT) ) ) bClip = true; else bSimClip = true; @@ -4342,7 +4342,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) if ( eType != OUTTYPE_PRINTER || ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) || ( rParam.mpCondSet && SfxItemState::SET == - rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) ) + rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT) ) ) bClip = true; else bSimClip = true; diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index b9830d1eee98..acbb0f3c95d7 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -776,7 +776,7 @@ void ScHeaderFunctionSet::CreateAnchor() pView->DoneBlockMode( true ); if (bColumn) { - pView->InitBlockMode( static_cast<SCCOL>(nCursorPos), 0, pViewData->GetTabNo(), true, true, false ); + pView->InitBlockMode( static_cast<SCCOL>(nCursorPos), 0, pViewData->GetTabNo(), true, true ); pView->MarkCursor( static_cast<SCCOL>(nCursorPos), MAXROW, pViewData->GetTabNo() ); } else diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 75cf372ef135..f6a4a9de8f7e 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -463,7 +463,7 @@ void ScTabControl::DoDrag( const vcl::Region& /* rRegion */ ) ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); ScClipParam aClipParam(aTabRange, false); - rDoc.CopyToClip(aClipParam, pClipDoc, &aTabMark, false); + rDoc.CopyToClip(aClipParam, pClipDoc, &aTabMark); TransferableObjectDescriptor aObjDesc; pDocSh->FillTransferableObjectDescriptor( aObjDesc ); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 9f808d0fd16b..eec6a8a594b9 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2088,7 +2088,7 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, { rDoc.CreateValidTabNames(aNames, nCount); } - if (rDoc.InsertTabs(nTab, aNames, false)) + if (rDoc.InsertTabs(nTab, aNames)) { pDocSh->Broadcast( ScTablesHint( SC_TABS_INSERTED, nTab, nCount ) ); bFlag = true; diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 8e17d82cdf80..7eb9aa62af12 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -683,7 +683,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran PasteDataFormat( nFormatId, aDataHelper.GetTransferable(), GetViewData().GetCurX(), GetViewData().GetCurY(), - NULL, false ); + NULL ); } } } @@ -1225,7 +1225,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, if ( bCutMode ) { pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, false ); + pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1 ); pUndoData = new ScRefUndoData( pDoc ); } @@ -1512,7 +1512,7 @@ bool ScViewFunc::PasteMultiRangesFromClip( if (pDoc->IsUndoEnabled()) { pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO)); - pUndoDoc->InitUndoSelected(pDoc, aMark, false); + pUndoDoc->InitUndoSelected(pDoc, aMark); pDoc->CopyToDocument(aMarkedRange, nUndoFlags, false, pUndoDoc.get(), &aMark); } @@ -1522,7 +1522,7 @@ bool ScViewFunc::PasteMultiRangesFromClip( if ( nFlags & IDF_CONTENTS ) { pMixDoc.reset(new ScDocument(SCDOCMODE_UNDO)); - pMixDoc->InitUndoSelected(pDoc, aMark, false); + pMixDoc->InitUndoSelected(pDoc, aMark); pDoc->CopyToDocument(aMarkedRange, IDF_CONTENTS, false, pMixDoc.get(), &aMark); } } @@ -1658,7 +1658,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges( if (pDoc->IsUndoEnabled()) { pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO)); - pUndoDoc->InitUndoSelected(pDoc, aMark, false); + pUndoDoc->InitUndoSelected(pDoc, aMark); for (size_t i = 0, n = aRanges.size(); i < n; ++i) { pDoc->CopyToDocument( @@ -1672,7 +1672,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges( if (nFlags & IDF_CONTENTS) { pMixDoc.reset(new ScDocument(SCDOCMODE_UNDO)); - pMixDoc->InitUndoSelected(pDoc, aMark, false); + pMixDoc->InitUndoSelected(pDoc, aMark); for (size_t i = 0, n = aRanges.size(); i < n; ++i) { pDoc->CopyToDocument( diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 23652346988c..2a3050616d9c 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -325,7 +325,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) EditView* pTableView = pInputHdl->GetTableView(); if (pTableView) pTableView->InsertText( aString); - pInputHdl->DataChanged( false ); + pInputHdl->DataChanged(); } else { diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 1dd1cb45b0dc..58bfb8a38976 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1101,9 +1101,9 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, // New alignment is checked (check in PostPaint isn't enough) in case a right // alignment is changed to left. const SfxItemSet& rNewSet = rAttr.GetItemSet(); - bool bSetLines = rNewSet.GetItemState( ATTR_BORDER, true ) == SfxItemState::SET || - rNewSet.GetItemState( ATTR_SHADOW, true ) == SfxItemState::SET; - bool bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, true ) == SfxItemState::SET; + bool bSetLines = rNewSet.GetItemState( ATTR_BORDER ) == SfxItemState::SET || + rNewSet.GetItemState( ATTR_SHADOW ) == SfxItemState::SET; + bool bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY ) == SfxItemState::SET; sal_uInt16 nExtFlags = 0; if ( bSetLines ) @@ -1661,7 +1661,7 @@ void ScViewFunc::DeleteMulti( bool bRows, bool bRecord ) // all Formulas because of references SCTAB nTabCount = rDoc.GetTableCount(); - pUndoDoc->AddUndoTab( 0, nTabCount-1, false ); + pUndoDoc->AddUndoTab( 0, nTabCount-1 ); rDoc.CopyToDocument( 0,0,0, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA,false,pUndoDoc ); pUndoData = new ScRefUndoData( &rDoc ); @@ -2415,7 +2415,7 @@ void ScViewFunc::SetNumberFormat( short nFormatType, sal_uLong nAdd ) SfxItemSet& rSet = aNewAttrs.GetItemSet(); rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumberFormat ) ); // ATTR_LANGUAGE_FORMAT not - ApplySelectionPattern( aNewAttrs, true ); + ApplySelectionPattern( aNewAttrs ); } void ScViewFunc::SetNumFmtByStr( const OUString& rCode ) @@ -2460,7 +2460,7 @@ void ScViewFunc::SetNumFmtByStr( const OUString& rCode ) SfxItemSet& rSet = aNewAttrs.GetItemSet(); rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumberFormat ) ); rSet.Put( SvxLanguageItem( eLanguage, ATTR_LANGUAGE_FORMAT ) ); - ApplySelectionPattern( aNewAttrs, true ); + ApplySelectionPattern( aNewAttrs ); } //! else return error / issue warning ??? @@ -2594,7 +2594,7 @@ void ScViewFunc::ChangeNumFmtDecimals( bool bIncrement ) SfxItemSet& rSet = aNewAttrs.GetItemSet(); rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) ); // ATTR_LANGUAGE_FORMAT not - ApplySelectionPattern( aNewAttrs, true ); + ApplySelectionPattern( aNewAttrs ); } } @@ -2778,9 +2778,9 @@ void ScViewFunc::UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAt if ( pAttr ) { const SfxItemSet& rNewSet = pAttr->GetItemSet(); - bSetLines = rNewSet.GetItemState( ATTR_BORDER, true ) == SfxItemState::SET || - rNewSet.GetItemState( ATTR_SHADOW, true ) == SfxItemState::SET; - bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, true ) == SfxItemState::SET; + bSetLines = rNewSet.GetItemState( ATTR_BORDER ) == SfxItemState::SET || + rNewSet.GetItemState( ATTR_SHADOW ) == SfxItemState::SET; + bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY ) == SfxItemState::SET; } sal_uInt16 nExtFlags = 0; |