diff options
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 18 | ||||
-rw-r--r-- | sw/source/uibase/app/docstyle.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 92 | ||||
-rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/uiview/srcview.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view.cxx | 26 | ||||
-rw-r--r-- | sw/source/uibase/uno/unoatxt.cxx | 22 | ||||
-rw-r--r-- | sw/source/uibase/utlui/content.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/utlui/glbltree.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 3 |
11 files changed, 88 insertions, 97 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 5b5e8e06637b..0b8196c16eb9 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -879,9 +879,9 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) pList->Update(); } } - else if(dynamic_cast<const SfxSimpleHint*>(&rHint)) + else { - if (static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DEINITIALIZING) + if (rHint.GetId() == SFX_HINT_DEINITIALIZING) { DELETEZ(m_pWebUsrPref); DELETEZ(m_pUsrPref); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 23d88a0baadb..92c6b1b83715 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -248,10 +248,16 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) lcl_processCompatibleSfxHint( xVbaEvents, rHint ); sal_uInt16 nAction = 0; - if( dynamic_cast<const SfxSimpleHint*>(&rHint) ) + if( dynamic_cast<const SfxEventHint*>(&rHint) && + static_cast<const SfxEventHint&>( rHint).GetEventId() == SFX_EVENT_LOADFINISHED ) + { + // #i38126# - own action id + nAction = 3; + } + else { // switch for more actions - switch( static_cast<const SfxSimpleHint&>( rHint).GetId() ) + switch( rHint.GetId() ) { case SFX_HINT_TITLECHANGED: if( GetMedium() ) @@ -259,12 +265,6 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) break; } } - else if( dynamic_cast<const SfxEventHint*>(&rHint) && - static_cast<const SfxEventHint&>( rHint).GetEventId() == SFX_EVENT_LOADFINISHED ) - { - // #i38126# - own action id - nAction = 3; - } if( nAction ) { @@ -1262,7 +1262,7 @@ void SwDocShell::SetModified( bool bSet ) } UpdateChildWindows(); - Broadcast(SfxSimpleHint(SFX_HINT_DOCCHANGED)); + Broadcast(SfxHint(SFX_HINT_DOCCHANGED)); } } diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 0203ee42c9d9..52f1737b7fe9 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -21,7 +21,6 @@ #include <cstdlib> -#include <svl/smplhint.hxx> #include <hintids.hxx> #include <svl/itemiter.hxx> #include <svl/eitem.hxx> diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 6be0a87fd6f2..c417b9185fa3 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -64,7 +64,7 @@ #include <svl/languageoptions.hxx> #include <svtools/langtab.hxx> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <svx/svdview.hxx> #include <editeng/eeitem.hxx> @@ -267,51 +267,6 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } } - else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) - { - sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); - switch ( nId ) - { - case SFX_HINT_MODECHANGED: - { - if ( mbReadOnly != !!(mpView->GetDocShell()->IsReadOnly()) ) - { - mbReadOnly = !mbReadOnly; - SetReadOnlyState(); - mbLayout = true; - } - break; - } - case SFX_HINT_DOCCHANGED: - { - if ( mpView->GetDocShell() == &rBC ) - { - if ( !mbWaitingForCalcRects && !mvPostItFields.empty()) - { - mbWaitingForCalcRects = true; - mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl) ); - } - } - break; - } - case SFX_HINT_USER04: - { - // if we are in a SplitNode/Cut operation, do not delete note and then add again, as this will flicker - mbDeleteNote = !mbDeleteNote; - break; - } - case SFX_HINT_DYING: - { - if ( mpView->GetDocShell() != &rBC ) - { - // field to be removed is the broadcaster - OSL_FAIL("Notification for removed SwFormatField was not sent!"); - RemoveItem(&rBC); - } - break; - } - } - } else if ( dynamic_cast<const SwFormatFieldHint*>(&rHint) ) { const SwFormatFieldHint& rFormatHint = static_cast<const SwFormatFieldHint&>(rHint); @@ -406,6 +361,51 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } } + else + { + sal_uInt32 nId = rHint.GetId(); + switch ( nId ) + { + case SFX_HINT_MODECHANGED: + { + if ( mbReadOnly != !!(mpView->GetDocShell()->IsReadOnly()) ) + { + mbReadOnly = !mbReadOnly; + SetReadOnlyState(); + mbLayout = true; + } + break; + } + case SFX_HINT_DOCCHANGED: + { + if ( mpView->GetDocShell() == &rBC ) + { + if ( !mbWaitingForCalcRects && !mvPostItFields.empty()) + { + mbWaitingForCalcRects = true; + mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl) ); + } + } + break; + } + case SFX_HINT_USER04: + { + // if we are in a SplitNode/Cut operation, do not delete note and then add again, as this will flicker + mbDeleteNote = !mbDeleteNote; + break; + } + case SFX_HINT_DYING: + { + if ( mpView->GetDocShell() != &rBC ) + { + // field to be removed is the broadcaster + OSL_FAIL("Notification for removed SwFormatField was not sent!"); + RemoveItem(&rBC); + } + break; + } + } + } } void SwPostItMgr::Focus(SfxBroadcaster& rBC) diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 670e3b31de8f..8afcea8794e9 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -1254,8 +1254,7 @@ void SwRedlineAcceptPanel::dispose() void SwRedlineAcceptPanel::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { - const SfxSimpleHint *pHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if (mpImplDlg && pHint && pHint->GetId() == SFX_HINT_DOCCHANGED) + if (mpImplDlg && rHint.GetId() == SFX_HINT_DOCCHANGED) mpImplDlg->Activate(); } diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 0735970b5bd8..b900589433f2 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -752,14 +752,10 @@ sal_Int32 SwSrcView::PrintSource( void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint && + if ( rHint.GetId() == SFX_HINT_MODECHANGED || ( - pSimpleHint->GetId() == SFX_HINT_MODECHANGED || - ( - pSimpleHint->GetId() == SFX_HINT_TITLECHANGED && - !GetDocShell()->IsReadOnly() && aEditWin->IsReadonly() - ) + rHint.GetId() == SFX_HINT_TITLECHANGED && + !GetDocShell()->IsReadOnly() && aEditWin->IsReadonly() ) ) { diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 2674f3e5ac39..8052a712534d 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1566,9 +1566,20 @@ SwGlossaryHdl* SwView::GetGlosHdl() void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { bool bCallBase = true; - if (const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint)) + if(dynamic_cast<const FmDesignModeChangedHint*>(&rHint)) { - sal_uInt32 nId = pSimpleHint->GetId(); + bool bDesignMode = static_cast<const FmDesignModeChangedHint&>(rHint).GetDesignMode(); + if (!bDesignMode && GetDrawFuncPtr()) + { + GetDrawFuncPtr()->Deactivate(); + SetDrawFuncPtr(nullptr); + LeaveDrawCreate(); + AttrChangedNotify(m_pWrtShell); + } + } + else + { + sal_uInt32 nId = rHint.GetId(); switch ( nId ) { // sub shells will be destroyed by the @@ -1637,17 +1648,6 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) break; } } - else if(dynamic_cast<const FmDesignModeChangedHint*>(&rHint)) - { - bool bDesignMode = static_cast<const FmDesignModeChangedHint&>(rHint).GetDesignMode(); - if (!bDesignMode && GetDrawFuncPtr()) - { - GetDrawFuncPtr()->Deactivate(); - SetDrawFuncPtr(nullptr); - LeaveDrawCreate(); - AttrChangedNotify(m_pWrtShell); - } - } if ( bCallBase ) SfxViewShell::Notify(rBC, rHint); diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 7de2f70f6d38..e61116d03218 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -48,7 +48,7 @@ #include <docsh.hxx> #include <swmodule.hxx> #include <swdll.hxx> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <svl/macitem.hxx> #include <editeng/acorrcfg.hxx> #include <comphelper/servicehelper.hxx> @@ -763,25 +763,25 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) { if ( &_rBC == &xDocSh ) { // it's our document - if (const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&_rHint)) + if (const SfxEventHint* pEventHint = dynamic_cast<const SfxEventHint*>(&_rHint)) { - if ( SFX_HINT_DEINITIALIZING == pSimpleHint->GetId() ) + if (SFX_EVENT_PREPARECLOSEDOC == pEventHint->GetEventId()) { - // our document is dying (possibly because we're shuting down, and the document was notified - // earlier than we are?) - // stop listening at the docu + implFlushDocument(); + xBodyText = nullptr; EndListening( *&xDocSh ); - // and release our reference xDocSh.Clear(); } } - else if (const SfxEventHint* pEventHint = dynamic_cast<const SfxEventHint*>(&_rHint)) + else { - if (SFX_EVENT_PREPARECLOSEDOC == pEventHint->GetEventId()) + if ( SFX_HINT_DEINITIALIZING == _rHint.GetId() ) { - implFlushDocument(); - xBodyText = nullptr; + // our document is dying (possibly because we're shuting down, and the document was notified + // earlier than we are?) + // stop listening at the docu EndListening( *&xDocSh ); + // and release our reference xDocSh.Clear(); } } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index b49503448d18..f6a4cc1a30b2 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2198,8 +2198,7 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh) void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint) { - SfxSimpleHint const*const pHint(dynamic_cast<SfxSimpleHint const*>(&rHint)); - if (pHint && SFX_HINT_DOCCHANGED == pHint->GetId()) + if (SFX_HINT_DOCCHANGED == rHint.GetId()) { m_bActiveDocModified = true; return; diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 1a0a5a2810a4..46902cc28a3d 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -140,8 +140,7 @@ public: void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint ); - if( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING) + if( rHint.GetId() == SFX_HINT_DYING) bValid = false; } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 9212c076ae47..cb68eb601121 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -962,8 +962,7 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint ) { if(&rBrdc == m_pCreateView) { - const SfxSimpleHint* pHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if (pHint && pHint->GetId() == SFX_HINT_DYING) + if (rHint.GetId() == SFX_HINT_DYING) { m_pCreateView = nullptr; } |