diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-10 10:44:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-10 13:00:14 +0200 |
commit | 4d047221945b34a9023d852bbd19a2a24a7f54c3 (patch) | |
tree | b5d0e2a6dd26bc0c01f286d75c4d0be6506bd913 /sc | |
parent | 39f023f054b0923f786cd34225235536d81138b5 (diff) |
loplugin:checkunusedparams in sc(part4)
also fix bug in ScDocShell::DBAreaDeleted which has been there ever
since it's initial commit in
commit 9ae5a91f7955e44d3b24a3f7741f9bca02ac7f24
Author: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon Sep 18 16:07:07 2000 +0000
initial import
Change-Id: Ifc8d6dec4843c668404fdf1ca1a9e521f73132d5
Reviewed-on: https://gerrit.libreoffice.org/37459
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
31 files changed, 82 insertions, 89 deletions
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx index 04e7c595be8a..a899ae468099 100644 --- a/sc/qa/unit/bugfix-test.cxx +++ b/sc/qa/unit/bugfix-test.cxx @@ -59,7 +59,7 @@ void ScFiltersTest::testTdf64229() { ScDocShellRef xDocSh = loadDoc("fdo64229b.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); CPPUNIT_ASSERT_MESSAGE("Failed to load fdo64229b.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -77,7 +77,7 @@ void ScFiltersTest::testTdf36933() { ScDocShellRef xDocSh = loadDoc("fdo36933test.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); CPPUNIT_ASSERT_MESSAGE("Failed to load fdo36933test.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -95,7 +95,7 @@ void ScFiltersTest::testTdf43700() { ScDocShellRef xDocSh = loadDoc("fdo43700test.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43700test.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -113,7 +113,7 @@ void ScFiltersTest::testTdf43534() { ScDocShellRef xDocSh = loadDoc("fdo43534test.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43534test.*", xDocSh.is()); // ScDocument& rDoc = xDocSh->GetDocument(); @@ -172,7 +172,7 @@ void ScFiltersTest::testTdf40110() ScDocShellRef xDocSh = loadDoc("fdo40110test.", FORMAT_ODS); CPPUNIT_ASSERT_MESSAGE("Failed to load fdo40110test.*", xDocSh.Is()); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -191,7 +191,7 @@ void ScFiltersTest::testTdf98657() ScDocShellRef xDocSh = loadDoc("tdf98657.", FORMAT_ODS); ScDocument& rDoc = xDocSh->GetDocument(); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); // this was a NaN before the fix CPPUNIT_ASSERT_EQUAL(double(285.0), rDoc.GetValue(ScAddress(1, 1, 0))); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 556d2bed6e3b..0548f1030360 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -189,7 +189,7 @@ void ScFiltersTest::testRangeNameODS() CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-global.*", xDocSh.is()); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testRangeNameImpl(rDoc); @@ -252,7 +252,7 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat ) //same code for ods, void ScFiltersTest::testContentODS() { ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_ODS); @@ -262,7 +262,7 @@ void ScFiltersTest::testContentODS() void ScFiltersTest::testContentXLS() { ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_XLS); @@ -272,7 +272,7 @@ void ScFiltersTest::testContentXLS() void ScFiltersTest::testContentXLSX() { ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLSX); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_XLSX); @@ -282,7 +282,7 @@ void ScFiltersTest::testContentXLSX() void ScFiltersTest::testContentXLSXStrict() { ScDocShellRef xDocSh = loadDoc("universal-content-strict.", FORMAT_XLSX); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_XLSX); @@ -292,7 +292,7 @@ void ScFiltersTest::testContentXLSXStrict() void ScFiltersTest::testContentLotus123() { ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_LOTUS123); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_LOTUS123); @@ -310,7 +310,7 @@ void ScFiltersTest::testContentDIF() void ScFiltersTest::testContentXLSB() { ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLSB); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_XLSB); @@ -332,7 +332,7 @@ void ScFiltersTest::testSharedFormulaXLS() ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", FORMAT_XLS); CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); // Check the results of formula cells in the shared formula range. for (SCROW i = 1; i <= 18; ++i) { @@ -388,7 +388,7 @@ void ScFiltersTest::testSharedFormulaXLSX() { ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", FORMAT_XLSX); ScDocument& rDoc = xDocSh->GetDocument(); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); // Check the results of formula cells in the shared formula range. for (SCROW i = 1; i <= 18; ++i) { diff --git a/sc/qa/unit/functions_test.cxx b/sc/qa/unit/functions_test.cxx index bed9aa096815..ac9a430a96e7 100644 --- a/sc/qa/unit/functions_test.cxx +++ b/sc/qa/unit/functions_test.cxx @@ -36,7 +36,7 @@ bool FunctionsTest::load(const OUString& rFilter, const OUString& rURL, OUString(), nFilterFlags, nClipboardID, nFilterVersion ); CPPUNIT_ASSERT(xDocShRef.is()); - xDocShRef->DoHardRecalc(true); + xDocShRef->DoHardRecalc(); ScDocument& rDoc = xDocShRef->GetDocument(); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index b003ca5222f1..989623b065bc 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -3321,10 +3321,10 @@ void ScExportTest::testImageWithSpecialID() void ScExportTest::testSheetLocalRangeNameXLS() { ScDocShellRef xDocSh = loadDoc("named-ranges-local.", FORMAT_XLS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLS); xDocSh->DoClose(); - xDocSh2->DoHardRecalc(true); + xDocSh2->DoHardRecalc(); ScDocument& rDoc = xDocSh2->GetDocument(); ScRangeName* pRangeName = rDoc.GetRangeName(0); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index e1949476840a..84d4762fb562 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -460,7 +460,7 @@ void ScFiltersTest::testBooleanFormatXLSX() void ScFiltersTest::testRangeNameXLS() { ScDocShellRef xDocSh = loadDoc("named-ranges-global.", FORMAT_XLS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testRangeNameImpl(rDoc); @@ -477,7 +477,7 @@ void ScFiltersTest::testRangeNameXLS() void ScFiltersTest::testRangeNameLocalXLS() { ScDocShellRef xDocSh = loadDoc("named-ranges-local.", FORMAT_XLS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); ScRangeName* pRangeName = rDoc.GetRangeName(0); @@ -498,7 +498,7 @@ void ScFiltersTest::testRangeNameLocalXLS() void ScFiltersTest::testRangeNameXLSX() { ScDocShellRef xDocSh = loadDoc("named-ranges-global.", FORMAT_XLSX); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); testRangeNameImpl(rDoc); @@ -521,7 +521,7 @@ void ScFiltersTest::testHyperlinksXLSX() void ScFiltersTest::testHardRecalcODS() { ScDocShellRef xDocSh = loadDoc("hard-recalc.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); CPPUNIT_ASSERT_MESSAGE("Failed to load hard-recalc.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -538,7 +538,7 @@ void ScFiltersTest::testHardRecalcODS() void ScFiltersTest::testFunctionsODS() { ScDocShellRef xDocSh = loadDoc("functions.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -570,7 +570,7 @@ void ScFiltersTest::testFunctionsODS() xDocSh = loadDoc("database-functions.", FORMAT_ODS); CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc2 = xDocSh->GetDocument(); createCSVPath("database-functions.", aCSVFileName); @@ -580,7 +580,7 @@ void ScFiltersTest::testFunctionsODS() xDocSh = loadDoc("date-time-functions.", FORMAT_ODS); CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc3 = xDocSh->GetDocument(); createCSVPath("date-time-functions.", aCSVFileName); testFile(aCSVFileName, rDoc3, 0, StringType::PureString); @@ -589,7 +589,7 @@ void ScFiltersTest::testFunctionsODS() // crashes at exit while unloading StarBasic code // xDocSh = loadDoc("user-defined-function.", FORMAT_ODS); - // xDocSh->DoHardRecalc(true); + // xDocSh->DoHardRecalc(); // ScDocument& rDocUserDef = xDocSh->GetDocument(); // createCSVPath("user-defined-function.", aCSVFileName); // testFile(aCSVFileName, rDocUserDef, 0); @@ -826,7 +826,7 @@ void testDBRanges_Impl(ScDocument& rDoc, sal_Int32 nFormat) void ScFiltersTest::testDatabaseRangesODS() { ScDocShellRef xDocSh = loadDoc("database.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); @@ -837,7 +837,7 @@ void ScFiltersTest::testDatabaseRangesODS() void ScFiltersTest::testDatabaseRangesXLS() { ScDocShellRef xDocSh = loadDoc("database.", FORMAT_XLS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); @@ -848,7 +848,7 @@ void ScFiltersTest::testDatabaseRangesXLS() void ScFiltersTest::testDatabaseRangesXLSX() { ScDocShellRef xDocSh = loadDoc("database.", FORMAT_XLSX); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); @@ -859,7 +859,7 @@ void ScFiltersTest::testDatabaseRangesXLSX() void ScFiltersTest::testFormatsODS() { ScDocShellRef xDocSh = loadDoc("formats.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); @@ -870,7 +870,7 @@ void ScFiltersTest::testFormatsODS() // void ScFiltersTest::testFormatsXLS() // { // ScDocShellRef xDocSh = loadDoc("formats.", FORMAT_XLS); -// xDocSh->DoHardRecalc(true); +// xDocSh->DoHardRecalc(); // // ScDocument& rDoc = xDocSh->GetDocument(); // @@ -881,7 +881,7 @@ void ScFiltersTest::testFormatsODS() // void ScFiltersTest::testFormatsXLSX() // { // ScDocShellRef xDocSh = loadDoc("formats.", FORMAT_XLSX); -// xDocSh->DoHardRecalc(true); +// xDocSh->DoHardRecalc(); // // ScDocument& rDoc = xDocSh->GetDocument(); // @@ -892,7 +892,7 @@ void ScFiltersTest::testFormatsODS() void ScFiltersTest::testMatrixODS() { ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_ODS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); @@ -906,7 +906,7 @@ void ScFiltersTest::testMatrixODS() void ScFiltersTest::testMatrixXLS() { ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_XLS); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1090,7 +1090,7 @@ void ScFiltersTest::testBugFixesODS() ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_ODS); CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.is()); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); ScDocument& rDoc = xDocSh->GetDocument(); { @@ -1126,7 +1126,7 @@ void ScFiltersTest::testBugFixesXLS() ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLS); CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.is()); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); xDocSh->GetDocument(); xDocSh->DoClose(); } @@ -1136,7 +1136,7 @@ void ScFiltersTest::testBugFixesXLSX() ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLSX); CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.is()); - xDocSh->DoHardRecalc(true); + xDocSh->DoHardRecalc(); xDocSh->GetDocument(); xDocSh->DoClose(); } diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 10fd2776b1d9..5baa7de82e58 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -2355,7 +2355,7 @@ class WalkElementBlockOperation { public: - WalkElementBlockOperation(size_t nRowSize, size_t /*nColSize*/, + WalkElementBlockOperation(size_t nRowSize, ScFullMatrix::DoubleOpFunction const & aDoubleFunc, ScFullMatrix::BoolOpFunction const & aBoolFunc, ScFullMatrix::StringOpFunction const & aStringFunc, @@ -2483,7 +2483,7 @@ void ScMatrixImpl::ExecuteOperation(const std::pair<size_t, size_t>& rStartPos, const ScMatrix::BoolOpFunction& aBoolFunc, const ScMatrix::StringOpFunction& aStringFunc, const ScMatrix::EmptyOpFunction& aEmptyFunc) const { - WalkElementBlockOperation aFunc(maMat.size().row, maMat.size().column, + WalkElementBlockOperation aFunc(maMat.size().row, aDoubleFunc, aBoolFunc, aStringFunc, aEmptyFunc); maMat.walk(aFunc, MatrixImplType::size_pair_type(rStartPos.first, rStartPos.second), MatrixImplType::size_pair_type(rEndPos.first, rEndPos.second)); diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index bab9691aa933..92c83e06aaa3 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -561,7 +561,7 @@ void WorkbookFragment::recalcFormulaCells() bHardRecalc = true; if (bHardRecalc) - rDocSh.DoHardRecalc(false); + rDocSh.DoHardRecalc(); else rDoc.CalcFormulaTree(false, true, false); } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 8fca4aee4228..00b60a543531 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -245,7 +245,7 @@ ScDrawTransferObj::~ScDrawTransferObj() delete pDragSourceView; } -ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( vcl::Window* ) +ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard() { ScDrawTransferObj* pObj = SC_MOD()->GetClipData().pDrawClipboard; return pObj; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 77124b7f178e..ca054000676f 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -381,12 +381,12 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) Invalidate(aRect); } -void ScZoomSliderWnd::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) +void ScZoomSliderWnd::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { - DoPaint(rRenderContext, rRect); + DoPaint(rRenderContext); } -void ScZoomSliderWnd::DoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) +void ScZoomSliderWnd::DoPaint(vcl::RenderContext& rRenderContext) { if (mpImpl->mbOmitPaint) return; diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index 111e39c98f7e..4f8e65a71b75 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -22,7 +22,7 @@ namespace sc { -SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 /* nId */ ) : +SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent ) : ModelessDialog(pParent, "SearchResultsDialog", "modules/scalc/ui/searchresults.ui"), mpBindings(_pBindings), mpDoc(nullptr) { @@ -215,7 +215,7 @@ SearchResultsDlgWrapper::SearchResultsDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/ ) : SfxChildWindow(_pParent, nId) { - SetWindow( VclPtr<SearchResultsDlg>::Create(pBindings, _pParent, nId) ); + SetWindow( VclPtr<SearchResultsDlg>::Create(pBindings, _pParent) ); } SearchResultsDlgWrapper::~SearchResultsDlgWrapper() {} diff --git a/sc/source/ui/docshell/dataprovider.cxx b/sc/source/ui/docshell/dataprovider.cxx index f309e791e088..298438062a2f 100644 --- a/sc/source/ui/docshell/dataprovider.cxx +++ b/sc/source/ui/docshell/dataprovider.cxx @@ -230,7 +230,7 @@ void CSVDataProvider::StopImport() void CSVDataProvider::Refresh() { - mpDocShell->DoHardRecalc(true); + mpDocShell->DoHardRecalc(); mpDocShell->SetDocumentModified(); } diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 97ad4203576c..58430ade823b 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -438,7 +438,7 @@ void DataStream::Refresh() double fStart = getNow(); // Hard recalc will repaint the grid area. - mpDocShell->DoHardRecalc(true); + mpDocShell->DoHardRecalc(); mpDocShell->SetDocumentModified(); fTimes[ DebugTime::Recalc ] = getNow() - fStart; diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 7fb1f3a19858..54de8108b568 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star; -bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, bool /* bApi */ ) +bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange ) { ScDocShellModificator aModificator( rDocShell ); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index c00d5ef1ff31..c1097630d48b 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -497,7 +497,7 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const css::uno::Reference< css bHardRecalc = true; if (bHardRecalc) - DoHardRecalc(false); + DoHardRecalc(); else { // still need to recalc volatile formula cells. diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index ac0208c91259..8c08b1ad3b7e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -399,7 +399,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) rReq.Done(); break; case FID_HARD_RECALC: - DoHardRecalc( rReq.IsAPI() ); + DoHardRecalc(); rReq.Done(); break; case SID_UPDATETABLINKS: @@ -1250,7 +1250,7 @@ void ScDocShell::DoRecalc( bool bApi ) } } -void ScDocShell::DoHardRecalc( bool /* bApi */ ) +void ScDocShell::DoHardRecalc() { WaitObject aWaitObj( GetActiveDialogParent() ); ScTabViewShell* pSh = GetBestViewShell(); @@ -1754,8 +1754,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, } } -void ScDocShell::GetStatePageStyle( SfxViewShell& /* rCaller */, - SfxItemSet& rSet, +void ScDocShell::GetStatePageStyle( SfxItemSet& rSet, SCTAB nCurTab ) { SfxWhichIter aIter(rSet); @@ -2180,10 +2179,13 @@ bool ScDocShell::DdeSetData( const OUString& rItem, if( aDdeTextFmt == "CSV" || aDdeTextFmt == "FCSV" ) aObj.SetSeparator( ',' ); - return ScImportExport::ImportData( rMimeType, rValue ); + OSL_ENSURE( false, "Implementation is missing" ); + return false; } - ScImportExport aObj( &aDocument, rItem ); - return aObj.IsRef() && ScImportExport::ImportData( rMimeType, rValue ); + /*ScImportExport aObj( &aDocument, rItem ); + return aObj.IsRef() && ScImportExport::ImportData( rMimeType, rValue );*/ + OSL_ENSURE( false, "Implementation is missing" ); + return false; } #endif diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 3189ef191073..f69cbeb66f5c 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -96,11 +96,11 @@ bool ScDocShell::IsEditable() const return !IsReadOnly() || aDocument.IsImportingXML() || aDocument.IsChangeReadOnlyEnabled(); } -void ScDocShell::DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW /* nY2 */ ) +void ScDocShell::DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) { ScDocShellModificator aModificator( *this ); - aDocument.RemoveFlagsTab( nX1, nY1, nX2, nY1, nTab, ScMF::Auto ); - PostPaint( nX1, nY1, nTab, nX2, nY1, nTab, PaintPartFlags::Grid ); + aDocument.RemoveFlagsTab( nX1, nY1, nX2, nY2, nTab, ScMF::Auto ); + PostPaint( nX1, nY1, nTab, nX2, nY2, nTab, PaintPartFlags::Grid ); // No SetDocumentModified, as the unnamed database range might have to be restored later. // The UNO hint is broadcast directly instead, to keep UNO objects in valid state. aDocument.BroadcastUno( SfxHint( SfxHintId::DataChanged ) ); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 47ea37a8dc8d..1f2444ea7b7e 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -263,13 +263,6 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } -bool ScImportExport::ImportData( const OUString& /* rMimeType */, - const css::uno::Any & /* rValue */ ) -{ - OSL_ENSURE( false, "Implementation is missing" ); - return false; -} - bool ScImportExport::ExportData( const OUString& rMimeType, css::uno::Any & rValue ) { diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index 298d390e9372..d720301086b3 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -76,7 +76,7 @@ public: void DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, bool bRecord, bool bApi ); - bool AddDBRange( const OUString& rName, const ScRange& rRange, bool bApi ); + bool AddDBRange( const OUString& rName, const ScRange& rRange ); bool DeleteDBRange( const OUString& rName ); bool RenameDBRange( const OUString& rOld, const OUString& rNew ); void ModifyDBData( const ScDBData& rNewData ); // Name unveraendert diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index de82e9377fe4..ca86aa8b2ac1 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -228,7 +228,7 @@ public: void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); - void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab ); + void GetStatePageStyle( SfxItemSet& rSet, SCTAB nCurTab ); void CompareDocument( ScDocument& rOtherDoc ); void MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, sal_uLong nOffset = 0, ScChangeActionMergeMap* pMergeMap = nullptr, bool bInverseMap = false ); @@ -277,7 +277,7 @@ public: bool MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRecord ); void DoRecalc( bool bApi ); - void DoHardRecalc( bool bApi ); + void DoHardRecalc(); void UpdateOle( const ScViewData* pViewData, bool bSnapSize = false); bool IsOle(); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 300e99425002..50761858b81e 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -95,7 +95,7 @@ public: SdrView* GetDragSourceView() { return pDragSourceView; } ScDragSrc GetDragSourceFlags() const { return nDragSourceFlags; } - static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); + static ScDrawTransferObj* GetOwnClipboard(); virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index b0be3efd67e9..609bc3daed64 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -126,8 +126,6 @@ public: bool ImportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId ); bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId ); - static bool ImportData( const OUString& rMimeType, - const css::uno::Any & rValue ); bool ExportData( const OUString& rMimeType, css::uno::Any & rValue ); diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index e545f6eb746b..ae9707ef2ac4 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -29,7 +29,7 @@ class SearchResultsDlg : public ModelessDialog DECL_LINK( ListSelectHdl, SvTreeListBox*, void ); public: - SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); + SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent ); virtual ~SearchResultsDlg() override; virtual void dispose() override; diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index faa56f6e5ba0..43194bb5b11b 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -47,7 +47,7 @@ private: sal_uInt16 Offset2Zoom(long nOffset) const; long Zoom2Offset(sal_uInt16 nZoom) const; - void DoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); + void DoPaint(vcl::RenderContext& rRenderContext); public: ScZoomSliderWnd(vcl::Window* pParent, const css::uno::Reference<css::frame::XDispatchProvider >& rDispatchProvider, diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index e9a4b2877568..a5dff8e25d20 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -2192,7 +2192,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, ScRange aNameRange( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet, (SCCOL)aRange.EndColumn, (SCROW)aRange.EndRow, aRange.Sheet ); - bDone = aFunc.AddDBRange( aName, aNameRange, true ); + bDone = aFunc.AddDBRange( aName, aNameRange ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified @@ -2351,7 +2351,7 @@ void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRan OUString aString(STR_DB_LOCAL_NONAME); ScRange aUnnamedRange( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet, (SCCOL)aRange.EndColumn, (SCROW)aRange.EndRow, aRange.Sheet ); - bDone = aFunc.AddDBRange( aString, aUnnamedRange, true ); + bDone = aFunc.AddDBRange( aString, aUnnamedRange ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index d44110def97e..49e3e0633d1b 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1953,7 +1953,7 @@ void SAL_CALL ScModelObj::calculateAll() { SolarMutexGuard aGuard; if (pDocShell) - pDocShell->DoHardRecalc(true); + pDocShell->DoHardRecalc(); else { OSL_FAIL("no DocShell"); //! throw exception? @@ -2291,7 +2291,7 @@ void SAL_CALL ScModelObj::setPropertyValue( rDoc.SetDocOptions( aNewOpt ); //! Recalc only for options that need it? if ( bHardRecalc ) - pDocShell->DoHardRecalc( true ); + pDocShell->DoHardRecalc(); pDocShell->SetDocumentModified(); } } diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 4e286e323a4a..cd65b89645e1 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -423,7 +423,7 @@ static bool lcl_TestFormat( SvxClipboardFormatItem& rFormats, const Transferable void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats ) { vcl::Window* pWin = GetViewData()->GetActiveWin(); - bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != nullptr ); + bool bDraw = ScDrawTransferObj::GetOwnClipboard() != nullptr; TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); @@ -456,7 +456,7 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats static bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) { bool bPossible = false; - if ( ScTransferObj::GetOwnClipboard( nullptr ) || ScDrawTransferObj::GetOwnClipboard( nullptr ) ) + if ( ScTransferObj::GetOwnClipboard( nullptr ) || ScDrawTransferObj::GetOwnClipboard() ) bPossible = true; else { diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index ee3d5b714361..05f6397a4ed3 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1308,7 +1308,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { vcl::Window* pWin = GetViewData()->GetActiveWin(); bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != nullptr ); - bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != nullptr ); + bool bDraw = ( ScDrawTransferObj::GetOwnClipboard() != nullptr ); bool bOle = ( nFormat == SotClipboardFormatId::EMBED_SOURCE ); if ( bCells && bOle ) @@ -1560,7 +1560,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) bool bRet=true; { WaitObject aWait( GetViewData()->GetDialogParent() ); - bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != nullptr ); + bool bDraw = ( ScDrawTransferObj::GetOwnClipboard() != nullptr ); if ( bDraw && nFormat == SotClipboardFormatId::EMBED_SOURCE ) pTabViewShell->PasteDraw(); else @@ -1587,7 +1587,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } else // draw objects or external data { - bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != nullptr ); + bool bDraw = ( ScDrawTransferObj::GetOwnClipboard() != nullptr ); SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); GetPossibleClipboardFormats( aFormats ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 30bd7a7b27b5..06a4d189cf29 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -782,7 +782,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet ) { case SID_STATUS_PAGESTYLE: case SID_HFEDIT: - pDocShell->GetStatePageStyle( *this, rSet, nTab ); + pDocShell->GetStatePageStyle( rSet, nTab ); break; case SID_UNDO: case SID_REDO: diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index a5672100d1b4..1c829ef195c9 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -209,7 +209,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) case SID_STATUS_PAGESTYLE: case SID_HFEDIT: - GetViewData().GetDocShell()->GetStatePageStyle( *this, rSet, nTab ); + GetViewData().GetDocShell()->GetStatePageStyle( rSet, nTab ); break; case SID_SEARCH_ITEM: diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index f11b69af8afd..67bef8e7db04 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -448,7 +448,7 @@ void ScViewFunc::PasteDraw() vcl::Window* pWin = GetActiveWin(); Point aPos = pWin->PixelToLogic( rViewData.GetScrPos( nPosX, nPosY, rViewData.GetActivePart() ) ); - ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard( pWin ); + ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard(); if (pDrawClip) { OUString aSrcShellID = pDrawClip->GetShellID(); @@ -463,7 +463,7 @@ void ScViewFunc::PasteFromSystem() vcl::Window* pWin = GetActiveWin(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); - ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard( pWin ); + ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard(); if (pOwnClip) { diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 66049684ddef..5b2b35d2f043 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -250,7 +250,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, ScDocument* pDocument = GetViewData().GetDocument(); ScDocShell* pDocShell = GetViewData().GetDocShell(); ScModelObj* pModelObj = ( pDocShell ? ScModelObj::getImplementation( pDocShell->GetModel() ) : nullptr ); - ScDrawTransferObj* pTransferObj = ScDrawTransferObj::GetOwnClipboard( nullptr ); + ScDrawTransferObj* pTransferObj = ScDrawTransferObj::GetOwnClipboard(); if ( pDocument && pPage && pModelObj && ( pTransferObj || pDrawTrans ) ) { const ScRangeListVector& rProtectedChartRangesVector( |