diff options
48 files changed, 166 insertions, 191 deletions
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 18e07bc6a340..6092d460fae2 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -477,7 +477,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint ) { switch ( pSdrHint->GetKind() ) { - case HINT_OBJINSERTED: + case SdrHintKind::ObjectInserted: { if (DlgEdObj const* pDlgEdObj = dynamic_cast<DlgEdObj const*>(pSdrHint->GetObject())) { @@ -487,7 +487,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } break; - case HINT_OBJREMOVED: + case SdrHintKind::ObjectRemoved: { if (DlgEdObj const* pDlgEdObj = dynamic_cast<DlgEdObj const*>(pSdrHint->GetObject())) RemoveChild( ChildDescriptor(const_cast<DlgEdObj*>(pDlgEdObj)) ); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index b96c3f3ee987..f885911f8154 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -334,7 +334,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if( pSdrHint != nullptr ) { SdrHintKind eKind = pSdrHint->GetKind(); - if( eKind == HINT_BEGEDIT ) + if( eKind == SdrHintKind::BeginEdit ) { // #i79965# remember map mode OSL_ASSERT( ! m_bRestoreMapMode ); @@ -345,7 +345,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) m_bRestoreMapMode = true; } } - else if( eKind == HINT_ENDEDIT ) + else if( eKind == SdrHintKind::EndEdit ) { // #i79965# scroll back view when ending text edit OSL_ASSERT( m_bRestoreMapMode ); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index b52ca2470d1a..f04bcf75c842 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2812,19 +2812,19 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) bool bShapeChanged = false; switch( pSdrHint->GetKind() ) { - case HINT_OBJCHG: + case SdrHintKind::ObjectChange: bShapeChanged = true; break; - case HINT_OBJINSERTED: + case SdrHintKind::ObjectInserted: bShapeChanged = true; break; - case HINT_OBJREMOVED: + case SdrHintKind::ObjectRemoved: bShapeChanged = true; break; - case HINT_MODELCLEARED: + case SdrHintKind::ModelCleared: bShapeChanged = true; break; - case HINT_ENDEDIT: + case SdrHintKind::EndEdit: bShapeChanged = true; break; default: diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index effd5335b508..5fd8394f4161 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -166,9 +166,9 @@ namespace accessibility edit/non-edit mode (i.e. there are times when SvxEditSource::GetEditViewForwarder(sal_False) returns NULL), then the two additional hints are required: - HINT_BEGEDIT and HINT_ENDEDIT. When the - AccessibleTextHelper receives a HINT_BEGEDIT, it expects - the SvxEditSource already in edit mode. On a HINT_ENDEDIT, + SdrHintKind::BeginEdit and SdrHintKind::EndEdit. When the + AccessibleTextHelper receives a SdrHintKind::BeginEdit, it expects + the SvxEditSource already in edit mode. On a SdrHintKind::EndEdit, edit mode must already been left. The rationale for these events are the fact that focus and selection have to be updated in edit mode, and completely relinquished and diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 30084a87c564..e44ba066b856 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -101,44 +101,43 @@ namespace o3tl } -enum SdrHintKind +enum class SdrHintKind { - HINT_UNKNOWN, // Unknown - HINT_LAYERCHG, // changed layer definition - HINT_LAYERORDERCHG, // order of layer changed (Insert/Remove/ChangePos) - HINT_PAGEORDERCHG, // order of pages (object pages or master pages) changed (Insert/Remove/ChangePos) - HINT_OBJCHG, // object changed - HINT_OBJINSERTED, // new object inserted - HINT_OBJREMOVED, // symbol object removed from list - HINT_MODELCLEARED, // deleted the whole model (no pages exist anymore). not impl. - HINT_REFDEVICECHG, // RefDevice changed - HINT_DEFAULTTABCHG, // Default tabulator width changed - HINT_DEFFONTHGTCHG, // Default FontHeight changed - HINT_MODELSAVED, // Document was saved - HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page - HINT_BEGEDIT, // Is called after the object has entered text edit mode - HINT_ENDEDIT // Is called after the object has left text edit mode + Unknown, // Unknown + LayerChange, // changed layer definition + LayerOrderChange, // order of layer changed (Insert/Remove/ChangePos) + PageOrderChange, // order of pages (object pages or master pages) changed (Insert/Remove/ChangePos) + ObjectChange, // object changed + ObjectInserted, // new object inserted + ObjectRemoved, // symbol object removed from list + ModelCleared, // deleted the whole model (no pages exist anymore). not impl. + RefDeviceChange, // RefDevice changed + DefaultTabChange, // Default tabulator width changed + DefaultFontHeightChange, // Default FontHeight changed + ModelSaved, // Document was saved + SwitchToPage, // #94278# UNDO/REDO at an object evtl. on another page + BeginEdit, // Is called after the object has entered text edit mode + EndEdit // Is called after the object has left text edit mode }; class SVX_DLLPUBLIC SdrHint: public SfxHint { -public: - Rectangle maRectangle; - const SdrPage* mpPage; - const SdrObject* mpObj; +private: SdrHintKind meHint; + const SdrObject* mpObj; + const SdrPage* mpPage; + Rectangle maRectangle; public: explicit SdrHint(SdrHintKind eNewHint); - explicit SdrHint(const SdrObject& rNewObj); - - void SetPage(const SdrPage* pNewPage); - void SetObject(const SdrObject* pNewObj); - void SetKind(SdrHintKind eNewKind); + explicit SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj); + explicit SdrHint(SdrHintKind eNewHint, const SdrPage* pPage); + explicit SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj, const SdrPage* pPage); - const SdrPage* GetPage() const { return mpPage;} + const SdrPage* GetPage() const { return mpPage;} const SdrObject* GetObject() const { return mpObj;} - SdrHintKind GetKind() const { return meHint;} + SdrHintKind GetKind() const { return meHint;} + const Rectangle& GetRectangle() const { return maRectangle;} }; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 331f3870c5bc..b687bd609676 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -244,7 +244,7 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; void GlueInvalidate() const; - // ModelHasChanged is called, as soon as the system is idle again after many HINT_OBJCHG. + // ModelHasChanged is called, as soon as the system is idle again after many SdrHintKind::ObjectChange. // // Any sub-class override this method, MUST call the base class' ModelHasChanged() method virtual void ModelHasChanged(); diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index bb01d282d17e..d7796c7549b2 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -132,9 +132,9 @@ void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) const SdrObject* pObj = pSdrHint->GetObject(); const SdrHintKind eKind = pSdrHint->GetKind(); // check for change of selected object - if(HINT_OBJCHG == eKind && pObj && IsObjMarked(const_cast<SdrObject*>(pObj))) + if(SdrHintKind::ObjectChange == eKind && pObj && IsObjMarked(const_cast<SdrObject*>(pObj))) AdjustMarkHdl(); - else if ( eKind == HINT_OBJREMOVED ) + else if ( eKind == SdrHintKind::ObjectRemoved ) ObjectRemovedInAliveMode(pObj); } } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 7d7edbf235f5..c537eae5fdce 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -162,7 +162,7 @@ void ScUndoAnchorData::Undo() // Trigger Object Change if (pObj->IsInserted() && pObj->GetPage() && pObj->GetModel()) { - SdrHint aHint(*pObj); + SdrHint aHint(SdrHintKind::ObjectChange, *pObj); pObj->GetModel()->Broadcast(aHint); } @@ -182,7 +182,7 @@ void ScUndoAnchorData::Redo() // Trigger Object Change if (pObj->IsInserted() && pObj->GetPage() && pObj->GetModel()) { - SdrHint aHint(*pObj); + SdrHint aHint(SdrHintKind::ObjectChange, *pObj); pObj->GetModel()->Broadcast(aHint); } } @@ -336,7 +336,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : ScDrawLayer::~ScDrawLayer() { - Broadcast(SdrHint(HINT_MODELCLEARED)); + Broadcast(SdrHint(SdrHintKind::ModelCleared)); ClearModel(true); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index cc6eff80014e..9c787591ee28 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -411,7 +411,7 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint) { switch (pSdrHint->GetKind()) { - case HINT_OBJCHG : // Objekt geaendert + case SdrHintKind::ObjectChange : // Objekt geaendert { uno::Reference<drawing::XShape> xShape (pObj->getUnoShape(), uno::UNO_QUERY); if (xShape.is()) @@ -422,14 +422,14 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint) } } break; - case HINT_OBJINSERTED : // Neues Zeichenobjekt eingefuegt + case SdrHintKind::ObjectInserted : // Neues Zeichenobjekt eingefuegt { uno::Reference<drawing::XShape> xShape (pObj->getUnoShape(), uno::UNO_QUERY); if (xShape.is()) AddShape(xShape, true); } break; - case HINT_OBJREMOVED : // Zeichenobjekt aus Liste entfernt + case SdrHintKind::ObjectRemoved : // Zeichenobjekt aus Liste entfernt { uno::Reference<drawing::XShape> xShape (pObj->getUnoShape(), uno::UNO_QUERY); if (xShape.is()) diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 4e6aa39d7506..604eb894476a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -706,7 +706,7 @@ void ScShapeChildren::Notify(SfxBroadcaster&, const SfxHint& rHint) { switch (pSdrHint->GetKind()) { - case HINT_OBJCHG : // Objekt geaendert + case SdrHintKind::ObjectChange : // Objekt geaendert { } break; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 0aa7255f41a3..66662840b995 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -387,7 +387,7 @@ void ScAccessibleEditObject::CreateTextHelper() // do not activate cell object, if top edit line is active if( pInputHdl && !pInputHdl->IsTopMode() ) { - SdrHint aHint( HINT_BEGEDIT ); + SdrHint aHint( SdrHintKind::BeginEdit ); mpTextHelper->GetEditSource().GetBroadcaster().Broadcast( aHint ); } } diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 5c4e0c1a82d1..35a6a01e6f39 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -1170,15 +1170,15 @@ void ScAccessibleEditLineTextData::StartEdit() ResetEditMode(); mpEditView = nullptr; - // send HINT_BEGEDIT - SdrHint aHint(HINT_BEGEDIT); + // send SdrHintKind::BeginEdit + SdrHint aHint(SdrHintKind::BeginEdit); GetBroadcaster().Broadcast( aHint ); } void ScAccessibleEditLineTextData::EndEdit() { - // send HINT_ENDEDIT - SdrHint aHint(HINT_ENDEDIT); + // send SdrHintKind::EndEdit + SdrHint aHint(SdrHintKind::EndEdit); GetBroadcaster().Broadcast( aHint ); ResetEditMode(); diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 85228549b314..cae79d154f07 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -139,7 +139,7 @@ namespace { */ void adjustAnchoredPosition(const SdrHint& rHint, const ScDocument& rDoc, SCTAB nTab) { - if (rHint.GetKind() != HINT_OBJCHG && rHint.GetKind() != HINT_OBJINSERTED) + if (rHint.GetKind() != SdrHintKind::ObjectChange && rHint.GetKind() != SdrHintKind::ObjectInserted) return; SdrObject* pObj = const_cast<SdrObject*>(rHint.GetObject()); diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 0b8af5dd7ad1..da0df15090e2 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -59,7 +59,7 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) else if (dynamic_cast<const SdrHint*>(&rHint)) { // SdrHints are no longer used for invalidating, thus react on objectchange instead - if(HINT_OBJCHG == static_cast<const SdrHint&>(rHint).GetKind()) + if(SdrHintKind::ObjectChange == static_cast<const SdrHint&>(rHint).GetKind()) bDataChanged = true; } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 2b06a98c1477..bdf3395cd677 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -373,7 +373,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // Destructor SdDrawDocument::~SdDrawDocument() { - Broadcast(SdrHint(HINT_MODELCLEARED)); + Broadcast(SdrHint(SdrHintKind::ModelCleared)); if (mpWorkStartupTimer) { diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 5321eb928da5..2c090c0db1fb 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -847,13 +847,11 @@ bool SdDrawDocument::InsertBookmarkAsPage( // Get the name to use from Exchange list OUString aExchangeName(*pExchangeIter); pRefPage->SetName(aExchangeName); - SdrHint aHint(HINT_PAGEORDERCHG); - aHint.SetPage(pRefPage); - Broadcast(aHint); + Broadcast(SdrHint(SdrHintKind::PageOrderChange, pRefPage)); + SdPage* pNewNotesPage = GetSdPage(nSdPage, PK_NOTES); pNewNotesPage->SetName(aExchangeName); - aHint.SetPage(pNewNotesPage); - Broadcast(aHint); + Broadcast(SdrHint(SdrHintKind::PageOrderChange, pNewNotesPage)); ++pExchangeIter; } diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index f9e9d2ca56b3..a586545cb2f2 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -186,7 +186,7 @@ namespace accessibility { const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint ); - if( pSdrHint && ( pSdrHint->GetKind() == HINT_MODELCLEARED ) ) + if( pSdrHint && ( pSdrHint->GetKind() == SdrHintKind::ModelCleared ) ) { // model is dying under us, going defunc bDispose = true; diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 1afc650031a8..3380de7ef4e3 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -853,7 +853,7 @@ void AccessibleSlideSorterView::Implementation::Notify ( { switch (pSdrHint->GetKind()) { - case HINT_PAGEORDERCHG: + case SdrHintKind::PageOrderChange: RequestUpdateChildren(); break; default: diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 2091166dacd2..6f07464ae178 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -801,7 +801,7 @@ void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint ); if( pSdrHint ) { - if( HINT_MODELCLEARED == pSdrHint->GetKind() ) + if( SdrHintKind::ModelCleared == pSdrHint->GetKind() ) { EndListening(*mpSourceDoc); mpSourceDoc = nullptr; diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 6870683598a9..5dcd4b78db14 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -115,7 +115,7 @@ void SpellDialogChildWindow::Notify(SfxBroadcaster&, const SfxHint& rHint) { if (const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint)) { - if (HINT_MODELCLEARED == pSdrHint->GetKind()) + if (SdrHintKind::ModelCleared == pSdrHint->GetKind()) { EndSpellingAndClearOutliner(); } diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index cc32177d3bfa..4b2db78b4244 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -226,7 +226,7 @@ void MasterPageObserver::Implementation::Notify( { switch (pSdrHint->GetKind()) { - case HINT_PAGEORDERCHG: + case SdrHintKind::PageOrderChange: // Process the modified set of pages only when the number of // standard and notes master pages are equal. This test // filters out events that are sent in between the insertion diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 22e6f7118316..a775b80e6a97 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -282,14 +282,14 @@ void Listener::Notify ( { switch (pSdrHint->GetKind()) { - case HINT_MODELCLEARED: + case SdrHintKind::ModelCleared: if (&rBroadcaster == mrSlideSorter.GetModel().GetDocument()) { // rhbz#965646 stop listening to dying document EndListening(rBroadcaster); return; } break; - case HINT_PAGEORDERCHG: + case SdrHintKind::PageOrderChange: if (&rBroadcaster == mrSlideSorter.GetModel().GetDocument()) HandleModelChange(pSdrHint->GetPage()); break; diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 7a505eeb871b..3b048aedf555 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -641,26 +641,26 @@ void EventMultiplexer::Implementation::Notify ( { switch (pSdrHint->GetKind()) { - case HINT_MODELCLEARED: - case HINT_PAGEORDERCHG: + case SdrHintKind::ModelCleared: + case SdrHintKind::PageOrderChange: CallListeners (EventMultiplexerEvent::EID_PAGE_ORDER); break; - case HINT_SWITCHTOPAGE: + case SdrHintKind::SwitchToPage: CallListeners (EventMultiplexerEvent::EID_CURRENT_PAGE); break; - case HINT_OBJCHG: + case SdrHintKind::ObjectChange: CallListeners(EventMultiplexerEvent::EID_SHAPE_CHANGED, const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage()))); break; - case HINT_OBJINSERTED: + case SdrHintKind::ObjectInserted: CallListeners(EventMultiplexerEvent::EID_SHAPE_INSERTED, const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage()))); break; - case HINT_OBJREMOVED: + case SdrHintKind::ObjectRemoved: CallListeners(EventMultiplexerEvent::EID_SHAPE_REMOVED, const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage()))); break; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 0f14dfbdbd1a..27fd3ce6361f 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -158,7 +158,7 @@ void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) t if( pSdrHint ) { - if( HINT_MODELCLEARED == pSdrHint->GetKind() ) + if( SdrHintKind::ModelCleared == pSdrHint->GetKind() ) { mpModel = nullptr; } @@ -417,7 +417,7 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) notifyEvent( aEvent ); } - if( pSdrHint->GetKind() == HINT_MODELCLEARED ) + if( pSdrHint->GetKind() == SdrHintKind::ModelCleared ) { if( mpDoc ) EndListening( *mpDoc ); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 06941d2204ee..77b63c0bda99 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -85,7 +85,7 @@ void SdUnoPageBackground::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // delete item set if document is dying because then the pool // will also die - if( pSdrHint->GetKind() == HINT_MODELCLEARED ) + if( pSdrHint->GetKind() == SdrHintKind::ModelCleared ) { delete mpSet; mpSet = nullptr; diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index a05aa94b1956..f2f0bcf4f8be 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -377,17 +377,17 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SdrHintKind eHintKind = static_cast<const SdrHint&>(rHint).GetKind(); - if ( mnPOCHSmph == 0 && eHintKind == HINT_PAGEORDERCHG ) + if ( mnPOCHSmph == 0 && eHintKind == SdrHintKind::PageOrderChange ) { mpDrawViewShell->ResetActualPage(); } - else if ( eHintKind == HINT_LAYERCHG || eHintKind == HINT_LAYERORDERCHG ) + else if ( eHintKind == SdrHintKind::LayerChange || eHintKind == SdrHintKind::LayerOrderChange ) { mpDrawViewShell->ResetActualLayer(); } // switch to that page when it's not a master page - if(HINT_SWITCHTOPAGE == eHintKind) + if(SdrHintKind::SwitchToPage == eHintKind) { const SdrPage* pPage = static_cast<const SdrHint&>(rHint).GetPage(); diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index c18da6d75cd6..ebad3d603f23 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -309,7 +309,7 @@ namespace accessibility { const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>( &rHint ); - if( pSdrHint && pSdrHint->GetKind() == HINT_BEGEDIT && + if( pSdrHint && pSdrHint->GetKind() == SdrHintKind::BeginEdit && &mrObj == pSdrHint->GetObject() && mpEditSource.get() ) { // switch edit source, if not yet done. This is necessary diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index b31023bada37..444c08897507 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1275,7 +1275,7 @@ namespace accessibility { switch( pSdrHint->GetKind() ) { - case HINT_BEGEDIT: + case SdrHintKind::BeginEdit: { if(!IsActive()) { @@ -1289,7 +1289,7 @@ namespace accessibility break; } - case HINT_ENDEDIT: + case SdrHintKind::EndEdit: { // focused child now loses focus ESelection aSelection; diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 827078bc8100..46b6c313d248 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -740,7 +740,7 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi { switch( pSdrHint->GetKind() ) { - case HINT_OBJCHG: + case SdrHintKind::ObjectChange: { ShapesMapType::iterator iter = mxShapes.find( pSdrHint->GetObject() ); @@ -755,13 +755,13 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi } break; - case HINT_OBJINSERTED: + case SdrHintKind::ObjectInserted: CommitChange( AccessibleEventId::CHILD, makeAny( getAccessible( pSdrHint->GetObject() ) ) , uno::Any()); break; - case HINT_OBJREMOVED: + case SdrHintKind::ObjectRemoved: CommitChange( AccessibleEventId::CHILD, uno::Any(), makeAny( getAccessible( pSdrHint->GetObject() ) ) ); break; - case HINT_MODELCLEARED: + case SdrHintKind::ModelCleared: dispose(); break; default: diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index 8ef16623fb26..d87cc92a3a85 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -167,9 +167,9 @@ void SdrExternalToolEdit::Notify(SfxBroadcaster & rBC, SfxHint const& rHint) { SdrHint const*const pSdrHint(dynamic_cast<SdrHint const*>(&rHint)); if (pSdrHint - && (HINT_MODELCLEARED == pSdrHint->GetKind() + && (SdrHintKind::ModelCleared == pSdrHint->GetKind() || (pSdrHint->GetObject() == m_pObj - && HINT_OBJREMOVED == pSdrHint->GetKind()))) + && SdrHintKind::ObjectRemoved == pSdrHint->GetKind()))) { m_pView = nullptr; m_pObj = nullptr; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 22476b5e6a46..9059a1431d95 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -290,12 +290,12 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { switch (pSdrHint->GetKind()) { - case HINT_OBJINSERTED: + case SdrHintKind::ObjectInserted: { SdrObject* pSdrObj = const_cast<SdrObject*>(pSdrHint->GetObject()); Inserted( pSdrObj ); } break; - case HINT_OBJREMOVED: + case SdrHintKind::ObjectRemoved: { SdrObject* pSdrObj = const_cast<SdrObject*>(pSdrHint->GetObject()); Removed( pSdrObj ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 649676f3625d..f330a6408451 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1699,7 +1699,7 @@ FmXFormView::ObjectRemoveListener::ObjectRemoveListener( FmXFormView* pParent ) void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint); - if (pSdrHint && pSdrHint->GetKind() == HINT_OBJREMOVED) + if (pSdrHint && pSdrHint->GetKind() == SdrHintKind::ObjectRemoved) m_pParent->ObjectRemovedInAliveMode(pSdrHint->GetObject()); } diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index bec558d0032e..675cad5a6ff7 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -690,10 +690,10 @@ namespace svxform { switch( pSdrHint->GetKind() ) { - case HINT_OBJINSERTED: + case SdrHintKind::ObjectInserted: InsertSdrObj(pSdrHint->GetObject()); break; - case HINT_OBJREMOVED: + case SdrHintKind::ObjectRemoved: RemoveSdrObj(pSdrHint->GetObject()); break; default: diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 39d68b2d62b8..c00db04ed03e 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -224,16 +224,16 @@ void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint); if (pSdrHint!=nullptr && pTextEditOutliner!=nullptr) { SdrHintKind eKind=pSdrHint->GetKind(); - if (eKind==HINT_REFDEVICECHG) { + if (eKind==SdrHintKind::RefDeviceChange) { pTextEditOutliner->SetRefDevice(mpModel->GetRefDevice()); } - if (eKind==HINT_DEFAULTTABCHG) { + if (eKind==SdrHintKind::DefaultTabChange) { pTextEditOutliner->SetDefTab(mpModel->GetDefaultTabulator()); } - if (eKind==HINT_DEFFONTHGTCHG) { + if (eKind==SdrHintKind::DefaultFontHeightChange) { } - if (eKind==HINT_MODELSAVED) { + if (eKind==SdrHintKind::ModelSaved) { pTextEditOutliner->ClearModifyFlag(); } } @@ -941,8 +941,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if( GetModel() ) { - SdrHint aHint(*pTextObj); - aHint.SetKind(HINT_BEGEDIT); + SdrHint aHint(SdrHintKind::BeginEdit, *pTextObj); GetModel()->Broadcast(aHint); } @@ -1076,8 +1075,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) if( GetModel() && mxTextEditObj.is() ) { - SdrHint aHint(*mxTextEditObj.get()); - aHint.SetKind(HINT_ENDEDIT); + SdrHint aHint(SdrHintKind::EndEdit, *mxTextEditObj.get()); GetModel()->Broadcast(aHint); } @@ -1255,8 +1253,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) !pTEObj->GetModel()->isLocked() && pTEObj->GetBroadcaster()) { - SdrHint aHint(HINT_ENDEDIT); - aHint.SetObject(pTEObj); + SdrHint aHint(SdrHintKind::EndEdit, *pTEObj); const_cast<SfxBroadcaster*>(pTEObj->GetBroadcaster())->Broadcast(aHint); } diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 329308b6b3a8..1b2cfd2a0838 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -102,7 +102,7 @@ void SdrLayer::SetStandardLayer() nType=(sal_uInt16)true; maName = ImpGetResStr(STR_StandardLayerName); if (pModel!=nullptr) { - SdrHint aHint(HINT_LAYERCHG); + SdrHint aHint(SdrHintKind::LayerChange); pModel->Broadcast(aHint); pModel->SetChanged(); } @@ -118,7 +118,7 @@ void SdrLayer::SetName(const OUString& rNewName) if (pModel) { - SdrHint aHint(HINT_LAYERCHG); + SdrHint aHint(SdrHintKind::LayerChange); pModel->Broadcast(aHint); pModel->SetChanged(); } @@ -187,7 +187,7 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel) void SdrLayerAdmin::Broadcast() const { if (pModel!=nullptr) { - SdrHint aHint(HINT_LAYERORDERCHG); + SdrHint aHint(SdrHintKind::LayerOrderChange); pModel->Broadcast(aHint); pModel->SetChanged(); } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 47c326374e9a..83611852aaff 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -249,7 +249,7 @@ SdrModel::~SdrModel() mbInDestruction = true; - Broadcast(SdrHint(HINT_MODELCLEARED)); + Broadcast(SdrHint(SdrHintKind::ModelCleared)); delete mpOutlinerCache; @@ -898,7 +898,7 @@ void SdrModel::BurnInStyleSheetAttributes() void SdrModel::RefDeviceChanged() { - Broadcast(SdrHint(HINT_REFDEVICECHG)); + Broadcast(SdrHint(SdrHintKind::RefDeviceChange)); ImpReformatAllTextObjects(); } @@ -906,7 +906,7 @@ void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal) { if (nVal!=nDefTextHgt) { nDefTextHgt=nVal; - Broadcast(SdrHint(HINT_DEFFONTHGTCHG)); + Broadcast(SdrHint(SdrHintKind::DefaultFontHeightChange)); ImpReformatAllTextObjects(); } } @@ -917,7 +917,7 @@ void SdrModel::SetDefaultTabulator(sal_uInt16 nVal) nDefaultTabulator=nVal; Outliner& rOutliner=GetDrawOutliner(); rOutliner.SetDefTab(nVal); - Broadcast(SdrHint(HINT_DEFAULTTABCHG)); + Broadcast(SdrHint(SdrHintKind::DefaultTabChange)); ImpReformatAllTextObjects(); } } @@ -1397,8 +1397,7 @@ void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) pPage->SetModel(this); if (nPos<nCount) bPagNumsDirty=true; SetChanged(); - SdrHint aHint(HINT_PAGEORDERCHG); - aHint.SetPage(pPage); + SdrHint aHint(SdrHintKind::PageOrderChange, pPage); Broadcast(aHint); } @@ -1418,8 +1417,7 @@ SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum) } bPagNumsDirty=true; SetChanged(); - SdrHint aHint(HINT_PAGEORDERCHG); - aHint.SetPage(pPg); + SdrHint aHint(SdrHintKind::PageOrderChange, pPg); Broadcast(aHint); return pPg; } @@ -1450,8 +1448,7 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) bMPgNumsDirty=true; } SetChanged(); - SdrHint aHint(HINT_PAGEORDERCHG); - aHint.SetPage(pPage); + SdrHint aHint(SdrHintKind::PageOrderChange, pPage); Broadcast(aHint); } @@ -1482,8 +1479,7 @@ SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum) bMPgNumsDirty=true; SetChanged(); - SdrHint aHint(HINT_PAGEORDERCHG); - aHint.SetPage(pRetPg); + SdrHint aHint(SdrHintKind::PageOrderChange, pRetPg); Broadcast(aHint); return pRetPg; } @@ -1500,8 +1496,7 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) } bMPgNumsDirty=true; SetChanged(); - SdrHint aHint(HINT_PAGEORDERCHG); - aHint.SetPage(pPg); + SdrHint aHint(SdrHintKind::PageOrderChange, pPg); Broadcast(aHint); } @@ -2085,34 +2080,32 @@ const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() SdrHint::SdrHint(SdrHintKind eNewHint) -: mpPage(nullptr), +: meHint(eNewHint), mpObj(nullptr), - meHint(eNewHint) + mpPage(nullptr) { } -SdrHint::SdrHint(const SdrObject& rNewObj) -: mpPage(rNewObj.GetPage()), +SdrHint::SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj) +: meHint(eNewHint), mpObj(&rNewObj), - meHint(HINT_OBJCHG) + mpPage(rNewObj.GetPage()), + maRectangle(rNewObj.GetLastBoundRect()) { - maRectangle = rNewObj.GetLastBoundRect(); } -void SdrHint::SetPage(const SdrPage* pNewPage) -{ - mpPage = pNewPage; -} - -void SdrHint::SetObject(const SdrObject* pNewObj) +SdrHint::SdrHint(SdrHintKind eNewHint, const SdrPage* pPage) +: meHint(eNewHint), + mpObj(nullptr), + mpPage(pPage) { - mpObj = pNewObj; } -void SdrHint::SetKind(SdrHintKind eNewKind) +SdrHint::SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj, const SdrPage* pPage) +: meHint(eNewHint), + mpObj(&rNewObj), + mpPage(pPage) { - meHint = eNewKind; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 4cceb5143729..72ec65f602ed 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -179,7 +179,7 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SdrHintKind eKind=pSdrHint->GetKind(); - if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) + if (eKind==SdrHintKind::ObjectChange || eKind==SdrHintKind::ObjectInserted || eKind==SdrHintKind::ObjectRemoved) { mbMarkedObjRectDirty=true; mbMarkedPointsRectsDirty=true; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index cf39f0a82d02..d7b37c2632b2 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -890,7 +890,7 @@ void SdrObject::BroadcastObjectChange() const if(bPlusDataBroadcast || bObjectChange) { - SdrHint aHint(*this); + SdrHint aHint(SdrHintKind::ObjectChange, *this); if(bPlusDataBroadcast) { @@ -2628,8 +2628,7 @@ void SdrObject::SetInserted(bool bIns) else SendUserCall(SdrUserCallType::Removed,aBoundRect0); if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) { - SdrHint aHint(*this); - aHint.SetKind(bIns?HINT_OBJINSERTED:HINT_OBJREMOVED); + SdrHint aHint(bIns?SdrHintKind::ObjectInserted:SdrHintKind::ObjectRemoved, *this); pPlusData->pBroadcast->Broadcast(aHint); } } @@ -2665,7 +2664,7 @@ void SdrObject::SetPrintable(bool bPrn) SetChanged(); if (IsInserted() && pModel!=nullptr) { - SdrHint aHint(*this); + SdrHint aHint(SdrHintKind::ObjectChange, *this); pModel->Broadcast(aHint); } } @@ -2679,7 +2678,7 @@ void SdrObject::SetVisible(bool bVisible) SetChanged(); if (IsInserted() && pModel!=nullptr) { - SdrHint aHint(*this); + SdrHint aHint(SdrHintKind::ObjectChange, *this); pModel->Broadcast(aHint); } } diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 1a8f1a202a47..30b766e74a39 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1586,7 +1586,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if (bDataChg || (bObj1 && aCon1.pObj->GetPage()==pPage) || (bObj2 && aCon2.pObj->GetPage()==pPage) || - (pSdrHint && pSdrHint->GetKind()==HINT_OBJREMOVED)) + (pSdrHint && pSdrHint->GetKind()==SdrHintKind::ObjectRemoved)) { // broadcasting only, if on the same page Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect(); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 2fa3614abe6b..141f2f7b6fff 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -235,9 +235,7 @@ void SdrObjList::Clear() // sent remove hint (after removal, see RemoveObject()) if(pModel) { - SdrHint aHint(*pObj); - aHint.SetKind(HINT_OBJREMOVED); - aHint.SetPage(pPage); + SdrHint aHint(SdrHintKind::ObjectRemoved, *pObj, pPage); pModel->Broadcast(aHint); } @@ -385,9 +383,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReaso // Repaint from object number ... (heads-up: GroupObj) if(pObj->GetPage()) { - SdrHint aHint(*pObj); - - aHint.SetKind(HINT_OBJINSERTED); + SdrHint aHint(SdrHintKind::ObjectInserted, *pObj); pModel->Broadcast(aHint); } @@ -449,8 +445,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) if (pModel!=nullptr) { // TODO: We need a different broadcast here. if (pObj->GetPage()!=nullptr) { - SdrHint aHint(*pObj); - aHint.SetKind(HINT_OBJREMOVED); + SdrHint aHint(SdrHintKind::ObjectRemoved, *pObj); pModel->Broadcast(aHint); } pModel->SetChanged(); @@ -530,8 +525,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum) if (pModel!=nullptr) { // TODO: We need a different broadcast here. if (pObj->GetPage()!=nullptr) { - SdrHint aHint(*pObj); - aHint.SetKind(HINT_OBJREMOVED); + SdrHint aHint(SdrHintKind::ObjectRemoved, *pObj); pModel->Broadcast(aHint); } } @@ -555,8 +549,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum) if (pModel!=nullptr) { // TODO: We need a different broadcast here. if (pNewObj->GetPage()!=nullptr) { - SdrHint aHint(*pNewObj); - aHint.SetKind(HINT_OBJINSERTED); + SdrHint aHint(SdrHintKind::ObjectInserted, *pNewObj); pModel->Broadcast(aHint); } pModel->SetChanged(); @@ -592,7 +585,8 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) if (pModel!=nullptr) { // TODO: We need a different broadcast here. - if (pObj->GetPage()!=nullptr) pModel->Broadcast(SdrHint(*pObj)); + if (pObj->GetPage()!=nullptr) + pModel->Broadcast(SdrHint(SdrHintKind::ObjectChange, *pObj)); pModel->SetChanged(); } } @@ -1080,8 +1074,7 @@ void ImpPageChange(SdrPage& rSdrPage) if(rSdrPage.GetModel()) { rSdrPage.GetModel()->SetChanged(); - SdrHint aHint(HINT_PAGEORDERCHG); - aHint.SetPage(&rSdrPage); + SdrHint aHint(SdrHintKind::PageOrderChange, &rSdrPage); rSdrPage.GetModel()->Broadcast(aHint); } } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 04e873533d74..f9b2b19a619e 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -247,7 +247,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) return; SdrHintKind eKind = pSdrHint->GetKind(); - if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) + if (eKind==SdrHintKind::ObjectChange || eKind==SdrHintKind::ObjectInserted || eKind==SdrHintKind::ObjectRemoved) { bool bObjChg = !mbSomeObjChgdFlag; // if true, evaluate for ComeBack timer if (bObjChg) @@ -257,7 +257,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } } - if (eKind==HINT_PAGEORDERCHG) + if (eKind==SdrHintKind::PageOrderChange) { const SdrPage* pPg=pSdrHint->GetPage(); if (pPg && !pPg->IsInserted()) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 1362de30b4d7..0f5c6ab352a1 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -247,11 +247,7 @@ void SdrUndoObj::ImpShowPageOfThisObject() { if(pObj && pObj->IsInserted() && pObj->GetPage() && pObj->GetModel()) { - SdrHint aHint(HINT_SWITCHTOPAGE); - - aHint.SetObject(pObj); - aHint.SetPage(pObj->GetPage()); - + SdrHint aHint(SdrHintKind::SwitchToPage, *pObj, pObj->GetPage()); pObj->GetModel()->Broadcast(aHint); } } diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 7107b9d16d31..f6e75393a722 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -69,7 +69,7 @@ void SvxUnoNameItemTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw( { const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint); - if( pSdrHint && HINT_MODELCLEARED == pSdrHint->GetKind() ) + if( pSdrHint && SdrHintKind::ModelCleared == pSdrHint->GetKind() ) dispose(); } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index a2504fab258f..e30f2cba4d4d 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -120,8 +120,8 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr switch( pSdrHint->GetKind() ) { -// case HINT_LAYERCHG: // layer definition changed -// case HINT_LAYERORDERCHG: // layer order changed (Insert/Remove/ChangePos) +// case SdrHintKind::LayerChange: // layer definition changed +// case SdrHintKind::LayerOrderChange: // layer order changed (Insert/Remove/ChangePos) // case HINT_LAYERSETCHG: // layer set changed // case HINT_LAYERSETORDERCHG: // layer set order changed (Insert/Remove/ChangePos) @@ -129,25 +129,25 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr // aEvent.EventName = "PageModified"; // pPage = pSdrHint->GetPage(); // break; - case HINT_PAGEORDERCHG: // draw or master page order changed (Insert/Remove/ChangePos) + case SdrHintKind::PageOrderChange: // draw or master page order changed (Insert/Remove/ChangePos) aEvent.EventName = "PageOrderModified"; pPage = pSdrHint->GetPage(); break; - case HINT_OBJCHG: // object changed + case SdrHintKind::ObjectChange: // object changed aEvent.EventName = "ShapeModified"; pObj = pSdrHint->GetObject(); break; - case HINT_OBJINSERTED: // add new draw object + case SdrHintKind::ObjectInserted: // add new draw object aEvent.EventName = "ShapeInserted"; pObj = pSdrHint->GetObject(); break; - case HINT_OBJREMOVED: // removed draw object from list + case SdrHintKind::ObjectRemoved: // removed draw object from list aEvent.EventName = "ShapeRemoved"; pObj = pSdrHint->GetObject(); break; -// HINT_DEFAULTTABCHG, // default tab width changed -// HINT_DEFFONTHGTCHG, // default FontHeight changed -// HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page +// SdrHintKind::DefaultTabChange, // default tab width changed +// SdrHintKind::DefaultFontHeightChange, // default FontHeight changed +// SdrHintKind::SwitchToPage, // #94278# UNDO/REDO at an object evtl. on another page // HINT_OBJLISTCLEAR // Is called before an SdrObjList will be cleared default: return false; diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 5ed42a790cc2..39cfe7ddaf3e 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -125,7 +125,7 @@ void SvxUnoMarkerTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() { const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint); - if( pSdrHint && HINT_MODELCLEARED == pSdrHint->GetKind() ) + if( pSdrHint && SdrHintKind::ModelCleared == pSdrHint->GetKind() ) dispose(); } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 971373266d45..1b6e627a0ea0 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1005,13 +1005,13 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() if( !mpObj.is() ) return; - // #i55919# HINT_OBJCHG is only interesting if it's for this object + // #i55919# SdrHintKind::ObjectChange is only interesting if it's for this object const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint); - if (!pSdrHint || ( /* (pSdrHint->GetKind() != HINT_OBJREMOVED) && */ - (pSdrHint->GetKind() != HINT_MODELCLEARED) && + if (!pSdrHint || ( /* (pSdrHint->GetKind() != SdrHintKind::ObjectRemoved) && */ + (pSdrHint->GetKind() != SdrHintKind::ModelCleared) && // #110094#-9 (pSdrHint->GetKind() != HINT_OBJLISTCLEAR) && - ((pSdrHint->GetKind() != HINT_OBJCHG || pSdrHint->GetObject() != mpObj.get() )))) + ((pSdrHint->GetKind() != SdrHintKind::ObjectChange || pSdrHint->GetObject() != mpObj.get() )))) return; uno::Reference< uno::XInterface > xSelf( mpObj->getWeakUnoShape() ); @@ -1025,12 +1025,12 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() switch( pSdrHint->GetKind() ) { - case HINT_OBJCHG: + case SdrHintKind::ObjectChange: { updateShapeKind(); break; } - case HINT_MODELCLEARED: + case SdrHintKind::ModelCleared: { bClearMe = true; mpModel = nullptr; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 7f84e6744417..3d527c38a610 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -99,7 +99,7 @@ private: bool mbNeedsUpdate; bool mbOldUndoMode; bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often - bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received + bool mbShapeIsEditMode; // #104157# only true, if SdrHintKind::BeginEdit was received bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder) SvxUnoTextRangeBaseList maTextRanges; @@ -340,7 +340,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { switch( pSdrHint->GetKind() ) { - case HINT_OBJCHG: + case SdrHintKind::ObjectChange: { mbDataValid = false; // Text muss neu geholt werden @@ -359,10 +359,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) break; } - case HINT_BEGEDIT: + case SdrHintKind::BeginEdit: if( mpObject == pSdrHint->GetObject() ) { - // Once HINT_BEGEDIT is broadcast, each EditSource of + // Once SdrHintKind::BeginEdit is broadcast, each EditSource of // AccessibleCell will handle it here and call below: // mpView->GetTextEditOutliner()->SetNotifyHdl(), which // will replace the Notifer for current editable cell. It @@ -403,7 +403,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } break; - case HINT_ENDEDIT: + case SdrHintKind::EndEdit: if( mpObject == pSdrHint->GetObject() ) { Broadcast( *pSdrHint ); @@ -434,7 +434,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } break; - case HINT_MODELCLEARED: + case SdrHintKind::ModelCleared: dispose(); break; default: diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 73155dadb1c0..abe22af36f10 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -105,7 +105,7 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc) SwDrawModel::~SwDrawModel() { - Broadcast(SdrHint(HINT_MODELCLEARED)); + Broadcast(SdrHint(SdrHintKind::ModelCleared)); ClearModel(true); } |