summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/drawdoc3.cxx2
-rw-r--r--sd/source/core/sdpage.cxx6
-rw-r--r--sd/source/core/stlpool.cxx6
-rw-r--r--sd/source/core/stlsheet.cxx16
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx6
-rw-r--r--sd/source/ui/app/sdmod.cxx2
-rw-r--r--sd/source/ui/app/sdxfer.cxx2
-rw-r--r--sd/source/ui/dlg/docprev.cxx2
-rw-r--r--sd/source/ui/dlg/unchss.cxx8
-rw-r--r--sd/source/ui/docshell/docshell.cxx4
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx4
-rw-r--r--sd/source/ui/func/fuprobjs.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx8
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.cxx11
-rw-r--r--sd/source/ui/slidesorter/controller/SlsTransferableData.cxx2
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx2
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx2
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sd/source/ui/view/FormShellManager.cxx2
-rw-r--r--sd/source/ui/view/drawview.cxx10
-rw-r--r--sd/source/ui/view/drviewsa.cxx2
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx2
24 files changed, 51 insertions, 56 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index e20c8d0ccdda..ec85bb7cb0a7 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1585,7 +1585,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
pUndoMgr->AddUndoAction(pUndoChStyle);
}
pMySheet->GetItemSet().Put(pHisSheet->GetItemSet());
- pMySheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pMySheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
else
{
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 945056d55f71..6fb1ae934307 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1941,7 +1941,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
rSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CTL));
}
- pTitleSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pTitleSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
}
else if (pObj == GetPresObj(PRESOBJ_OUTLINE, nIndexOutline))
@@ -2001,7 +2001,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
}
pOutlineSheet->GetItemSet().Put(aTempSet);
- pOutlineSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pOutlineSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
}
}
@@ -2017,7 +2017,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
rSet.Put( SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT ));
rSet.Put( SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CJK ));
rSet.Put( SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CTL ));
- pNotesSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pNotesSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
}
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index a71f529bc7a9..607028598f26 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1112,7 +1112,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
}
rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) );
- static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SFX_HINT_DATACHANGED ) );
+ static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SfxHintId::DataChanged ) );
}
break;
@@ -1145,7 +1145,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
}
rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) );
- static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SFX_HINT_DATACHANGED ) );
+ static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SfxHintId::DataChanged ) );
}
}
break;
@@ -1170,7 +1170,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
}
rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) );
- static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SFX_HINT_DATACHANGED ) );
+ static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SfxHintId::DataChanged ) );
}
break;
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index c0b7a0d98523..87cfcfed59cc 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -192,14 +192,14 @@ bool SdStyleSheet::SetParent(const OUString& rParentName)
bResult = true;
SfxItemSet& rParentSet = pStyle->GetItemSet();
GetItemSet().SetParent(&rParentSet);
- Broadcast( SfxHint( SFX_HINT_DATACHANGED ) );
+ Broadcast( SfxHint( SfxHintId::DataChanged ) );
}
}
else
{
bResult = true;
GetItemSet().SetParent(nullptr);
- Broadcast( SfxHint( SFX_HINT_DATACHANGED ) );
+ Broadcast( SfxHint( SfxHintId::DataChanged ) );
}
}
else
@@ -526,7 +526,7 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
/* if the dummy gets a notify about a changed attribute, he takes care that
the actual ment style sheet sends broadcasts. */
- if (rHint.GetId() == SFX_HINT_DATACHANGED)
+ if (rHint.GetId() == SfxHintId::DataChanged)
{
SdStyleSheet* pRealStyle = GetRealStyleSheet();
if (pRealStyle)
@@ -883,7 +883,7 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeExcep
if( SetName( rName ) )
{
msApiName = rName;
- Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ Broadcast(SfxHint(SfxHintId::DataChanged));
}
}
@@ -1048,7 +1048,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con
}
rStyleSet.Put( aSet );
- Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ Broadcast(SfxHint(SfxHintId::DataChanged));
}
}
@@ -1281,7 +1281,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName )
{
rStyleSet.ClearItem( pEntry->nWID );
}
- Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ Broadcast(SfxHint(SfxHintId::DataChanged));
}
Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
@@ -1329,7 +1329,7 @@ void SdStyleSheet::BroadcastSdStyleSheetChange(SfxStyleSheetBase* pStyleSheet,
PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool)
{
SdStyleSheet* pRealSheet = static_cast<SdStyleSheet*>(pStyleSheet)->GetRealStyleSheet();
- pRealSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pRealSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) )
{
@@ -1344,7 +1344,7 @@ void SdStyleSheet::BroadcastSdStyleSheetChange(SfxStyleSheetBase* pStyleSheet,
if(pSheet)
{
SdStyleSheet* pRealStyleSheet = static_cast<SdStyleSheet*>(pSheet)->GetRealStyleSheet();
- pRealStyleSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pRealStyleSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
}
}
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index d7f0dc03ab3c..5a1aa3f7e655 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -49,7 +49,7 @@ namespace accessibility
{
if( mpOutliner )
mpOutliner->SetNotifyHdl( Link<EENotify&,void>() );
- Broadcast( TextHint( SFX_HINT_DYING ) );
+ Broadcast( TextHint( SfxHintId::Dying ) );
}
SvxEditSource* AccessibleOutlineEditSource::Clone() const
@@ -175,7 +175,7 @@ namespace accessibility
if( &rBroadcaster == mpOutliner )
{
- if( rHint.GetId() == SFX_HINT_DYING )
+ if( rHint.GetId() == SfxHintId::Dying )
{
bDispose = true;
mpOutliner = nullptr;
@@ -198,7 +198,7 @@ namespace accessibility
mpOutliner->SetNotifyHdl( Link<EENotify&,void>() );
mpOutliner = nullptr;
mpOutlinerView = nullptr;
- Broadcast( TextHint( SFX_HINT_DYING ) );
+ Broadcast( TextHint( SfxHintId::Dying ) );
}
}
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 18df03c9cd69..ebef895ad347 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -119,7 +119,7 @@ SdModule::~SdModule()
/// get notifications
void SdModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- if( rHint.GetId() == SFX_HINT_DEINITIALIZING )
+ if( rHint.GetId() == SfxHintId::Deinitializing )
{
delete pImpressOptions;
pImpressOptions = nullptr;
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 12b55eeb1d8f..f0a06b234fdd 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -809,7 +809,7 @@ void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
else
{
- if( rHint.GetId() == SFX_HINT_DYING )
+ if( rHint.GetId() == SfxHintId::Dying )
{
if( &rBC == mpSourceDoc )
mpSourceDoc = nullptr;
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 6d987cbd59ab..6efc4a9f826b 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -193,7 +193,7 @@ void SdDocPreviewWin::updateViewSettings()
void SdDocPreviewWin::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
- if( rHint.GetId() == SFX_HINT_COLORS_CHANGED )
+ if( rHint.GetId() == SfxHintId::ColorsChanged )
{
updateViewSettings();
}
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index a0cd44131be1..604ddd093209 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -101,9 +101,9 @@ void StyleSheetUndoAction::Undo()
mpStyleSheet->GetItemSet().Set(aNewSet);
if( mpStyleSheet->GetFamily() == SD_STYLE_FAMILY_PSEUDO )
- static_cast<SdStyleSheet*>(mpStyleSheet)->GetRealStyleSheet()->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ static_cast<SdStyleSheet*>(mpStyleSheet)->GetRealStyleSheet()->Broadcast(SfxHint(SfxHintId::DataChanged));
else
- mpStyleSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ mpStyleSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
void StyleSheetUndoAction::Redo()
@@ -113,9 +113,9 @@ void StyleSheetUndoAction::Redo()
mpStyleSheet->GetItemSet().Set(aNewSet);
if( mpStyleSheet->GetFamily() == SD_STYLE_FAMILY_PSEUDO )
- static_cast<SdStyleSheet*>(mpStyleSheet)->GetRealStyleSheet()->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ static_cast<SdStyleSheet*>(mpStyleSheet)->GetRealStyleSheet()->Broadcast(SfxHint(SfxHintId::DataChanged));
else
- mpStyleSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ mpStyleSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index f07eb0fbac75..05d27b647db1 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -172,7 +172,7 @@ DrawDocShell::~DrawDocShell()
// destroyed. This has been introduced for the PreviewRenderer to
// free its view (that uses the item poll of the doc shell) but
// may be useful in other places as well.
- Broadcast(SfxHint(SFX_HINT_DYING));
+ Broadcast(SfxHint(SfxHintId::Dying));
mbInDestruction = true;
@@ -429,7 +429,7 @@ void DrawDocShell::SetModified( bool bSet /* = true */ )
if ( mpDoc )
mpDoc->NbcSetChanged( bSet );
- Broadcast( SfxHint( SFX_HINT_DOCCHANGED ) );
+ Broadcast( SfxHint( SfxHintId::DocChanged ) );
}
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index d614f06c3a5f..faff98541cac 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -970,7 +970,7 @@ void SAL_CALL LifetimeController::disposing (const lang::EventObject& rEvent)
void LifetimeController::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint)
{
(void)rBroadcaster;
- if (rHint.GetId() == SFX_HINT_DYING)
+ if (rHint.GetId() == SfxHintId::Dying)
{
mbListeningToViewShellBase = false;
Update();
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 15515f88463c..998e15756133 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -412,7 +412,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
mpDocSh->GetUndoManager()->AddUndoAction(pAction);
pStyleSheet->GetItemSet().Put( *(pTempSet.get()) );
sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() );
- pStyleSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pStyleSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
else if( bSetToAllPages )
{
@@ -434,7 +434,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
pUndoGroup->AddAction(pAction);
pStyle->GetItemSet().Put( *(pTempSet.get()) );
sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() );
- pStyle->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pStyle->Broadcast(SfxHint(SfxHintId::DataChanged));
}
//Remove background from all pages to reset to the master bg
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 575638d4f58d..683c7e58cab1 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -149,7 +149,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
mpDocSh->GetUndoManager()->AddUndoAction(pAction);
pStyleSheet->GetItemSet().Put( *pOutSet );
- static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SFX_HINT_DATACHANGED ) );
+ static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SfxHintId::DataChanged ) );
}
}
}
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 535237564c7a..33d8a0e654a2 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -420,7 +420,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
pFirstStyleSheet->GetItemSet().Put( SvxNumBulletItem( aRule, EE_PARA_NUMBULLET ));
SdStyleSheet* pRealSheet = static_cast<SdStyleSheet*>(pFirstStyleSheet)->GetRealStyleSheet();
- pRealSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pRealSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
aTempSet.ClearItem( EE_PARA_NUMBULLET );
@@ -507,7 +507,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
}
- static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SFX_HINT_DATACHANGED ) );
+ static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SfxHintId::DataChanged ) );
DrawViewShell* pDrawViewShell = dynamic_cast< DrawViewShell* >( mpViewShell );
if( pDrawViewShell )
@@ -596,7 +596,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
mpView->SetStyleSheet( static_cast<SfxStyleSheet*>(pStyleSheet));
}
- static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SFX_HINT_DATACHANGED ) );
+ static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SfxHintId::DataChanged ) );
mpDoc->SetChanged();
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
@@ -623,7 +623,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
mpView->SetStyleSheet( static_cast<SfxStyleSheet*>(pStyleSheet));
- static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SFX_HINT_DATACHANGED ) );
+ static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SfxHintId::DataChanged ) );
mpDoc->SetChanged();
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 4e7ed4167752..0d6f2a499945 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -332,15 +332,10 @@ void Listener::Notify (
break;
}
}
- else
+ else if (rHint.GetId() == SfxHintId::DocChanged)
{
- switch (rHint.GetId())
- {
- case SFX_HINT_DOCCHANGED:
- mrController.CheckForMasterPageAssignment();
- mrController.CheckForSlideTransitionAssignment();
- break;
- }
+ mrController.CheckForMasterPageAssignment();
+ mrController.CheckForSlideTransitionAssignment();
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
index 34b85638bd31..f2935097d846 100644
--- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
@@ -72,7 +72,7 @@ void TransferableData::Notify (SfxBroadcaster&, const SfxHint& rHint)
{
if (mpViewShell)
{
- if (rHint.GetId() == SFX_HINT_DYING)
+ if (rHint.GetId() == SfxHintId::Dying)
{
// This hint may come either from the ViewShell or from the
// document (registered by SdTransferable). We do not know
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 924a5e91e6a9..fc9f3763f1cc 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -655,7 +655,7 @@ void EventMultiplexer::Implementation::Notify (
}
else
{
- if (rHint.GetId() == SFX_HINT_DYING)
+ if (rHint.GetId() == SfxHintId::Dying)
mpDocument = nullptr;
}
}
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index 8d39a1e335dc..f174577eef6c 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -477,7 +477,7 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint)
if (!mpDocShellOfView)
return;
- if (rHint.GetId() == SFX_HINT_DYING)
+ if (rHint.GetId() == SfxHintId::Dying)
{
// The doc shell is dying. Our view uses its item pool and
// has to be destroyed as well. The next call to
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b3ef578dbe1c..bfa63e6d8ff4 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -428,7 +428,7 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
else
{
// did our SdDrawDocument just died?
- if(rHint.GetId() == SFX_HINT_DYING)
+ if(rHint.GetId() == SfxHintId::Dying)
{
// yes, so we ask for a new one
if( mpDocShell )
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 79256111916b..6dfcbfd36747 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1174,7 +1174,7 @@ public:
if (&rBroadcaster != &static_cast<SfxBroadcaster&>(mrBase))
return;
- if (rHint.GetId() == SFX_HINT_DYING)
+ if (rHint.GetId() == SfxHintId::Dying)
{
mbIsDisposed = true;
}
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index 41b567fb9107..e10c6120ac76 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -263,7 +263,7 @@ IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void)
void FormShellManager::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
- if (rHint.GetId()==SFX_HINT_DYING)
+ if (rHint.GetId()==SfxHintId::Dying)
{
// If all goes well this listener is called after the
// FormShellManager was notified about the dying form shell by the
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index d91cc295a6ca..c5f2cd99b179 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -167,7 +167,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
mpDocSh->GetUndoManager()->AddUndoAction(pAction);
pSheet->GetItemSet().Put(aTempSet);
- pSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
bOk = true;
}
else if (eObjKind == OBJ_OUTLINETEXT)
@@ -218,7 +218,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
mpDocSh->GetUndoManager()->AddUndoAction(pAction);
pSheet->GetItemSet().Put(aTempSet);
- pSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
// now also broadcast any child sheets
sal_Int16 nChild;
@@ -229,7 +229,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
SfxStyleSheet* pOutlSheet = static_cast< SfxStyleSheet* >(pStShPool->Find(aSheetName, SD_STYLE_FAMILY_MASTERPAGE));
if( pOutlSheet )
- pOutlSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pOutlSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
}
@@ -294,7 +294,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
mpDocSh->GetUndoManager()->AddUndoAction(pAction);
pSheet->GetItemSet().Put(aTempSet,false);
- pSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
bOk = true;
}
else if (eObjKind == OBJ_OUTLINETEXT)
@@ -337,7 +337,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
mpDocSh->GetUndoManager()->AddUndoAction(pAction);
pSheet->GetItemSet().Set(aTempSet,false);
- pSheet->Broadcast(SfxHint(SFX_HINT_DATACHANGED));
+ pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
// remove all hard set items from shape that are now set in style
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 56c43e9d67d4..17b136025af7 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -723,7 +723,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint)
{
- if (rHint.GetId()==SFX_HINT_MODECHANGED)
+ if (rHint.GetId()==SfxHintId::ModeChanged)
{
// Change to selection when turning on read-only mode.
if(GetDocSh()->IsReadOnly() && dynamic_cast< FuSelection* >( GetCurrentFunction().get() ) )
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 1a3433913fc2..0785329a912b 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -419,7 +419,7 @@ ViewOverlayManager::~ViewOverlayManager()
void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
- if (rHint.GetId() == SFX_HINT_DOCCHANGED)
+ if (rHint.GetId() == SfxHintId::DocChanged)
{
UpdateTags();
}