diff options
47 files changed, 100 insertions, 117 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 1b81b0ba4b80..cde10c2929fb 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -156,7 +156,7 @@ public: bool IsFlushed() const; void Flush(); void Lock( bool bLock ); - bool IsLocked( sal_uInt16 nSID = 0 ) const; + bool IsLocked() const; void SetSlotFilter( SfxSlotFilterState nEnable = SfxSlotFilterState::DISABLED, sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = nullptr ); diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 2e55a9702c79..c371244dc6a6 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -201,8 +201,8 @@ public: const css::uno::Reference < css::ui::dialogs::XFilePicker2 >& GetFilePicker() const; // XFilePickerListener methods - void SAL_CALL FileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); - void SAL_CALL DirectoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + void SAL_CALL FileSelectionChanged(); + void SAL_CALL DirectoryChanged(); virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); void SAL_CALL DialogSizeChanged(); static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ); diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index acaa7dc340fe..ce8d3eefd11c 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -126,10 +126,9 @@ public: static SvLinkSourceRef CreateObj( SvBaseLink* ); - void UpdateAllLinks( bool bAskUpdate = true, - bool bCallErrHdl = true, - bool bUpdateGrfLinks = false, - vcl::Window* pParentWin = nullptr ); + void UpdateAllLinks( bool bAskUpdate, + bool bUpdateGrfLinks, + vcl::Window* pParentWin ); // Call for list of links (eg for link-dialog) const SvBaseLinks& GetLinks() const { return aLinkTbl; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 3c05132304bb..14abb9ba76b3 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -440,12 +440,10 @@ public: bool GenerateAndStoreThumbnail( bool bEncrypted, - bool bIsTemplate, const css::uno::Reference< css::embed::XStorage >& xStor ); bool WriteThumbnail( bool bEncrypted, - bool bIsTemplate, const css::uno::Reference< css::io::XStream >& xStream ); bool IsInGenerateAndStoreThumbnail() const {return bIsInGenerateThumbnail;}//optimize thumbnail generate and store procedure to improve odt saving performance, i120030 diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 4de1bb297e1d..9d803bf8b2d6 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -198,7 +198,7 @@ public: SAL_DLLPRIVATE OUString GetActualPresentationURL_Impl() const; SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &); SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &); - SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId ); + SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(); SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const OUString& sMacro); SAL_DLLPRIVATE void Exec_Impl(SfxRequest &); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 3cfe413bcf30..3e276546aa94 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -195,12 +195,12 @@ public: virtual ErrCode DoVerb(long nVerb); - void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); + void OutplaceActivated( bool bActive ); virtual void UIActivating( SfxInPlaceClient* pClient ); virtual void UIDeactivated( SfxInPlaceClient* pClient ); void JumpToMark( const OUString& rMark ); - void VisAreaChanged(const tools::Rectangle& rRect); + void VisAreaChanged(); // Misc diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index c4b50413736b..58cf713ada2b 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2153,8 +2153,7 @@ void ScTabView::SetNewVisArea() vcl::Window* pActive = pGridWin[aViewData.GetActivePart()]; if (pActive) - aViewData.GetViewShell()->VisAreaChanged( - pActive->PixelToLogic(tools::Rectangle(Point(),pActive->GetOutputSizePixel())) ); + aViewData.GetViewShell()->VisAreaChanged(); if (pDrawView) pDrawView->VisAreaChanged(); // no window passed on -> for all windows diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 0a383c637615..a30fdb097d6e 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -723,7 +723,7 @@ void SdDrawDocument::UpdateAllLinks() rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true); } - pLinkManager->UpdateAllLinks(); // query box: update all links? + pLinkManager->UpdateAllLinks(true, false, nullptr); // query box: update all links? if (s_pDocLockedInsertingLinks == this) s_pDocLockedInsertingLinks = nullptr; // unlock inserting links diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 3eee7b1e09e4..c56e19ac138e 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -984,10 +984,10 @@ void ViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::Pr mpFrameView->ReadUserDataSequence( rSequence ); } -void ViewShell::VisAreaChanged(const ::tools::Rectangle& rRect) +void ViewShell::VisAreaChanged(const ::tools::Rectangle& /*rRect*/) { OSL_ASSERT (GetViewShell()!=nullptr); - GetViewShell()->VisAreaChanged(rRect); + GetViewShell()->VisAreaChanged(); } void ViewShell::SetWinViewPos(const Point& rWinPos) diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index cc8a091a3bfc..94f3d591b8e9 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -77,9 +77,7 @@ public: static bool WarnUnacceptableFormat( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& aOldUIName, - const OUString& aDefUIName, const OUString& aDefExtension, - bool bCanProceedFurther, bool rDefaultIsAlien ); static vcl::Window* GetModelWindow( const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 71c3e5b1b67b..9843dec58a50 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -32,7 +32,7 @@ class SfxURLToolBoxControl_Impl : public SfxToolBoxControl private: SvtURLBox* GetURLBox() const; - void OpenURL( const OUString& rName, bool bNew ) const; + void OpenURL( const OUString& rName ) const; DECL_LINK( OpenHdl, SvtURLBox*, void ); DECL_LINK( SelectHdl, ComboBox&, void ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 323e6322671e..7974c56eaf84 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -175,7 +175,7 @@ SfxApplication* SfxApplication::GetOrCreate() } SfxApplication::SfxApplication() - : pImpl( new SfxAppData_Impl( this ) ) + : pImpl( new SfxAppData_Impl ) { SetName( "StarOffice" ); if (!utl::ConfigManager::IsAvoidConfig()) diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 44f8843930fa..410701bcf825 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -83,7 +83,7 @@ void SfxBasicManagerCreationListener::onBasicManagerCreated( const Reference< XM m_rAppData.OnApplicationBasicManagerCreated( _rBasicManager ); } -SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) +SfxAppData_Impl::SfxAppData_Impl() : pDdeService( nullptr ) , pDocTopics( nullptr ) , pTriggerTopic(nullptr) diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 5c1aa0563604..3681d4cfc80b 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -180,7 +180,6 @@ private: sal_uInt32 CheckPasswd_Impl ( SfxObjectShell* pDoc, - SfxItemPool& /*rPool*/, // Pool, if a Set has to be created SfxMedium* pFile // the Medium and its Password shold be obtained ) diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 3f0f6e7cbdaa..c2997297564f 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -269,7 +269,6 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, void LinkManager::UpdateAllLinks( bool bAskUpdate, - bool /*bCallErrHdl*/, bool bUpdateGrfLinks, vcl::Window* pParentWin ) { diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 156a422f2c33..9007ae389582 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2927,7 +2927,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , SfxHelpWindow_Impl::SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, - vcl::Window* pParent, WinBits ) : + vcl::Window* pParent ) : SplitWindow( pParent, WB_3DLOOK | WB_NOSPLITDRAW ), diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 5628ccd345e7..499d8072e7fc 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -529,7 +529,7 @@ friend class SfxHelpIndexWindow_Impl; public: SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, - vcl::Window* pParent, WinBits nBits ); + vcl::Window* pParent ); virtual ~SfxHelpWindow_Impl() override; virtual void dispose() override; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index f3f9c160373f..7090ae5a7280 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -427,7 +427,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , // create all internal windows and sub frames ... Reference< css::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow(); VclPtr<vcl::Window> pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); - VclPtrInstance<SfxHelpWindow_Impl> pHelpWindow( xHelpTask, pParentWindow, WB_DOCKBORDER ); + VclPtrInstance<SfxHelpWindow_Impl> pHelpWindow( xHelpTask, pParentWindow ); Reference< css::awt::XWindow > xHelpWindow = VCLUnoHelper::GetInterface( pHelpWindow ); Reference< XFrame > xHelpContent; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 56d4a66aa15d..31e3475211e5 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1433,7 +1433,7 @@ void SfxWorkWindow::ResetStatusBar_Impl() } -void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings& ) +void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId ) { if ( nResId && bShowStatusBar && IsVisible_Impl() ) aStatBar.nId = sal::static_int_cast<sal_uInt16>(nResId); @@ -2517,7 +2517,7 @@ void SfxWorkWindow::SetActiveChild_Impl( vcl::Window *pChild ) pActiveChild = pChild; } -void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& ) +void SfxWorkWindow::DataChanged_Impl() { sal_uInt16 n; sal_uInt16 nCount = aChildWins.size(); diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 146bff4f202a..fde677db50c1 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -66,7 +66,7 @@ struct SfxProgress_Impl SfxWorkWindow* pWorkWin; SfxViewFrame* pView; - explicit SfxProgress_Impl( const OUString& ); + explicit SfxProgress_Impl(); void Enable_Impl(); }; @@ -94,7 +94,7 @@ void SfxProgress_Impl::Enable_Impl() } -SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ ) +SfxProgress_Impl::SfxProgress_Impl() : nMax(0) , nCreate(0) , nNextReschedule(0) @@ -133,7 +133,7 @@ SfxProgress::SfxProgress A progress-bar will be displayed in the status bar, */ -: pImpl( new SfxProgress_Impl( rText ) ), +: pImpl( new SfxProgress_Impl ), nVal(0), bSuspended(true) { diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index a4db7d7dfc9e..3e9e6d9827f3 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -297,7 +297,7 @@ bool SfxDispatcher::IsActive(const SfxShell& rShell) modal-mode and if the specified slot are handled as frame-specific (ie, not served by the application). */ -bool SfxDispatcher::IsLocked(sal_uInt16) const +bool SfxDispatcher::IsLocked() const { return xImp->bLocked; } @@ -890,7 +890,7 @@ void SfxDispatcher::Execute_(SfxShell& rShell, const SfxSlot& rSlot, DBG_ASSERT( !xImp->bFlushing, "recursive call to dispatcher" ); DBG_ASSERT( xImp->aToDoStack.empty(), "unprepared InPlace _Execute" ); - if ( IsLocked( rSlot.GetSlotId() ) ) + if ( IsLocked() ) return; if ( bool(eCallMode & SfxCallMode::ASYNCHRON) || @@ -963,7 +963,7 @@ const SfxSlot* SfxDispatcher::GetSlot( const OUString& rCommand ) const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode nCall, SfxItemSet* pArgs, SfxItemSet* pInternalArgs, sal_uInt16 nModi) { - if ( IsLocked(nSlot) ) + if ( IsLocked() ) return nullptr; SfxShell *pShell = nullptr; @@ -1008,7 +1008,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode nCall, const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, const SfxPoolItem **pArgs, sal_uInt16 nModi, const SfxPoolItem **pInternalArgs) { - if ( IsLocked(nSlot) ) + if ( IsLocked() ) return nullptr; SfxShell *pShell = nullptr; @@ -1057,7 +1057,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, const SfxItemSet &rArgs) { - if ( IsLocked(nSlot) ) + if ( IsLocked() ) return nullptr; SfxShell *pShell = nullptr; @@ -1108,7 +1108,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, const SfxPoolItem* SfxDispatcher::ExecuteList(sal_uInt16 nSlot, SfxCallMode eCall, std::initializer_list<SfxPoolItem const*> args) { - if ( IsLocked(nSlot) ) + if ( IsLocked() ) return nullptr; SfxShell *pShell = nullptr; @@ -1141,7 +1141,7 @@ IMPL_LINK(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) // Has also the Pool not yet died? if ( !pReq->IsCancelled() ) { - if ( !IsLocked(pReq->GetSlot()) ) + if ( !IsLocked() ) { Flush(); SfxSlotServer aSvr; @@ -1336,7 +1336,6 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne return; sal_uInt32 nStatBarId=0; - SfxShell *pStatusBarShell = nullptr; SfxSlotPool* pSlotPool = &SfxSlotPool::GetSlotPool( GetFrame() ); sal_uInt16 nTotCount = xImp->aStack.size(); @@ -1435,7 +1434,6 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( nId ) { nStatBarId = nId; - pStatusBarShell = pShell; } } } @@ -1468,8 +1466,7 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( bIsTaskActive && nStatBarId && xImp->pFrame ) { // internal frames also may control statusbar - SfxBindings& rBindings = xImp->pFrame->GetBindings(); - xImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings ); + xImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId ); } } } @@ -1717,7 +1714,7 @@ bool SfxDispatcher::FindServer_(sal_uInt16 nSlot, SfxSlotServer& rServer, bool b SFX_STACK(SfxDispatcher::FindServer_); // Dispatcher locked? (nevertheless let SID_HELP_PI through) - if ( IsLocked(nSlot) ) + if ( IsLocked() ) { xImp->bInvalidateOnUnlock = true; return false; @@ -1852,7 +1849,7 @@ bool SfxDispatcher::FillState_(const SfxSlotServer& rSvr, SfxItemSet& rState, SFX_STACK(SfxDispatcher::FillState_); const SfxSlot *pSlot = rSvr.GetSlot(); - if ( pSlot && IsLocked( pSlot->GetSlotId() ) ) + if ( pSlot && IsLocked() ) { xImp->bInvalidateOnUnlock = true; return false; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 98210a528f4b..a4c8ba30d1a7 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -719,7 +719,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, // #i102619# Retrieve metric from shell before execution - the shell could be destroyed after execution if ( pDispatcher->GetBindings() ) { - if ( !pDispatcher->IsLocked( GetId() ) ) + if ( !pDispatcher->IsLocked() ) { const SfxSlot *pSlot = nullptr; if ( pDispatcher->GetShellAndSlot_Impl( GetId(), &pShell, &pSlot, false, diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 0c5e227cf1e7..16633aefb500 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -155,16 +155,16 @@ OUString DecodeSpaces_Impl( const OUString& rSource ); // FileDialogHelper_Impl // XFilePickerListener Methods -void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const FilePickerEvent& aEvent ) +void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const FilePickerEvent& ) { SolarMutexGuard aGuard; - mpAntiImpl->FileSelectionChanged( aEvent ); + mpAntiImpl->FileSelectionChanged(); } -void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& aEvent ) +void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& ) { SolarMutexGuard aGuard; - mpAntiImpl->DirectoryChanged( aEvent ); + mpAntiImpl->DirectoryChanged(); } OUString SAL_CALL FileDialogHelper_Impl::helpRequested( const FilePickerEvent& aEvent ) @@ -194,7 +194,7 @@ void SAL_CALL FileDialogHelper_Impl::dialogClosed( const DialogClosedEvent& _rEv } // handle XFilePickerListener events -void FileDialogHelper_Impl::handleFileSelectionChanged( const FilePickerEvent& ) +void FileDialogHelper_Impl::handleFileSelectionChanged() { if ( mbHasVersions ) updateVersions(); @@ -203,7 +203,7 @@ void FileDialogHelper_Impl::handleFileSelectionChanged( const FilePickerEvent& ) maPreviewIdle.Start(); } -void FileDialogHelper_Impl::handleDirectoryChanged( const FilePickerEvent& ) +void FileDialogHelper_Impl::handleDirectoryChanged() { if ( mbShowPreview ) TimeOutHdl_Impl( nullptr ); @@ -2562,14 +2562,14 @@ const uno::Reference < XFilePicker2 >& FileDialogHelper::GetFilePicker() const } // XFilePickerListener Methods -void SAL_CALL FileDialogHelper::FileSelectionChanged( const FilePickerEvent& aEvent ) +void SAL_CALL FileDialogHelper::FileSelectionChanged() { - mpImpl->handleFileSelectionChanged( aEvent ); + mpImpl->handleFileSelectionChanged(); } -void SAL_CALL FileDialogHelper::DirectoryChanged( const FilePickerEvent& aEvent ) +void SAL_CALL FileDialogHelper::DirectoryChanged() { - mpImpl->handleDirectoryChanged( aEvent ); + mpImpl->handleDirectoryChanged(); } OUString SAL_CALL FileDialogHelper::HelpRequested( const FilePickerEvent& aEvent ) diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 1ea707989463..02cd6c590c05 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -160,8 +160,8 @@ namespace sfx2 virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // handle XFilePickerListener events - void handleFileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); - void handleDirectoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + void handleFileSelectionChanged(); + void handleDirectoryChanged(); static OUString handleHelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ); void handleControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); void handleDialogSizeChanged(); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 181e54872bbf..20c3dbab9b97 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -150,14 +150,14 @@ struct SfxSecurityPage_Impl DECL_LINK( RecordChangesCBToggleHdl, CheckBox&, void ); DECL_LINK( ChangeProtectionPBHdl, Button*, void ); - SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet ); + SfxSecurityPage_Impl( SfxSecurityPage &rDlg ); - bool FillItemSet_Impl( SfxItemSet & ); - void Reset_Impl( const SfxItemSet & ); + bool FillItemSet_Impl(); + void Reset_Impl(); }; -SfxSecurityPage_Impl::SfxSecurityPage_Impl( SfxSecurityPage &rTabPage, const SfxItemSet & ) : +SfxSecurityPage_Impl::SfxSecurityPage_Impl( SfxSecurityPage &rTabPage ) : m_rMyTabPage (rTabPage), m_eRedlingMode ( RL_NONE ), m_bOrigPasswordIsConfirmed ( false ), @@ -180,7 +180,7 @@ SfxSecurityPage_Impl::SfxSecurityPage_Impl( SfxSecurityPage &rTabPage, const Sfx } -bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & ) +bool SfxSecurityPage_Impl::FillItemSet_Impl() { bool bModified = false; @@ -229,7 +229,7 @@ bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & ) } -void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & ) +void SfxSecurityPage_Impl::Reset_Impl() { SfxObjectShell* pCurDocShell = SfxObjectShell::Current(); @@ -417,25 +417,25 @@ VclPtr<SfxTabPage> SfxSecurityPage::Create( vcl::Window * pParent, const SfxItem SfxSecurityPage::SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "SecurityInfoPage", "sfx/ui/securityinfopage.ui", &rItemSet) { - m_pImpl.reset(new SfxSecurityPage_Impl( *this, rItemSet )); + m_pImpl.reset(new SfxSecurityPage_Impl( *this )); } -bool SfxSecurityPage::FillItemSet( SfxItemSet * rItemSet ) +bool SfxSecurityPage::FillItemSet( SfxItemSet * /*rItemSet*/ ) { bool bModified = false; DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" ); if (m_pImpl.get() != nullptr) - bModified = m_pImpl->FillItemSet_Impl( *rItemSet ); + bModified = m_pImpl->FillItemSet_Impl(); return bModified; } -void SfxSecurityPage::Reset( const SfxItemSet * rItemSet ) +void SfxSecurityPage::Reset( const SfxItemSet * /*rItemSet*/ ) { DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" ); if (m_pImpl.get() != nullptr) - m_pImpl->Reset_Impl( *rItemSet ); + m_pImpl->Reset_Impl(); } diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 61954b8922aa..30cdb908ba11 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -131,7 +131,7 @@ SfxMedium* DocumentInserter::CreateMedium(char const*const pFallbackHack) else pMedium.reset(); - if ( pMedium && CheckPasswd_Impl( nullptr, SfxGetpApp()->GetPool(), pMedium.get() ) == ERRCODE_ABORT ) + if ( pMedium && CheckPasswd_Impl( nullptr, pMedium.get() ) == ERRCODE_ABORT ) pMedium.reset(); } @@ -159,7 +159,7 @@ SfxMediumList* DocumentInserter::CreateMediumList() else DELETEZ( pMedium ); - if( pMedium && CheckPasswd_Impl( nullptr, SfxGetpApp()->GetPool(), pMedium ) != ERRCODE_ABORT ) + if( pMedium && CheckPasswd_Impl( nullptr, pMedium ) != ERRCODE_ABORT ) pMediumList->push_back( pMedium ); else delete pMedium; diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index be1c58bc96ef..696bfd7af4da 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -243,7 +243,7 @@ bool GraphicHelper::getThumbnailReplacement_Impl(const OUString& rResID, const u } // static -OUString GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, bool /*bIsTemplate*/ ) +OUString GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName ) { OUString sResult; diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index 8a1d8ac89d97..029b0f676c5c 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -52,8 +52,7 @@ public: GDIMetaFile* pMetaFile, const css::uno::Reference< css::io::XStream >& xStream ); - static OUString getThumbnailReplacementIDByFactoryName_Impl(const OUString& aFactoryShortName, - bool bIsTemplate); + static OUString getThumbnailReplacementIDByFactoryName_Impl(const OUString& aFactoryShortName); static bool getThumbnailReplacement_Impl( const OUString& rResID, diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 573a84ded23c..a9e0b6033a9d 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -744,8 +744,8 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) if ( !aPreusedFilterName.equals( aFilterName ) && !aUIName.equals( aDefUIName ) ) { - if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aUIName, aDefUIName, aDefExtension, - true, (bool)( nDefFiltFlags & SfxFilterFlags::ALIEN ) ) ) + if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aUIName, aDefExtension, + (bool)( nDefFiltFlags & SfxFilterFlags::ALIEN ) ) ) return STATUS_SAVEAS_STANDARDNAME; } } @@ -1747,9 +1747,7 @@ void SfxStoringHelper::SetDocInfoState( // static bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XModel >& xModel, const OUString& aOldUIName, - const OUString& /*aDefUIName*/, const OUString& aDefExtension, - bool /*bCanProceedFurther*/, bool bDefIsAlien ) { if ( !SvtSaveOptions().IsWarnAlienFormat() ) diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index fe37350cd33e..c93c593e3126 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1409,9 +1409,7 @@ bool SfxObjectShell::SaveTo_Impl { // store the thumbnail representation image // the thumbnail is not stored in case of encrypted document - if ( !GenerateAndStoreThumbnail( bPasswdProvided, - pFilter->IsOwnTemplateFormat(), - xMedStorage ) ) + if ( !GenerateAndStoreThumbnail( bPasswdProvided, xMedStorage ) ) { // TODO: error handling SAL_WARN( "sfx.doc", "Couldn't store thumbnail representation!" ); @@ -2963,7 +2961,7 @@ bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium ) { // Password const SfxStringItem* pPasswdItem = SfxItemSet::GetItem<SfxStringItem>(rMedium.GetItemSet(), SID_PASSWORD, false); - if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, SfxGetpApp()->GetPool(), pMedium ) ) + if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, pMedium ) ) { uno::Sequence< beans::NamedValue > aEncryptionData; if ( GetEncryptionData_Impl(pMedium->GetItemSet(), aEncryptionData) ) @@ -3421,7 +3419,7 @@ bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< embed return bResult; } -bool SfxObjectShell::GenerateAndStoreThumbnail(bool bEncrypted, bool bIsTemplate, const uno::Reference<embed::XStorage>& xStorage) +bool SfxObjectShell::GenerateAndStoreThumbnail(bool bEncrypted, const uno::Reference<embed::XStorage>& xStorage) { //optimize thumbnail generate and store procedure to improve odt saving performance, i120030 bIsInGenerateThumbnail = true; @@ -3436,7 +3434,7 @@ bool SfxObjectShell::GenerateAndStoreThumbnail(bool bEncrypted, bool bIsTemplate { uno::Reference<io::XStream> xStream = xThumbnailStorage->openStreamElement("thumbnail.png", embed::ElementModes::READWRITE); - if (xStream.is() && WriteThumbnail(bEncrypted, bIsTemplate, xStream)) + if (xStream.is() && WriteThumbnail(bEncrypted, xStream)) { uno::Reference<embed::XTransactedObject> xTransactedObject(xThumbnailStorage, uno::UNO_QUERY_THROW); xTransactedObject->commit(); @@ -3454,7 +3452,7 @@ bool SfxObjectShell::GenerateAndStoreThumbnail(bool bEncrypted, bool bIsTemplate return bResult; } -bool SfxObjectShell::WriteThumbnail(bool bEncrypted, bool bIsTemplate, const uno::Reference<io::XStream>& xStream) +bool SfxObjectShell::WriteThumbnail(bool bEncrypted, const uno::Reference<io::XStream>& xStream) { bool bResult = false; @@ -3472,8 +3470,7 @@ bool SfxObjectShell::WriteThumbnail(bool bEncrypted, bool bIsTemplate, const uno if (bEncrypted) { const OUString sResID = GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( - GetFactory().GetFactoryName(), - bIsTemplate); + GetFactory().GetFactoryName()); if (!sResID.isEmpty()) bResult = GraphicHelper::getThumbnailReplacement_Impl(sResID, xStream); } diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 13e305b68b3f..3023b3bd9f28 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -43,7 +43,7 @@ private: inline void Insert( SfxPoolItem* pItem ); public: - explicit CntStaticPoolDefaults_Impl( CntItemPool* pPool ); + explicit CntStaticPoolDefaults_Impl(); ~CntStaticPoolDefaults_Impl(); CntStaticPoolDefaults_Impl(const CntStaticPoolDefaults_Impl&) = delete; CntStaticPoolDefaults_Impl& operator=(const CntStaticPoolDefaults_Impl&) = delete; @@ -102,7 +102,7 @@ CntItemPool::CntItemPool() FreezeIdRanges(); // Create static defaults. - pPoolDefs_Impl = new CntStaticPoolDefaults_Impl( this ); + pPoolDefs_Impl = new CntStaticPoolDefaults_Impl; // Set item infos. SetItemInfos( pPoolDefs_Impl->GetItemInfos() ); @@ -178,7 +178,7 @@ CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl() } -CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ ) +CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl() : m_pDefaults( new std::vector<SfxPoolItem*>( m_nItems, nullptr ) ), m_pItemInfos( new SfxItemInfo [ m_nItems ] ) { diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 5dd88fdb0f81..95ca7b5acf7e 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -124,7 +124,7 @@ public: bool bDowning:1; // sal_True on Exit and afterwards bool bInQuit : 1; - SfxAppData_Impl( SfxApplication* ); + SfxAppData_Impl(); ~SfxAppData_Impl(); SfxDocumentTemplates* GetDocumentTemplates(); diff --git a/sfx2/source/inc/appopen.hxx b/sfx2/source/inc/appopen.hxx index 6360b0a02b56..eca47c903b27 100644 --- a/sfx2/source/inc/appopen.hxx +++ b/sfx2/source/inc/appopen.hxx @@ -27,7 +27,7 @@ class SfxItemPool; class SfxMedium; class SfxObjectShell; -sal_uInt32 CheckPasswd_Impl( SfxObjectShell* pDoc, SfxItemPool &rPool, SfxMedium* pFile ); +sal_uInt32 CheckPasswd_Impl( SfxObjectShell* pDoc, SfxMedium* pFile ); void SetTemplate_Impl( const OUString&, const OUString&, SfxObjectShell* ); diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index d4e229a77464..95f4f9fbea6e 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -252,7 +252,7 @@ public: { return pParent; } // Methods for all Child windows - void DataChanged_Impl( const DataChangedEvent& rDCEvt ); + void DataChanged_Impl(); void ReleaseChild_Impl( vcl::Window& rWindow ); SfxChild_Impl* RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus ); void ShowChildren_Impl(); @@ -300,7 +300,7 @@ public: // Methods for StatusBar void ResetStatusBar_Impl(); - void SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& ); + void SetStatusBar_Impl(sal_uInt32 nResId); void UpdateStatusBar_Impl(); css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator(); css::uno::Reference< css::frame::XFrame > GetFrameInterface(); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index ee4195d4384c..d8e27394e5a4 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -76,7 +76,7 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const } -void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) const +void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName ) const { OUString aName; OUString aFilter; @@ -163,13 +163,13 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, SelectHdl, ComboBox&, void) OUString aName( pURLBox->GetURL() ); if ( !pURLBox->IsTravelSelect() && !aName.isEmpty() ) - OpenURL( aName, false ); + OpenURL( aName ); } IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl, SvtURLBox*, void) { SvtURLBox* pURLBox = GetURLBox(); - OpenURL( pURLBox->GetURL(), pURLBox->IsCtrlOpen() ); + OpenURL( pURLBox->GetURL() ); Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext ); Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY ); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index b040b2b4ab79..d12bc3145a67 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -87,7 +87,7 @@ void SfxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); SfxWorkWindow *pWorkWin = pFrame->GetWorkWindow_Impl(); if ( pWorkWin ) - pWorkWin->DataChanged_Impl( rDCEvt ); + pWorkWin->DataChanged_Impl(); } bool SfxFrameWindow_Impl::EventNotify( NotifyEvent& rNEvt ) diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index a60a84c822b9..60a20a717040 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -304,7 +304,7 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible ) if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); - m_pClient->GetViewShell()->OutplaceActivated( bVisible, m_pClient ); + m_pClient->GetViewShell()->OutplaceActivated( bVisible ); m_pClient->Invalidate(); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index af0eedd07ba7..9a12e05fa2b0 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2959,7 +2959,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState ) } } -SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ ) +SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl() { SfxWorkWindow* pWork = GetFrame().GetWorkWindow_Impl(); return pWork; @@ -2967,33 +2967,33 @@ SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ ) void SfxViewFrame::SetChildWindow(sal_uInt16 nId, bool bOn, bool bSetFocus ) { - SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); + SfxWorkWindow* pWork = GetWorkWindow_Impl(); if ( pWork ) pWork->SetChildWindow_Impl( nId, bOn, bSetFocus ); } void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId) { - SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); + SfxWorkWindow* pWork = GetWorkWindow_Impl(); if ( pWork ) pWork->ToggleChildWindow_Impl( nId, true ); } bool SfxViewFrame::HasChildWindow( sal_uInt16 nId ) { - SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); + SfxWorkWindow* pWork = GetWorkWindow_Impl(); return pWork && pWork->HasChildWindow_Impl(nId); } bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) { - SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); + SfxWorkWindow* pWork = GetWorkWindow_Impl(); return pWork && pWork->KnowsChildWindow_Impl(nId); } void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, bool bVisible ) { - SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); + SfxWorkWindow* pWork = GetWorkWindow_Impl(); if ( pWork ) { GetDispatcher()->Update_Impl(true); @@ -3003,7 +3003,7 @@ void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, bool bVisible ) SfxChildWindow* SfxViewFrame::GetChildWindow(sal_uInt16 nId) { - SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); + SfxWorkWindow* pWork = GetWorkWindow_Impl(); return pWork ? pWork->GetChildWindow_Impl(nId) : nullptr; } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 57408af1eb10..dfb636d2e3a9 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -762,7 +762,7 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/) } -void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient*/ ) +void SfxViewShell::OutplaceActivated( bool bActive ) { if ( !bActive ) GetFrame()->GetFrame().Appear(); @@ -1585,7 +1585,7 @@ void SfxViewShell::QueryObjAreaPixel( tools::Rectangle& ) const } -void SfxViewShell::VisAreaChanged(const tools::Rectangle& /*rVisArea*/) +void SfxViewShell::VisAreaChanged() { SfxInPlaceClientList *pClients = pImpl->GetIPClientList_Impl(false); if ( !pClients ) diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index c996ed76f62b..e1d1a19b6a3a 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -241,7 +241,7 @@ void DocumentLinksAdministrationManager::UpdateLinks() SfxFrame* pFrame = pMedium ? pMedium->GetLoadTargetFrame() : nullptr; vcl::Window* pDlgParent = pFrame ? &pFrame->GetWindow() : nullptr; - GetLinkManager().UpdateAllLinks( bAskUpdate, true, false, pDlgParent ); + GetLinkManager().UpdateAllLinks( bAskUpdate, false, pDlgParent ); } else { diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 21ac8346dd1f..a0420f45ba96 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1338,7 +1338,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) if ( pSrcDoc != pDoc && rSection.IsProtectFlag() ) { - pSrcDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( false ); + pSrcDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( false, false, nullptr ); } if( pCpyRg ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 92086cd905a2..6122d867a2da 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -431,7 +431,7 @@ SwHTMLParser::~SwHTMLParser() sal_uInt16 nLinkMode = m_xDoc->getIDocumentSettingAccess().getLinkUpdateMode( true ); if( nLinkMode != NEVER && bAsync && SfxObjectCreateMode::INTERNAL!=m_xDoc->GetDocShell()->GetCreateMode() ) - m_xDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL ); + m_xDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL, false, nullptr ); if ( m_xDoc->GetDocShell()->IsLoading() ) { diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index b6f5a493946d..5016d266e795 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -673,7 +673,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if( !rSh.GetLinkManager().GetLinks().empty() ) { rSh.StartAllAction(); - rSh.GetLinkManager().UpdateAllLinks( false, true, true ); + rSh.GetLinkManager().UpdateAllLinks( false, true, nullptr ); rSh.EndAllAction(); } SfxDispatcher &rDis = *rTempView.GetViewFrame()->GetDispatcher(); @@ -1158,7 +1158,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) { rSh.EnterStdMode(); rSh.StartAllAction(); - rSh.GetLinkManager().UpdateAllLinks( false, false ); + rSh.GetLinkManager().UpdateAllLinks( false, false, nullptr ); rSh.EndAllAction(); } } diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 503a7cae6b7a..edf3f4a21e90 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -285,7 +285,7 @@ void SwView::SetVisArea( const tools::Rectangle &rRect, bool bUpdateScrollbar ) GetDocShell()->SvEmbeddedObject::SetVisArea( aVis );*/ } - SfxViewShell::VisAreaChanged( m_aVisArea ); + SfxViewShell::VisAreaChanged(); InvalidateRulerPos(); diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index fff7ffbacf6d..429a1eaa6b27 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -233,7 +233,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) //#i61455# if master documents are printed silently without loaded links then update the links now if( bSilent && pSh->IsGlobalDoc() && !pSh->IsGlblDocSaveLinks() ) { - pSh->GetLinkManager().UpdateAllLinks( false, false ); + pSh->GetLinkManager().UpdateAllLinks( false, false, nullptr ); } SfxRequest aReq( rReq ); SfxBoolItem aBool(SID_SELECTION, bPrintSelection); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 939145763a70..e2f1cf7d9aac 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2201,7 +2201,7 @@ void SwXTextDocument::updateLinks( ) if( !rLnkMan.GetLinks().empty() ) { UnoActionContext aAction(pDoc); - rLnkMan.UpdateAllLinks( false, false, true ); + rLnkMan.UpdateAllLinks( false, true, nullptr ); } } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index e695ffa171e7..94db8c159641 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -809,7 +809,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) case CTX_UPDATE_LINK: case CTX_UPDATE_ALL: { - pActiveShell->GetLinkManager().UpdateAllLinks(); + pActiveShell->GetLinkManager().UpdateAllLinks(true, false, nullptr); if(CTX_UPDATE_ALL == nSelectedPopupEntry) nSlot = FN_UPDATE_TOX; pCont = nullptr; |