convert SFX_HINT to scoped enum

Notes

(*) In SC, BULK_DATACHANGED was or'ed into the hint id. Replaced with a
dynamic_cast check.

(*) In SC, removed the hint id field from ScIndexHint, no point in
storing the hint id twice

(*) Fold the SfxStyleSheetHintId enum into the new SfxHintId enum, no
point in storing two different hint ids

(*) In some cases, multiple #define's used to map to the same SFX_HINT
value (notably the SFX_HINT_USER* values). I made all of those separate
values.

Change-Id: I990e2fb587335ebc51c9005588c6a44f768d9de5
Reviewed-on: https://gerrit.libreoffice.org/31751
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 31 insertions, 29 deletions

diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index 5a3b15c3ceaf..dec9f36b3429 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -311,11 +311,11 @@ void IdleFormatter::ForceTimeout()
     }
 }
 
-TextHint::TextHint( sal_uInt32 Id ) : SfxHint( Id ), mnValue(0)
+TextHint::TextHint( SfxHintId Id ) : SfxHint( Id ), mnValue(0)
 {
 }
 
-TextHint::TextHint( sal_uInt32 Id, sal_uLong nValue ) : SfxHint( Id ), mnValue(nValue)
+TextHint::TextHint( SfxHintId Id, sal_uLong nValue ) : SfxHint( Id ), mnValue(nValue)
 {
 }
 
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 4ba1f2353821..a631effaeea8 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -834,7 +834,7 @@ TextPaM TextEngine::ImpInsertParaBreak( const TextPaM& rPaM )
     TextModified();
 
     if ( bFirstParaContentChanged )
-        Broadcast( TextHint( TEXT_HINT_PARACONTENTCHANGED, rPaM.GetPara() ) );
+        Broadcast( TextHint( SfxHintId::TextParaContentChanged, rPaM.GetPara() ) );
 
     return aPaM;
 }
@@ -1518,7 +1518,7 @@ void TextEngine::FormatDoc()
         {
             const long nOldParaWidth = mnCurTextWidth >= 0 ? CalcTextWidth( nPara ) : -1;
 
-            Broadcast( TextHint( TEXT_HINT_FORMATPARA, nPara ) );
+            Broadcast( TextHint( SfxHintId::TextFormatPara, nPara ) );
 
             if ( CreateLines( nPara ) )
                 bGrow = true;
@@ -1577,14 +1577,14 @@ void TextEngine::FormatDoc()
         if ( nDiff )
         {
             mbFormatted = true;
-            Broadcast( TextHint( TEXT_HINT_TEXTHEIGHTCHANGED ) );
+            Broadcast( TextHint( SfxHintId::TextHeightChanged ) );
         }
     }
 
     mbIsFormatting = false;
     mbFormatted = true;
 
-    Broadcast( TextHint( TEXT_HINT_TEXTFORMATTED ) );
+    Broadcast( TextHint( SfxHintId::TextFormatted ) );
 }
 
 void TextEngine::CreateAndInsertEmptyLine( sal_uInt32 nPara )
@@ -2663,7 +2663,7 @@ void TextEngine::ImpParagraphInserted( sal_uInt32 nPara )
             }
         }
     }
-    Broadcast( TextHint( TEXT_HINT_PARAINSERTED, nPara ) );
+    Broadcast( TextHint( SfxHintId::TextParaInserted, nPara ) );
 }
 
 void TextEngine::ImpParagraphRemoved( sal_uInt32 nPara )
@@ -2691,7 +2691,7 @@ void TextEngine::ImpParagraphRemoved( sal_uInt32 nPara )
             }
         }
     }
-    Broadcast( TextHint( TEXT_HINT_PARAREMOVED, nPara ) );
+    Broadcast( TextHint( SfxHintId::TextParaRemoved, nPara ) );
 }
 
 void TextEngine::ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars )
@@ -2718,7 +2718,7 @@ void TextEngine::ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nC
             }
         }
     }
-    Broadcast( TextHint( TEXT_HINT_PARACONTENTCHANGED, nPara ) );
+    Broadcast( TextHint( SfxHintId::TextParaContentChanged, nPara ) );
 }
 
 void TextEngine::ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars )
@@ -2742,7 +2742,7 @@ void TextEngine::ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 n
             }
         }
     }
-    Broadcast( TextHint( TEXT_HINT_PARACONTENTCHANGED, nPara ) );
+    Broadcast( TextHint( SfxHintId::TextParaContentChanged, nPara ) );
 }
 
 void TextEngine::Draw( OutputDevice* pDev, const Point& rPos )
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 42c2201e0237..08627478b8e7 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -421,10 +421,10 @@ void TextView::ImpSetSelection( const TextSelection& rSelection )
         mpImpl->maSelection = rSelection;
 
         if (bSelection)
-            mpImpl->mpTextEngine->Broadcast(TextHint(TEXT_HINT_VIEWSELECTIONCHANGED));
+            mpImpl->mpTextEngine->Broadcast(TextHint(SfxHintId::TextViewSelectionChanged));
 
         if (bCaret)
-            mpImpl->mpTextEngine->Broadcast(TextHint(TEXT_HINT_VIEWCARETCHANGED));
+            mpImpl->mpTextEngine->Broadcast(TextHint(SfxHintId::TextViewCaretChanged));
     }
 }
 
@@ -729,7 +729,7 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent )
     }
 
     if ( mpImpl->mpTextEngine->IsModified() )
-        mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+        mpImpl->mpTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
     else if ( bWasModified )
         mpImpl->mpTextEngine->SetModified( true );
 
@@ -747,7 +747,7 @@ void TextView::MouseButtonUp( const MouseEvent& rMouseEvent )
         css::uno::Reference<css::datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection());
         Paste( aSelection );
         if ( mpImpl->mpTextEngine->IsModified() )
-            mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+            mpImpl->mpTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
     }
     else if ( rMouseEvent.IsLeft() && GetSelection().HasRange() )
     {
@@ -870,7 +870,7 @@ void TextView::Command( const CommandEvent& rCEvt )
             SetInsertMode( bInsertMode );
 
             if ( mpImpl->mpTextEngine->IsModified() )
-                mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+                mpImpl->mpTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
         }
     }
     else if ( rCEvt.GetCommand() == CommandEventId::ExtTextInput )
@@ -1025,7 +1025,7 @@ void TextView::Scroll( long ndX, long ndY )
             mpImpl->mpCursor->Show();
     }
 
-    mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_VIEWSCROLLED ) );
+    mpImpl->mpTextEngine->Broadcast( TextHint( SfxHintId::TextViewScrolled ) );
 }
 
 void TextView::Undo()
@@ -1109,7 +1109,7 @@ void TextView::Paste( css::uno::Reference< css::datatransfer::clipboard::XClipbo
                     if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 )
                         bWasTruncated = ImplTruncateNewText( aText );
                     InsertText( aText );
-                    mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+                    mpImpl->mpTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
 
                     if( bWasTruncated )
                         Edit::ShowTruncationWarning( mpImpl->mpWindow );
@@ -2042,7 +2042,7 @@ void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE )
 
         mpImpl->mpTextEngine->FormatAndUpdate( this );
 
-        mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+        mpImpl->mpTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
     }
     rDTDE.Context->dropComplete( bChanges );
 }
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 5004862dd0cd..036783956b62 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -515,14 +515,14 @@ void ImpVclMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
     switch (pTextHint->GetId())
     {
-        case TEXT_HINT_VIEWSCROLLED:
+        case SfxHintId::TextViewScrolled:
             if ( mpHScrollBar )
                 ImpSetHScrollBarThumbPos();
             if ( mpVScrollBar )
                 mpVScrollBar->SetThumbPos( mpTextWindow->GetTextView()->GetStartDocPos().Y() );
             break;
 
-        case TEXT_HINT_TEXTHEIGHTCHANGED:
+        case SfxHintId::TextHeightChanged:
             if ( mpTextWindow->GetTextView()->GetStartDocPos().Y() )
             {
                 long nOutHeight = mpTextWindow->GetOutputSizePixel().Height();
@@ -533,7 +533,7 @@ void ImpVclMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
             ImpSetScrollBarRanges();
             break;
 
-        case TEXT_HINT_TEXTFORMATTED:
+        case SfxHintId::TextFormatted:
             if ( mpHScrollBar )
             {
                 const long nWidth = mpTextWindow->GetTextEngine()->CalcTextWidth();
@@ -546,18 +546,20 @@ void ImpVclMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
             }
             break;
 
-        case TEXT_HINT_MODIFIED:
+        case SfxHintId::TextModified:
             ImpUpdateSrollBarVis(pVclMultiLineEdit->GetStyle());
             pVclMultiLineEdit->Modify();
             break;
 
-        case TEXT_HINT_VIEWSELECTIONCHANGED:
+        case SfxHintId::TextViewSelectionChanged:
             pVclMultiLineEdit->SelectionChanged();
             break;
 
-        case TEXT_HINT_VIEWCARETCHANGED:
+        case SfxHintId::TextViewCaretChanged:
             pVclMultiLineEdit->CaretChanged();
             break;
+
+        default: break;
     }
 }
 
@@ -856,21 +858,21 @@ void TextWindow::Command( const CommandEvent& rCEvt )
         {
             case SV_MENU_EDIT_UNDO:     mpExtTextView->Undo();
                                         mpExtTextEngine->SetModified( true );
-                                        mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+                                        mpExtTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
                                         break;
             case SV_MENU_EDIT_CUT:      mpExtTextView->Cut();
                                         mpExtTextEngine->SetModified( true );
-                                        mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+                                        mpExtTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
                                         break;
             case SV_MENU_EDIT_COPY:     mpExtTextView->Copy();
                                         break;
             case SV_MENU_EDIT_PASTE:    mpExtTextView->Paste();
                                         mpExtTextEngine->SetModified( true );
-                                        mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+                                        mpExtTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
                                         break;
             case SV_MENU_EDIT_DELETE:   mpExtTextView->DeleteSelected();
                                         mpExtTextEngine->SetModified( true );
-                                        mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+                                        mpExtTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
                                         break;
             case SV_MENU_EDIT_SELECTALL:    mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL, TEXT_INDEX_ALL ) ) );
                                             break;
@@ -881,7 +883,7 @@ void TextWindow::Command( const CommandEvent& rCEvt )
                     {
                         mpExtTextView->InsertText( aChars );
                         mpExtTextEngine->SetModified( true );
-                        mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
+                        mpExtTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
                     }
                 }
                 break;