From a5eddf3b047dca78ea321005cc6dc5e92914e032 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 3 Feb 2022 11:35:12 +0200 Subject: sal_uLong->sal_Int32 for refresh delay and improve the naming of the related methods and variables Change-Id: I1dc522090b0353fd4c63e74864a0deeb8d70fd28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129404 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/ui/attrdlg/scdlgfact.cxx | 8 ++++---- sc/source/ui/attrdlg/scdlgfact.hxx | 4 ++-- sc/source/ui/docshell/arealink.cxx | 24 ++++++++++++------------ sc/source/ui/docshell/docfunc.cxx | 8 ++++---- sc/source/ui/docshell/tablink.cxx | 20 ++++++++++---------- sc/source/ui/inc/areasave.hxx | 2 +- sc/source/ui/inc/cellsh.hxx | 2 +- sc/source/ui/inc/docfunc.hxx | 2 +- sc/source/ui/inc/linkarea.hxx | 4 ++-- sc/source/ui/miscdlgs/linkarea.cxx | 10 +++++----- sc/source/ui/undo/areasave.cxx | 6 +++--- sc/source/ui/unoobj/datauno.cxx | 2 +- sc/source/ui/unoobj/linkuno.cxx | 22 +++++++++++----------- sc/source/ui/view/cellsh1.cxx | 20 ++++++++++---------- 14 files changed, 67 insertions(+), 67 deletions(-) (limited to 'sc/source/ui') diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 9fbfccaa4d38..909d9fd85a43 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -639,9 +639,9 @@ OUString AbstractScSelEntryDlg_Impl::GetSelectedEntry() const void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - sal_uLong nRefresh ) + sal_Int32 nRefreshDelaySeconds ) { - m_xDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefresh); + m_xDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefreshDelaySeconds); } OUString AbstractScLinkedAreaDlg_Impl::GetURL() @@ -664,9 +664,9 @@ OUString AbstractScLinkedAreaDlg_Impl::GetSource() return m_xDlg->GetSource(); } -sal_uLong AbstractScLinkedAreaDlg_Impl::GetRefresh() +sal_Int32 AbstractScLinkedAreaDlg_Impl::GetRefreshDelaySeconds() { - return m_xDlg->GetRefresh(); + return m_xDlg->GetRefreshDelaySeconds(); } std::unique_ptr AbstractScCondFormatManagerDlg_Impl::GetConditionalFormatList() diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 8c1fea37e998..8eb9dc7a5976 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -335,12 +335,12 @@ public: virtual short Execute() override; virtual void InitFromOldLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - sal_uLong nRefresh ) override; + sal_Int32 nRefreshDelaySeconds ) override; virtual OUString GetURL() override; virtual OUString GetFilter() override; // may be empty virtual OUString GetOptions() override; // filter options virtual OUString GetSource() override; // separated by ";" - virtual sal_uLong GetRefresh() override; // 0 if disabled + virtual sal_Int32 GetRefreshDelaySeconds() override; // 0 if disabled }; class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index c3eab91125db..8d3a89a1659d 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -49,9 +49,9 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, const OUString& rArea, const ScRange& rDest, - sal_uLong nRefresh ) : + sal_Int32 nRefreshDelaySeconds ) : ::sfx2::SvBaseLink(SfxLinkUpdateMode::ONCALL,SotClipboardFormatId::SIMPLE_FILE), - ScRefreshTimer ( nRefresh ), + ScRefreshTimer ( nRefreshDelaySeconds ), m_pDocSh(static_cast(pShell)), aFileName (rFile), aFilterName (rFilter), @@ -78,12 +78,12 @@ void ScAreaLink::Edit(weld::Window* pParent, const Link& /* rE ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScopedVclPtr pDlg(pFact->CreateScLinkedAreaDlg(pParent)); - pDlg->InitFromOldLink( aFileName, aFilterName, aOptions, aSourceArea, GetRefreshDelay() ); + pDlg->InitFromOldLink( aFileName, aFilterName, aOptions, aSourceArea, GetRefreshDelaySeconds() ); if ( pDlg->Execute() == RET_OK ) { aOptions = pDlg->GetOptions(); Refresh( pDlg->GetURL(), pDlg->GetFilter(), - pDlg->GetSource(), pDlg->GetRefresh() ); + pDlg->GetSource(), pDlg->GetRefreshDelaySeconds() ); // copy source data from members (set in Refresh) into link name for dialog OUString aNewLinkName; @@ -125,7 +125,7 @@ void ScAreaLink::Edit(weld::Window* pParent, const Link& /* rE } tools::SvRef const xThis(this); // keep yourself alive - Refresh( aFile, aFilter, aArea, GetRefreshDelay() ); + Refresh( aFile, aFilter, aArea, GetRefreshDelaySeconds() ); } return SUCCESS; @@ -141,7 +141,7 @@ void ScAreaLink::Closed() { m_pDocSh->GetUndoManager()->AddUndoAction( std::make_unique( m_pDocSh, aFileName, aFilterName, aOptions, - aSourceArea, aDestArea, GetRefreshDelay() ) ); + aSourceArea, aDestArea, GetRefreshDelaySeconds() ) ); bAddUndo = false; // only once } @@ -219,7 +219,7 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, const ScDocument& rSrcDoc, const // execute: bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, - const OUString& rNewArea, sal_uLong nNewRefresh ) + const OUString& rNewArea, sal_Int32 nNewRefreshDelaySeconds ) { // load document - like TabLink @@ -421,9 +421,9 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, m_pDocSh->GetUndoManager()->AddUndoAction( std::make_unique( m_pDocSh, aFileName, aFilterName, aOptions, - aSourceArea, aOldRange, GetRefreshDelay(), + aSourceArea, aOldRange, GetRefreshDelaySeconds(), aNewUrl, rNewFilter, aNewOpt, - rNewArea, aNewRange, nNewRefresh, + rNewArea, aNewRange, nNewRefreshDelaySeconds, std::move(pUndoDoc), std::move(pRedoDoc), bDoInsert ) ); } @@ -441,8 +441,8 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, if ( aNewRange != aDestArea ) aDestArea = aNewRange; - if ( nNewRefresh != GetRefreshDelay() ) - SetRefreshDelay( nNewRefresh ); + if ( nNewRefreshDelaySeconds != GetRefreshDelaySeconds() ) + SetRefreshDelay( nNewRefreshDelaySeconds ); SCCOL nPaintEndX = std::max( aOldRange.aEnd.Col(), aNewRange.aEnd.Col() ); SCROW nPaintEndY = std::max( aOldRange.aEnd.Row(), aNewRange.aEnd.Row() ); @@ -492,7 +492,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, IMPL_LINK_NOARG(ScAreaLink, RefreshHdl, Timer *, void) { - Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() ); + Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelaySeconds() ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index be6f7178f094..8ce57f1f832f 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5507,7 +5507,7 @@ void ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd void ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - const ScRange& rDestRange, sal_uLong nRefresh, + const ScRange& rDestRange, sal_Int32 nRefreshDelaySeconds, bool bFitBlock, bool bApi ) { ScDocument& rDoc = rDocShell.GetDocument(); @@ -5544,7 +5544,7 @@ void ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, rDocShell.GetUndoManager()->AddUndoAction( std::make_unique( &rDocShell, pOldArea->GetFile(), pOldArea->GetFilter(), pOldArea->GetOptions(), - pOldArea->GetSource(), pOldArea->GetDestArea(), pOldArea->GetRefreshDelay() ) ); + pOldArea->GetSource(), pOldArea->GetDestArea(), pOldArea->GetRefreshDelaySeconds() ) ); } pLinkManager->Remove( pBase ); nLinkCount = pLinkManager->GetLinks().size(); @@ -5564,7 +5564,7 @@ void ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, ScDocumentLoader::RemoveAppPrefix( aFilterName ); ScAreaLink* pLink = new ScAreaLink( &rDocShell, rFile, aFilterName, - aNewOptions, rSource, rDestRange, nRefresh ); + aNewOptions, rSource, rDestRange, nRefreshDelaySeconds ); OUString aTmp = aFilterName; pLinkManager->InsertFileLink( *pLink, sfx2::SvBaseLinkObjectType::ClientFile, rFile, &aTmp, &rSource ); @@ -5574,7 +5574,7 @@ void ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, { rDocShell.GetUndoManager()->AddUndoAction( std::make_unique( &rDocShell, rFile, aFilterName, aNewOptions, - rSource, rDestRange, nRefresh ) ); + rSource, rDestRange, nRefreshDelaySeconds ) ); if ( nRemoved ) rDocShell.GetUndoManager()->LeaveListAction(); // undo for link update is still separate } diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 59a8a689ac27..a6b9a81d6295 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -63,9 +63,9 @@ struct TableLink_Impl ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, - sal_uLong nRefresh ): + sal_Int32 nRefreshDelaySeconds ): ::sfx2::SvBaseLink(SfxLinkUpdateMode::ONCALL,SotClipboardFormatId::SIMPLE_FILE), - ScRefreshTimer( nRefresh ), + ScRefreshTimer( nRefreshDelaySeconds ), pImpl( new TableLink_Impl ), aFileName(rFile), aFilterName(rFilter), @@ -79,9 +79,9 @@ ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile, ScTableLink::ScTableLink(SfxObjectShell* pShell, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, - sal_uLong nRefresh ): + sal_Int32 nRefreshDelaySeconds ): ::sfx2::SvBaseLink(SfxLinkUpdateMode::ONCALL,SotClipboardFormatId::SIMPLE_FILE), - ScRefreshTimer( nRefresh ), + ScRefreshTimer( nRefreshDelaySeconds ), pImpl( new TableLink_Impl ), aFileName(rFile), aFilterName(rFilter), @@ -129,7 +129,7 @@ void ScTableLink::Edit(weld::Window* pParent, const Link& rEnd ScDocumentLoader::RemoveAppPrefix( aFilter ); if (!bInCreate) - Refresh( aFile, aFilter, nullptr, GetRefreshDelay() ); // don't load twice + Refresh( aFile, aFilter, nullptr, GetRefreshDelaySeconds() ); // don't load twice } return SUCCESS; } @@ -159,7 +159,7 @@ bool ScTableLink::IsUsed() const } bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter, - const OUString* pNewOptions, sal_uLong nNewRefresh ) + const OUString* pNewOptions, sal_Int32 nNewRefreshDelaySeconds ) { // load document @@ -244,7 +244,7 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter, rDoc.CopyToDocument(aRange, InsertDeleteFlags::ALL, false, *pUndoDoc); pUndoDoc->TransferDrawPage( rDoc, nTab, nTab ); pUndoDoc->SetLink( nTab, nMode, aFileName, aFilterName, - aOptions, aTabName, GetRefreshDelay() ); + aOptions, aTabName, GetRefreshDelaySeconds() ); pUndoDoc->SetTabBgColor( nTab, rDoc.GetTabBgColor(nTab) ); } @@ -359,9 +359,9 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter, if ( bNewUrlName || aFilterName != rNewFilter || aOptions != aNewOpt || pNewOptions || - nNewRefresh != GetRefreshDelay() ) + nNewRefreshDelaySeconds != GetRefreshDelaySeconds() ) rDoc.SetLink( nTab, nMode, aNewUrl, rNewFilter, aNewOpt, - aTabName, nNewRefresh ); + aTabName, nNewRefreshDelaySeconds ); } } @@ -408,7 +408,7 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter, IMPL_LINK_NOARG(ScTableLink, RefreshHdl, Timer *, void) { - Refresh( aFileName, aFilterName, nullptr, GetRefreshDelay() ); + Refresh( aFileName, aFilterName, nullptr, GetRefreshDelaySeconds() ); } IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index 0679116dc12e..b4392b3ecbeb 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -36,7 +36,7 @@ private: OUString aOptions; OUString aSourceArea; ScRange aDestArea; - sal_uLong nRefresh; + sal_Int32 nRefreshDelaySeconds; public: ScAreaLinkSaver( const ScAreaLink& rSource ); diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index c298f6d05e5c..e3f75c036ebd 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -57,7 +57,7 @@ private: bool HasClipboardFormat( SotClipboardFormatId nFormatId ); void ExecuteExternalSource( const OUString& _rFile, const OUString& _rFilter, const OUString& _rOptions, - const OUString& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest ); + const OUString& _rSource, sal_Int32 _nRefreshDelaySeconds, SfxRequest& _rRequest ); void ExecuteDataPilotDialog(); void ExecuteXMLSourceDialog(); diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 4a8cad6dc9d6..8b0ea7d7c16a 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -215,7 +215,7 @@ public: void InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - const ScRange& rDestRange, sal_uLong nRefresh, + const ScRange& rDestRange, sal_Int32 nRefreshDelaySeconds, bool bFitBlock, bool bApi ); /** diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index b3ead95ddd65..1214e5a8f640 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -61,13 +61,13 @@ public: void InitFromOldLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - sal_uLong nRefresh ); + sal_Int32 nRefreshDelaySeconds ); OUString GetURL() const; OUString GetFilter() const; // may be empty OUString GetOptions() const; // filter options OUString GetSource() const; // separated by ";" - sal_uLong GetRefresh() const; // 0 if disabled + sal_Int32 GetRefreshDelaySeconds() const; // 0 if disabled }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 0bff9bc0b50e..195b64156e08 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -137,7 +137,7 @@ void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const OUString& rFilt void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - sal_uLong nRefresh ) + sal_Int32 nRefreshDelaySeconds ) { LoadDocument( rFile, rFilter, rOptions ); if (m_pSourceShell) @@ -160,10 +160,10 @@ void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rF while (nIdx>0); } - bool bDoRefresh = (nRefresh != 0); + bool bDoRefresh = (nRefreshDelaySeconds != 0); m_xBtnReload->set_active(bDoRefresh); if (bDoRefresh) - m_xNfDelay->set_value(nRefresh); + m_xNfDelay->set_value(nRefreshDelaySeconds); UpdateEnable(); } @@ -325,10 +325,10 @@ OUString ScLinkedAreaDlg::GetSource() const return aBuf.makeStringAndClear(); } -sal_uLong ScLinkedAreaDlg::GetRefresh() const +sal_Int32 ScLinkedAreaDlg::GetRefreshDelaySeconds() const { if (m_xBtnReload->get_active()) - return sal::static_int_cast(m_xNfDelay->get_value()); + return m_xNfDelay->get_value(); else return 0; // disabled } diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index a46adae4017c..f675c1abc34c 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -30,7 +30,7 @@ ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) : aOptions ( rSource.GetOptions() ), aSourceArea ( rSource.GetSource() ), aDestArea ( rSource.GetDestArea() ), - nRefresh ( rSource.GetRefreshDelay() ) // seconds + nRefreshDelaySeconds ( rSource.GetRefreshDelaySeconds() ) // seconds { } @@ -40,7 +40,7 @@ bool ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const aFilterName == rCompare.GetFilter() && aOptions == rCompare.GetOptions() && aSourceArea == rCompare.GetSource() && - nRefresh == rCompare.GetRefreshDelay() ); + nRefreshDelaySeconds == rCompare.GetRefreshDelaySeconds() ); } bool ScAreaLinkSaver::IsEqual( const ScAreaLink& rCompare ) const @@ -64,7 +64,7 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc ) if ( pLinkManager && pObjSh ) { ScAreaLink* pLink = new ScAreaLink( pObjSh, aFileName, aFilterName, aOptions, - aSourceArea, aDestArea.aStart, nRefresh ); + aSourceArea, aDestArea.aStart, nRefreshDelaySeconds ); pLink->SetInCreate( true ); pLink->SetDestArea( aDestArea ); OUString aTmp1(aFilterName), aTmp2(aSourceArea); diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index d3dcb8b5b900..9ebad7062809 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -2082,7 +2082,7 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert } else if (aPropertyName == SC_UNONAME_REFPERIOD ) { - sal_Int32 nRefresh(GetDBData_Impl()->GetRefreshDelay()); + sal_Int32 nRefresh(GetDBData_Impl()->GetRefreshDelaySeconds()); aRet <<= nRefresh; } else if (aPropertyName == SC_UNONAME_CONRES ) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 79dcb187374c..8e7be93c5baf 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -146,7 +146,7 @@ void SAL_CALL ScSheetLinkObj::refresh() SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); if (pLink) - pLink->Refresh( pLink->GetFileName(), pLink->GetFilterName(), nullptr, pLink->GetRefreshDelay() ); + pLink->Refresh( pLink->GetFileName(), pLink->GetFilterName(), nullptr, pLink->GetRefreshDelaySeconds() ); } void SAL_CALL ScSheetLinkObj::addRefreshListener( @@ -316,7 +316,7 @@ void ScSheetLinkObj::setFilter(const OUString& rFilter) ScTableLink* pLink = GetLink_Impl(); if (pLink) { - pLink->Refresh( aFileName, rFilter, nullptr, pLink->GetRefreshDelay() ); + pLink->Refresh( aFileName, rFilter, nullptr, pLink->GetRefreshDelaySeconds() ); } } @@ -337,7 +337,7 @@ void ScSheetLinkObj::setFilterOptions(const OUString& FilterOptions) if (pLink) { OUString aOptStr(FilterOptions); - pLink->Refresh( aFileName, pLink->GetFilterName(), &aOptStr, pLink->GetRefreshDelay() ); + pLink->Refresh( aFileName, pLink->GetFilterName(), &aOptStr, pLink->GetRefreshDelaySeconds() ); } } @@ -347,7 +347,7 @@ sal_Int32 ScSheetLinkObj::getRefreshDelay() const sal_Int32 nRet = 0; ScTableLink* pLink = GetLink_Impl(); if (pLink) - nRet = static_cast(pLink->GetRefreshDelay()); + nRet = pLink->GetRefreshDelaySeconds(); return nRet; } @@ -623,7 +623,7 @@ void ScAreaLinkObj::Modify_Impl( const OUString* pNewFile, const OUString* pNewF OUString aOptions (pLink->GetOptions()); OUString aSource (pLink->GetSource()); ScRange aDest (pLink->GetDestArea()); - sal_uLong nRefresh = pLink->GetRefreshDelay(); + sal_Int32 nRefreshDelaySeconds = pLink->GetRefreshDelaySeconds(); //! Undo delete //! Undo merge @@ -649,14 +649,14 @@ void ScAreaLinkObj::Modify_Impl( const OUString* pNewFile, const OUString* pNewF bFitBlock = false; // new range was specified -> do not move the content } pDocShell->GetDocFunc().InsertAreaLink( aFile, aFilter, aOptions, aSource, - aDest, nRefresh, bFitBlock, true ); + aDest, nRefreshDelaySeconds, bFitBlock, true ); } -void ScAreaLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh ) +void ScAreaLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefreshDelaySeconds ) { ScAreaLink* pLink = lcl_GetAreaLink( pDocShell, nPos ); if( pLink ) - pLink->SetRefreshDelay( static_cast(nRefresh) ); + pLink->SetRefreshDelay( nRefreshDelaySeconds ); } // XRefreshable @@ -666,7 +666,7 @@ void SAL_CALL ScAreaLinkObj::refresh() SolarMutexGuard aGuard; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) - pLink->Refresh( pLink->GetFile(), pLink->GetFilter(), pLink->GetSource(), pLink->GetRefreshDelay() ); + pLink->Refresh( pLink->GetFile(), pLink->GetFilter(), pLink->GetSource(), pLink->GetRefreshDelaySeconds() ); } void SAL_CALL ScAreaLinkObj::addRefreshListener( @@ -828,7 +828,7 @@ sal_Int32 ScAreaLinkObj::getRefreshDelay() const sal_Int32 nRet = 0; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) - nRet = static_cast(pLink->GetRefreshDelay()); + nRet = pLink->GetRefreshDelaySeconds(); return nRet; } @@ -921,7 +921,7 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP aFileStr = ScGlobal::GetAbsDocName( aFileStr, pDocShell ); //! in InsertAreaLink ??? pDocShell->GetDocFunc().InsertAreaLink( aFileStr, aFilter, aFilterOptions, aSourceArea, ScRange(aDestAddr), - 0, false, true ); // don't move contents + /*nRefreshDelaySeconds*/0, false, true ); // don't move contents } } diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 254eccac5769..441f62148931 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2697,7 +2697,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OUString aFilter; OUString aOptions; OUString aSource; - sal_uLong nRefresh=0; + sal_Int32 nRefreshDelaySeconds=0; aFile = pFile->GetValue(); aSource = pSource->GetValue(); @@ -2709,9 +2709,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) aOptions = pOptions->GetValue(); const SfxUInt32Item* pRefresh = rReq.GetArg(FN_PARAM_2); if ( pRefresh ) - nRefresh = pRefresh->GetValue(); + nRefreshDelaySeconds = pRefresh->GetValue(); - ExecuteExternalSource( aFile, aFilter, aOptions, aSource, nRefresh, rReq ); + ExecuteExternalSource( aFile, aFilter, aOptions, aSource, nRefreshDelaySeconds, rReq ); } else { @@ -2723,14 +2723,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) delete pImpl->m_pRequest; pImpl->m_pRequest = new SfxRequest( rReq ); OUString sFile, sFilter, sOptions, sSource; - sal_uLong nRefresh = 0; + sal_Int32 nRefreshDelaySeconds = 0; if (pImpl->m_pLinkedDlg->Execute() == RET_OK) { sFile = pImpl->m_pLinkedDlg->GetURL(); sFilter = pImpl->m_pLinkedDlg->GetFilter(); sOptions = pImpl->m_pLinkedDlg->GetOptions(); sSource = pImpl->m_pLinkedDlg->GetSource(); - nRefresh = pImpl->m_pLinkedDlg->GetRefresh(); + nRefreshDelaySeconds = pImpl->m_pLinkedDlg->GetRefreshDelaySeconds(); if ( !sFile.isEmpty() ) pImpl->m_pRequest->AppendItem( SfxStringItem( SID_FILE_NAME, sFile ) ); if ( !sFilter.isEmpty() ) @@ -2739,11 +2739,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pImpl->m_pRequest->AppendItem( SfxStringItem( SID_FILE_FILTEROPTIONS, sOptions ) ); if ( !sSource.isEmpty() ) pImpl->m_pRequest->AppendItem( SfxStringItem( FN_PARAM_1, sSource ) ); - if ( nRefresh ) - pImpl->m_pRequest->AppendItem( SfxUInt32Item( FN_PARAM_2, nRefresh ) ); + if ( nRefreshDelaySeconds ) + pImpl->m_pRequest->AppendItem( SfxUInt32Item( FN_PARAM_2, nRefreshDelaySeconds ) ); } - ExecuteExternalSource( sFile, sFilter, sOptions, sSource, nRefresh, *(pImpl->m_pRequest) ); + ExecuteExternalSource( sFile, sFilter, sOptions, sSource, nRefreshDelaySeconds, *(pImpl->m_pRequest) ); } } break; @@ -2945,7 +2945,7 @@ void ScCellShell::ExecuteRotateTrans( const SfxRequest& rReq ) void ScCellShell::ExecuteExternalSource( const OUString& _rFile, const OUString& _rFilter, const OUString& _rOptions, - const OUString& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest ) + const OUString& _rSource, sal_Int32 _nRefreshDelaySeconds, SfxRequest& _rRequest ) { if ( !_rFile.isEmpty() && !_rSource.isEmpty() ) // filter may be empty { @@ -2964,7 +2964,7 @@ void ScCellShell::ExecuteExternalSource( aLinkRange = ScRange( rData.GetCurX(), rData.GetCurY(), rData.GetTabNo() ); rData.GetDocFunc().InsertAreaLink( _rFile, _rFilter, _rOptions, _rSource, - aLinkRange, _nRefresh, bMove, false ); + aLinkRange, _nRefreshDelaySeconds, bMove, false ); _rRequest.Done(); } else -- cgit