[Libreoffice-commits] core.git: accessibility/source basctl/source basic/source desktop/source editeng/source forms/source include/basic include/editeng include/svl include/svx include/vcl reportdesign/source sc/inc scripting/source sc/source sd/source sfx2/source starmath/inc starmath/source svl/source svtools/source svx/source sw/inc sw/source vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Dec 8 12:35:49 UTC 2016
accessibility/source/extended/textwindowaccessibility.cxx | 55 ++---
basctl/source/basicide/baside2b.cxx | 14 -
basctl/source/basicide/basidesh.cxx | 20 -
basic/source/basmgr/basicmanagerrepository.cxx | 2
basic/source/basmgr/basmgr.cxx | 2
basic/source/classes/sb.cxx | 8
basic/source/classes/sbunoobj.cxx | 12 -
basic/source/classes/sbxmod.cxx | 30 +-
basic/source/runtime/methods.cxx | 2
basic/source/runtime/runtime.cxx | 24 +-
basic/source/runtime/stdobj.cxx | 8
basic/source/runtime/stdobj1.cxx | 12 -
basic/source/sbx/sbxcoll.cxx | 6
basic/source/sbx/sbxexec.cxx | 2
basic/source/sbx/sbxobj.cxx | 14 -
basic/source/sbx/sbxvalue.cxx | 14 -
basic/source/sbx/sbxvar.cxx | 20 -
desktop/source/deployment/gui/license_dialog.cxx | 6
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/impedit3.cxx | 4
editeng/source/editeng/impedit5.cxx | 31 +-
editeng/source/uno/unoedhlp.cxx | 28 +-
forms/source/richtext/richtextimplcontrol.cxx | 4
include/basic/sbdef.hxx | 3
include/basic/sbmeth.hxx | 2
include/basic/sbx.hxx | 4
include/basic/sbxdef.hxx | 8
include/basic/sbxvar.hxx | 5
include/editeng/AccessibleStaticTextBase.hxx | 12 -
include/editeng/editdata.hxx | 2
include/editeng/editstat.hxx | 2
include/editeng/unoedhlp.hxx | 11 -
include/svl/hint.hxx | 118 ++++++++---
include/svl/style.hxx | 33 ---
include/svx/AccessibleTextHelper.hxx | 16 -
include/vcl/textdata.hxx | 20 -
reportdesign/source/core/sdr/UndoEnv.cxx | 2
reportdesign/source/ui/misc/ColorListener.cxx | 2
reportdesign/source/ui/report/StartMarker.cxx | 2
sc/inc/brdcst.hxx | 3
sc/inc/bulkdatahint.hxx | 4
sc/inc/column.hxx | 2
sc/inc/document.hxx | 8
sc/inc/refhint.hxx | 2
sc/inc/sc.hrc | 16 -
sc/inc/simplehintids.hxx | 23 --
sc/source/core/data/bcaslot.cxx | 10
sc/source/core/data/colorscale.cxx | 2
sc/source/core/data/column.cxx | 10
sc/source/core/data/column3.cxx | 6
sc/source/core/data/column4.cxx | 6
sc/source/core/data/documen2.cxx | 6
sc/source/core/data/documen3.cxx | 2
sc/source/core/data/documen7.cxx | 10
sc/source/core/data/documen8.cxx | 2
sc/source/core/data/document.cxx | 18 -
sc/source/core/data/formulacell.cxx | 10
sc/source/core/data/stlsheet.cxx | 2
sc/source/core/data/table2.cxx | 6
sc/source/core/inc/bcaslot.hxx | 12 -
sc/source/core/tool/addinlis.cxx | 4
sc/source/core/tool/adiasync.cxx | 4
sc/source/core/tool/brdcst.cxx | 2
sc/source/core/tool/bulkdatahint.cxx | 4
sc/source/core/tool/chartlis.cxx | 2
sc/source/core/tool/dbdata.cxx | 2
sc/source/core/tool/ddelink.cxx | 2
sc/source/core/tool/grouparealistener.cxx | 13 -
sc/source/core/tool/lookupcache.cxx | 2
sc/source/core/tool/refhint.cxx | 2
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 10
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 6
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 4
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 6
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 6
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 6
sc/source/ui/Accessibility/AccessibleText.cxx | 14 -
sc/source/ui/app/inputhdl.cxx | 20 -
sc/source/ui/app/inputwin.cxx | 6
sc/source/ui/app/scmod.cxx | 8
sc/source/ui/app/uiitems.cxx | 4
sc/source/ui/condformat/condformatdlgentry.cxx | 14 -
sc/source/ui/docshell/dbdocfun.cxx | 8
sc/source/ui/docshell/docfunc.cxx | 32 +-
sc/source/ui/docshell/docsh.cxx | 33 +--
sc/source/ui/docshell/docsh2.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 20 -
sc/source/ui/docshell/docsh5.cxx | 10
sc/source/ui/docshell/impex.cxx | 4
sc/source/ui/docshell/servobj.cxx | 14 -
sc/source/ui/inc/AccessibilityHints.hxx | 9
sc/source/ui/inc/preview.hxx | 2
sc/source/ui/inc/uiitems.hxx | 4
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/namedlg/namedefdlg.cxx | 2
sc/source/ui/navipi/navcitem.cxx | 2
sc/source/ui/navipi/navipi.cxx | 24 +-
sc/source/ui/undo/undobase.cxx | 4
sc/source/ui/undo/undoblk.cxx | 20 -
sc/source/ui/undo/undoblk3.cxx | 10
sc/source/ui/undo/undocell.cxx | 2
sc/source/ui/undo/undoconvert.cxx | 2
sc/source/ui/undo/undodat.cxx | 8
sc/source/ui/undo/undorangename.cxx | 6
sc/source/ui/undo/undosort.cxx | 2
sc/source/ui/undo/undotab.cxx | 32 +-
sc/source/ui/unoobj/addruno.cxx | 2
sc/source/ui/unoobj/appluno.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 34 +--
sc/source/ui/unoobj/chart2uno.cxx | 20 -
sc/source/ui/unoobj/chartuno.cxx | 4
sc/source/ui/unoobj/condformatuno.cxx | 2
sc/source/ui/unoobj/confuno.cxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 4
sc/source/ui/unoobj/datauno.cxx | 8
sc/source/ui/unoobj/defltuno.cxx | 2
sc/source/ui/unoobj/dispuno.cxx | 4
sc/source/ui/unoobj/docuno.cxx | 18 -
sc/source/ui/unoobj/drdefuno.cxx | 2
sc/source/ui/unoobj/editsrc.cxx | 6
sc/source/ui/unoobj/eventuno.cxx | 2
sc/source/ui/unoobj/fielduno.cxx | 2
sc/source/ui/unoobj/forbiuno.cxx | 2
sc/source/ui/unoobj/funcuno.cxx | 4
sc/source/ui/unoobj/linkuno.cxx | 12 -
sc/source/ui/unoobj/nameuno.cxx | 8
sc/source/ui/unoobj/notesuno.cxx | 2
sc/source/ui/unoobj/styleuno.cxx | 6
sc/source/ui/unoobj/targuno.cxx | 4
sc/source/ui/unoobj/textuno.cxx | 6
sc/source/ui/unoobj/tokenuno.cxx | 2
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/view/dbfunc3.cxx | 2
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/preview.cxx | 14 -
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/prevwsh2.cxx | 11 -
sc/source/ui/view/tabview.cxx | 4
sc/source/ui/view/tabview3.cxx | 8
sc/source/ui/view/tabview5.cxx | 4
sc/source/ui/view/tabvwsh4.cxx | 2
sc/source/ui/view/tabvwsh5.cxx | 40 +--
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/viewdata.cxx | 2
sc/source/ui/view/viewfun2.cxx | 26 +-
sc/source/ui/view/viewfunc.cxx | 4
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 2
scripting/source/basprov/basscript.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/core/sdpage.cxx | 6
sd/source/core/stlpool.cxx | 6
sd/source/core/stlsheet.cxx | 16 -
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 6
sd/source/ui/app/sdmod.cxx | 2
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/unchss.cxx | 8
sd/source/ui/docshell/docshell.cxx | 4
sd/source/ui/framework/tools/FrameworkHelper.cxx | 2
sd/source/ui/func/fupage.cxx | 4
sd/source/ui/func/fuprobjs.cxx | 2
sd/source/ui/func/futempl.cxx | 8
sd/source/ui/slidesorter/controller/SlsListener.cxx | 11 -
sd/source/ui/slidesorter/controller/SlsTransferableData.cxx | 2
sd/source/ui/tools/EventMultiplexer.cxx | 2
sd/source/ui/tools/PreviewRenderer.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 2
sd/source/ui/view/FormShellManager.cxx | 2
sd/source/ui/view/drawview.cxx | 10
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/viewoverlaymanager.cxx | 2
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/appbaslib.cxx | 2
sfx2/source/appl/appcfg.cxx | 2
sfx2/source/appl/appinit.cxx | 2
sfx2/source/control/bindings.cxx | 6
sfx2/source/control/request.cxx | 2
sfx2/source/dialog/basedlgs.cxx | 14 -
sfx2/source/dialog/templdlg.cxx | 11 -
sfx2/source/doc/objmisc.cxx | 20 -
sfx2/source/doc/objserv.cxx | 2
sfx2/source/doc/objstor.cxx | 8
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 6
sfx2/source/notify/openurlhint.cxx | 1
sfx2/source/view/frame.cxx | 2
sfx2/source/view/viewfrm.cxx | 22 +-
sfx2/source/view/viewfrm2.cxx | 4
sfx2/source/view/viewprn.cxx | 2
starmath/inc/format.hxx | 5
starmath/source/cfgitem.cxx | 2
starmath/source/document.cxx | 12 -
starmath/source/view.cxx | 4
svl/source/items/itempool.cxx | 2
svl/source/items/style.cxx | 29 +-
svl/source/notify/SfxBroadcaster.cxx | 2
svl/source/notify/broadcast.cxx | 2
svtools/source/config/accessibilityoptions.cxx | 2
svtools/source/config/extcolorcfg.cxx | 6
svx/source/accessibility/AccessibleTextHelper.cxx | 82 +++----
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2
svx/source/dialog/svxruler.cxx | 2
svx/source/form/fmundo.cxx | 7
svx/source/form/navigatortreemodel.cxx | 5
svx/source/sdr/properties/attributeproperties.cxx | 13 -
svx/source/sdr/properties/customshapeproperties.cxx | 9
svx/source/sdr/properties/textproperties.cxx | 8
svx/source/svdraw/svdoattr.cxx | 2
svx/source/svdraw/svdoedge.cxx | 10
svx/source/svdraw/svdotext.cxx | 2
svx/source/svdraw/svdpage.cxx | 5
svx/source/svdraw/svdpntv.cxx | 2
svx/source/table/svdotable.cxx | 2
svx/source/unodraw/unoshtxt.cxx | 4
sw/inc/doc.hxx | 2
sw/inc/section.hxx | 2
sw/inc/swhints.hxx | 29 --
sw/source/core/doc/DocumentDrawModelManager.cxx | 4
sw/source/core/doc/docdesc.cxx | 6
sw/source/core/doc/docdraw.cxx | 2
sw/source/core/doc/docfmt.cxx | 16 -
sw/source/core/doc/docnum.cxx | 6
sw/source/core/docnode/ndtbl.cxx | 4
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/layout/sectfrm.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 4
sw/source/core/unocore/unostyle.cxx | 6
sw/source/ui/dbui/mmaddressblockpage.cxx | 4
sw/source/uibase/app/apphdl.cxx | 2
sw/source/uibase/app/docsh2.cxx | 14 -
sw/source/uibase/app/docst.cxx | 4
sw/source/uibase/app/docstyle.cxx | 14 -
sw/source/uibase/docvw/PostItMgr.cxx | 13 -
sw/source/uibase/docvw/srcedtw.cxx | 9
sw/source/uibase/inc/redlndlg.hxx | 2
sw/source/uibase/misc/redlndlg.cxx | 4
sw/source/uibase/uiview/srcview.cxx | 4
sw/source/uibase/uiview/view.cxx | 14 -
sw/source/uibase/uno/unoatxt.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 2
sw/source/uibase/utlui/navipi.cxx | 2
vcl/source/edit/textdata.cxx | 4
vcl/source/edit/texteng.cxx | 16 -
vcl/source/edit/textview.cxx | 16 -
vcl/source/edit/vclmedit.cxx | 24 +-
251 files changed, 1000 insertions(+), 1093 deletions(-)
New commits:
commit a66731982e93cdcc5beaa5b0586a7f12a7fc0ef6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Dec 8 10:26:01 2016 +0200
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 at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 6964ea4..c7180e8 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1533,22 +1533,22 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint)
::TextHint const & rTextHint = *pTextHint;
switch (rTextHint.GetId())
{
- case TEXT_HINT_PARAINSERTED:
- case TEXT_HINT_PARAREMOVED:
- // TEXT_HINT_PARAINSERTED and TEXT_HINT_PARAREMOVED are sent at
+ case SfxHintId::TextParaInserted:
+ case SfxHintId::TextParaRemoved:
+ // SfxHintId::TextParaInserted and SfxHintId::TextParaRemoved are sent at
// "unsafe" times (when the text engine has not yet re-formatted its
// content), so that for example calling ::TextEngine::GetTextHeight
- // from within the code that handles TEXT_HINT_PARAINSERTED causes
+ // from within the code that handles SfxHintId::TextParaInserted causes
// trouble within the text engine. Therefore, these hints are just
// buffered until a following ::TextEngine::FormatDoc causes a
- // TEXT_HINT_TEXTFORMATTED to come in:
- case TEXT_HINT_FORMATPARA:
+ // SfxHintId::TextFormatted to come in:
+ case SfxHintId::TextFormatPara:
// ::TextEngine::FormatDoc sends a sequence of
- // TEXT_HINT_FORMATPARAs, followed by an optional
- // TEXT_HINT_TEXTHEIGHTCHANGED, followed in all cases by one
- // TEXT_HINT_TEXTFORMATTED. Only the TEXT_HINT_FORMATPARAs contain
+ // SfxHintId::TextFormatParas, followed by an optional
+ // SfxHintId::TextHeightChanged, followed in all cases by one
+ // SfxHintId::TextFormatted. Only the SfxHintId::TextFormatParas contain
// the numbers of the affected paragraphs, but they are sent
- // before the changes are applied. Therefore, TEXT_HINT_FORMATPARAs
+ // before the changes are applied. Therefore, SfxHintId::TextFormatParas
// are just buffered until another hint comes in:
{
::osl::MutexGuard aInternalGuard(GetMutex());
@@ -1558,9 +1558,9 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint)
m_aParagraphNotifications.push(rTextHint);
break;
}
- case TEXT_HINT_TEXTFORMATTED:
- case TEXT_HINT_TEXTHEIGHTCHANGED:
- case TEXT_HINT_MODIFIED:
+ case SfxHintId::TextFormatted:
+ case SfxHintId::TextHeightChanged:
+ case SfxHintId::TextModified:
{
::osl::MutexGuard aInternalGuard(GetMutex());
if (!isAlive())
@@ -1568,7 +1568,7 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint)
handleParagraphNotifications();
break;
}
- case TEXT_HINT_VIEWSCROLLED:
+ case SfxHintId::TextViewScrolled:
{
::osl::MutexGuard aInternalGuard(GetMutex());
if (!isAlive())
@@ -1594,8 +1594,8 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint)
}
break;
}
- case TEXT_HINT_VIEWSELECTIONCHANGED:
- case TEXT_HINT_VIEWCARETCHANGED:
+ case SfxHintId::TextViewSelectionChanged:
+ case SfxHintId::TextViewCaretChanged:
{
::osl::MutexGuard aInternalGuard(GetMutex());
if (!isAlive())
@@ -1607,20 +1607,21 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint)
}
else
{
- // TEXT_HINT_VIEWSELECTIONCHANGED is sometimes sent at
+ // SfxHintId::TextViewSelectionChanged is sometimes sent at
// "unsafe" times (when the text engine has not yet re-
// formatted its content), so that for example calling
// ::TextEngine::GetTextHeight from within the code that
- // handles a previous TEXT_HINT_PARAINSERTED causes
+ // handles a previous SfxHintId::TextParaInserted causes
// trouble within the text engine. Therefore, these
// hints are just buffered (along with
- // TEXT_HINT_PARAINSERTED/REMOVED/FORMATPARA) until a
+ // SfxHintId::TextParaInserted/REMOVED/FORMATPARA) until a
// following ::TextEngine::FormatDoc causes a
- // TEXT_HINT_TEXTFORMATTED to come in:
+ // SfxHintId::TextFormatted to come in:
m_bSelectionChangedNotification = true;
}
break;
}
+ default: break;
}
}
}
@@ -1875,10 +1876,10 @@ void Document::handleParagraphNotifications()
m_aParagraphNotifications.pop();
switch (aHint.GetId())
{
- case TEXT_HINT_PARAINSERTED:
+ case SfxHintId::TextParaInserted:
{
::sal_uLong n = aHint.GetValue();
- assert(n <= m_xParagraphs->size() && "bad TEXT_HINT_PARAINSERTED event");
+ assert(n <= m_xParagraphs->size() && "bad SfxHintId::TextParaInserted event");
// Save the values of old iterators (the iterators themselves
// will get invalidated), and adjust the old values so that they
@@ -1926,7 +1927,7 @@ void Document::handleParagraphNotifications()
m_xParagraphs->begin() + nOldVisibleEnd, aIns);
break;
}
- case TEXT_HINT_PARAREMOVED:
+ case SfxHintId::TextParaRemoved:
{
::sal_uLong n = aHint.GetValue();
if (n == TEXT_PARA_ALL)
@@ -1951,7 +1952,7 @@ void Document::handleParagraphNotifications()
}
else
{
- assert(n < m_xParagraphs->size() && "Bad TEXT_HINT_PARAREMOVED event");
+ assert(n < m_xParagraphs->size() && "Bad SfxHintId::TextParaRemoved event");
Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
// numeric overflow cannot occur
@@ -2040,10 +2041,10 @@ void Document::handleParagraphNotifications()
}
break;
}
- case TEXT_HINT_FORMATPARA:
+ case SfxHintId::TextFormatPara:
{
::sal_uLong n = aHint.GetValue();
- assert(n < m_xParagraphs->size() && "Bad TEXT_HINT_FORMATPARA event");
+ assert(n < m_xParagraphs->size() && "Bad SfxHintId::TextFormatPara event");
(*m_xParagraphs)[static_cast< Paragraphs::size_type >(n)].
changeHeight(static_cast< ::sal_Int32 >(
@@ -2208,7 +2209,7 @@ void Document::handleSelectionChangeNotification()
::TextSelection const & rSelection = m_rView.GetSelection();
assert(rSelection.GetStart().GetPara() < m_xParagraphs->size() &&
rSelection.GetEnd().GetPara() < m_xParagraphs->size() &&
- "bad TEXT_HINT_VIEWSELECTIONCHANGED event");
+ "bad SfxHintId::TextViewSelectionChanged event");
::sal_Int32 nNewFirstPara
= static_cast< ::sal_Int32 >(rSelection.GetStart().GetPara());
::sal_Int32 nNewFirstPos = rSelection.GetStart().GetIndex();
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 33fbf52..2ae1b95 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1038,7 +1038,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
if (TextHint const* pTextHint = dynamic_cast<TextHint const*>(&rHint))
{
TextHint const& rTextHint = *pTextHint;
- if( rTextHint.GetId() == TEXT_HINT_VIEWSCROLLED )
+ if( rTextHint.GetId() == SfxHintId::TextViewScrolled )
{
if ( rModulWindow.GetHScrollBar() )
rModulWindow.GetHScrollBar()->SetThumbPos( pEditView->GetStartDocPos().X() );
@@ -1048,7 +1048,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
rModulWindow.GetLineNumberWindow().DoScroll
( rModulWindow.GetLineNumberWindow().GetCurYOffset() - pEditView->GetStartDocPos().Y() );
}
- else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
+ else if( rTextHint.GetId() == SfxHintId::TextHeightChanged )
{
if ( pEditView->GetStartDocPos().Y() )
{
@@ -1062,7 +1062,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
SetScrollBarRanges();
}
- else if( rTextHint.GetId() == TEXT_HINT_TEXTFORMATTED )
+ else if( rTextHint.GetId() == SfxHintId::TextFormatted )
{
if ( rModulWindow.GetHScrollBar() )
{
@@ -1079,20 +1079,20 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
if ( nCurTextWidth != nPrevTextWidth )
SetScrollBarRanges();
}
- else if( rTextHint.GetId() == TEXT_HINT_PARAINSERTED )
+ else if( rTextHint.GetId() == SfxHintId::TextParaInserted )
{
ParagraphInsertedDeleted( rTextHint.GetValue(), true );
DoDelayedSyntaxHighlight( rTextHint.GetValue() );
}
- else if( rTextHint.GetId() == TEXT_HINT_PARAREMOVED )
+ else if( rTextHint.GetId() == SfxHintId::TextParaRemoved )
{
ParagraphInsertedDeleted( rTextHint.GetValue(), false );
}
- else if( rTextHint.GetId() == TEXT_HINT_PARACONTENTCHANGED )
+ else if( rTextHint.GetId() == SfxHintId::TextParaContentChanged )
{
DoDelayedSyntaxHighlight( rTextHint.GetValue() );
}
- else if( rTextHint.GetId() == TEXT_HINT_VIEWSELECTIONCHANGED )
+ else if( rTextHint.GetId() == SfxHintId::TextViewSelectionChanged )
{
if (SfxBindings* pBindings = GetBindingsPtr())
{
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 762b90b..90e093a 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -475,21 +475,17 @@ void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
if (GetShell())
{
- switch (rHint.GetId())
+ if (rHint.GetId() == SfxHintId::Dying)
{
- case SFX_HINT_DYING:
- {
- EndListening( rBC, true /* log off all */ );
- aObjectCatalog->UpdateEntries();
- }
- break;
+ EndListening( rBC, true /* log off all */ );
+ aObjectCatalog->UpdateEntries();
}
if (SbxHint const* pSbxHint = dynamic_cast<SbxHint const*>(&rHint))
{
- const sal_uInt32 nHintId = pSbxHint->GetId();
- if ( ( nHintId == SBX_HINT_BASICSTART ) ||
- ( nHintId == SBX_HINT_BASICSTOP ) )
+ const SfxHintId nHintId = pSbxHint->GetId();
+ if ( ( nHintId == SfxHintId::BasicStart ) ||
+ ( nHintId == SfxHintId::BasicStop ) )
{
if (SfxBindings* pBindings = GetBindingsPtr())
{
@@ -515,7 +511,7 @@ void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
pBindings->Update( SID_BASICLOAD );
}
- if ( nHintId == SBX_HINT_BASICSTOP )
+ if ( nHintId == SfxHintId::BasicStop )
{
// not only at error/break or explicit stoppage,
// if the update is turned off due to a programming bug
@@ -533,7 +529,7 @@ void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
BaseWindow* pWin = it->second;
- if ( nHintId == SBX_HINT_BASICSTART )
+ if ( nHintId == SfxHintId::BasicStart )
pWin->BasicStarted();
else
pWin->BasicStopped();
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index cb09047..03d7309 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -577,7 +577,7 @@ namespace basic
void ImplRepository::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint )
{
- if ( _rHint.GetId() != SFX_HINT_DYING )
+ if ( _rHint.GetId() != SfxHintId::Dying )
// not interested in
return;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index f7ee7b1..236c14e 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -849,7 +849,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
BasicManager::~BasicManager()
{
// Notify listener if something needs to be saved
- Broadcast( SfxHint( SFX_HINT_DYING) );
+ Broadcast( SfxHint( SfxHintId::Dying) );
}
void BasicManager::LegacyDeleteBasicManager( BasicManager*& _rpManager )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index d03eaa3..b991514 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -2061,10 +2061,10 @@ void BasicCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint )
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
{
- const sal_uInt32 nId = p->GetId();
- bool bRead = nId == SBX_HINT_DATAWANTED;
- bool bWrite = nId == SBX_HINT_DATACHANGED;
- bool bRequestInfo = nId == SBX_HINT_INFOWANTED;
+ const SfxHintId nId = p->GetId();
+ bool bRead = nId == SfxHintId::BasicDataWanted;
+ bool bWrite = nId == SfxHintId::BasicDataChanged;
+ bool bRequestInfo = nId == SfxHintId::BasicInfoWanted;
SbxVariable* pVar = p->GetVar();
SbxArray* pArg = pVar->GetParameters();
OUString aVarName( pVar->GetName() );
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index e87d267..18c0009 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1999,7 +1999,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if( pProp )
{
bool bInvocation = pProp->isInvocationBased();
- if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ if( pHint->GetId() == SfxHintId::BasicDataWanted )
{
// Test-Properties
sal_Int32 nId = pProp->nId;
@@ -2102,7 +2102,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
}
}
- else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+ else if( pHint->GetId() == SfxHintId::BasicDataChanged )
{
if( !bInvocation && mxUnoAccess.is() )
{
@@ -2160,7 +2160,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
else if( pMeth )
{
bool bInvocation = pMeth->isInvocationBased();
- if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ if( pHint->GetId() == SfxHintId::BasicDataWanted )
{
// number of Parameter -1 because of Param0 == this
sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
@@ -3560,7 +3560,7 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pParams = pVar->GetParameters();
SbUnoServiceCtor* pUnoCtor = dynamic_cast<SbUnoServiceCtor*>( pVar );
- if( pUnoCtor && pHint->GetId() == SBX_HINT_DATAWANTED )
+ if( pUnoCtor && pHint->GetId() == SfxHintId::BasicDataWanted )
{
// Parameter count -1 because of Param0 == this
sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
@@ -4912,7 +4912,7 @@ void SbUnoStructRefObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
StructFieldInfo::iterator it = maFields.find( pProp->GetName() );
// handle get/set of members of struct
- if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ if( pHint->GetId() == SfxHintId::BasicDataWanted )
{
// Test-Properties
sal_Int32 nId = pProp->nId;
@@ -4957,7 +4957,7 @@ void SbUnoStructRefObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
else
StarBASIC::Error( ERRCODE_BASIC_PROPERTY_NOT_FOUND );
}
- else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+ else if( pHint->GetId() == SfxHintId::BasicDataChanged )
{
if ( it != maFields.end() )
{
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 5ffda81..972c47b 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -318,7 +318,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownProper
SbxVariable* pProp = pProperty.get();
if ( pProp->GetType() == SbxEMPTY )
- pProperty->Broadcast( SBX_HINT_DATAWANTED );
+ pProperty->Broadcast( SfxHintId::BasicDataWanted );
Any aRet = sbxToUnoValue( pProp );
return aRet;
@@ -718,7 +718,7 @@ void SbModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if( pProcProperty )
{
- if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ if( pHint->GetId() == SfxHintId::BasicDataWanted )
{
OUString aProcName = "Property Get "
+ pProcProperty->GetName();
@@ -753,7 +753,7 @@ void SbModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
pVar->Put( aVals );
}
}
- else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+ else if( pHint->GetId() == SfxHintId::BasicDataChanged )
{
SbxVariable* pMethVar = nullptr;
@@ -794,7 +794,7 @@ void SbModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
else if( pMeth )
{
- if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ if( pHint->GetId() == SfxHintId::BasicDataWanted )
{
if( pMeth->bInvalid && !Compile() )
{
@@ -817,8 +817,8 @@ void SbModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
// side effects when using name as variable implicitly
bool bForwardToSbxObject = true;
- const sal_uInt32 nId = pHint->GetId();
- if( (nId == SBX_HINT_DATAWANTED || nId == SBX_HINT_DATACHANGED) &&
+ const SfxHintId nId = pHint->GetId();
+ if( (nId == SfxHintId::BasicDataWanted || nId == SfxHintId::BasicDataChanged) &&
pVar->GetName().equalsIgnoreAsciiCase( "name" ) )
{
bForwardToSbxObject = false;
@@ -929,7 +929,7 @@ void SbModule::SetSource32( const OUString& r )
// Broadcast of a hint to all Basics
-static void SendHint_( SbxObject* pObj, sal_uInt32 nId, SbMethod* p )
+static void SendHint_( SbxObject* pObj, SfxHintId nId, SbMethod* p )
{
// Self a BASIC?
if( dynamic_cast<const StarBASIC *>(pObj) != nullptr && pObj->IsBroadcaster() )
@@ -944,7 +944,7 @@ static void SendHint_( SbxObject* pObj, sal_uInt32 nId, SbMethod* p )
}
}
-static void SendHint( SbxObject* pObj, sal_uInt32 nId, SbMethod* p )
+static void SendHint( SbxObject* pObj, SfxHintId nId, SbMethod* p )
{
while( pObj->GetParent() )
pObj = pObj->GetParent();
@@ -1120,7 +1120,7 @@ void SbModule::Run( SbMethod* pMeth )
{
if( bDelInst )
{
- SendHint( GetParent(), SBX_HINT_BASICSTART, pMeth );
+ SendHint( GetParent(), SfxHintId::BasicStart, pMeth );
// 1996-10-16: #31460 New concept for StepInto/Over/Out
// For an explanation see runtime.cxx at SbiInstance::CalcBreakCallLevel()
@@ -1186,7 +1186,7 @@ void SbModule::Run( SbMethod* pMeth )
// #i30690
SolarMutexGuard aSolarGuard;
- SendHint( GetParent(), SBX_HINT_BASICSTOP, pMeth );
+ SendHint( GetParent(), SfxHintId::BasicStop, pMeth );
GlobalRunDeInit();
@@ -1847,7 +1847,7 @@ void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rH
{
bDone = true;
- if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ if( pHint->GetId() == SfxHintId::BasicDataWanted )
{
OUString aProcName = "Property Get "
+ pProcProperty->GetName();
@@ -1882,7 +1882,7 @@ void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rH
pVar->Put( aVals );
}
}
- else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+ else if( pHint->GetId() == SfxHintId::BasicDataChanged )
{
SbxVariable* pMeth = nullptr;
@@ -2101,16 +2101,16 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
// #100883 Own Broadcast for SbMethod
-void SbMethod::Broadcast( sal_uInt32 nHintId )
+void SbMethod::Broadcast( SfxHintId nHintId )
{
if( pCst && !IsSet( SbxFlagBits::NoBroadcast ) )
{
// Because the method could be called from outside, test here once again
// the authorisation
- if( nHintId & SBX_HINT_DATAWANTED )
+ if( nHintId == SfxHintId::BasicDataWanted )
if( !CanRead() )
return;
- if( nHintId & SBX_HINT_DATACHANGED )
+ if( nHintId == SfxHintId::BasicDataChanged )
if( !CanWrite() )
return;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1fa46b1..a95cf5c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2610,7 +2610,7 @@ RTLFUNC(IsEmpty)
}
if ( pVar )
{
- pVar->Broadcast( SBX_HINT_DATAWANTED );
+ pVar->Broadcast( SfxHintId::BasicDataWanted );
rPar.Get( 0 )->PutBool( pVar->IsEmpty() );
}
else
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 98510c6..23d3f82 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1019,13 +1019,13 @@ void SbiRuntime::TOSMakeTemp()
SbxVariable* p = refExprStk->Get( nExprLvl - 1 );
if ( p->GetType() == SbxEMPTY )
{
- p->Broadcast( SBX_HINT_DATAWANTED );
+ p->Broadcast( SfxHintId::BasicDataWanted );
}
SbxVariable* pDflt = nullptr;
if ( bVBAEnabled && ( p->GetType() == SbxOBJECT || p->GetType() == SbxVARIANT ) && ((pDflt = getDefaultProp(p)) != nullptr) )
{
- pDflt->Broadcast( SBX_HINT_DATAWANTED );
+ pDflt->Broadcast( SfxHintId::BasicDataWanted );
// replacing new p on stack causes object pointed by
// pDft->pParent to be deleted, when p2->Compute() is
// called below pParent is accessed (but it's deleted)
@@ -1301,12 +1301,12 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
SbxDataType p2Type = p2->GetType();
if ( p1Type == SbxEMPTY )
{
- p1->Broadcast( SBX_HINT_DATAWANTED );
+ p1->Broadcast( SfxHintId::BasicDataWanted );
p1Type = p1->GetType();
}
if ( p2Type == SbxEMPTY )
{
- p2->Broadcast( SBX_HINT_DATAWANTED );
+ p2->Broadcast( SfxHintId::BasicDataWanted );
p2Type = p2->GetType();
}
if ( p1Type == p2Type )
@@ -1322,13 +1322,13 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
if ( pDflt )
{
p1 = pDflt;
- p1->Broadcast( SBX_HINT_DATAWANTED );
+ p1->Broadcast( SfxHintId::BasicDataWanted );
}
pDflt = getDefaultProp( p2.get() );
if ( pDflt )
{
p2 = pDflt;
- p2->Broadcast( SBX_HINT_DATAWANTED );
+ p2->Broadcast( SfxHintId::BasicDataWanted );
}
}
@@ -1543,12 +1543,12 @@ void SbiRuntime::StepIS()
SbxDataType eType2 = refVar2->GetType();
if ( eType1 == SbxEMPTY )
{
- refVar1->Broadcast( SBX_HINT_DATAWANTED );
+ refVar1->Broadcast( SfxHintId::BasicDataWanted );
eType1 = refVar1->GetType();
}
if ( eType2 == SbxEMPTY )
{
- refVar2->Broadcast( SBX_HINT_DATAWANTED );
+ refVar2->Broadcast( SfxHintId::BasicDataWanted );
eType2 = refVar2->GetType();
}
@@ -1568,7 +1568,7 @@ void SbiRuntime::StepIS()
void SbiRuntime::StepGET()
{
SbxVariable* p = GetTOS();
- p->Broadcast( SBX_HINT_DATAWANTED );
+ p->Broadcast( SfxHintId::BasicDataWanted );
}
// #67607 copy Uno-Structs
@@ -1672,7 +1672,7 @@ void SbiRuntime::StepPUT()
// aren't dealt with if the object is a member of some parent object
bool bObjAssign = false;
if ( refVar->GetType() == SbxEMPTY )
- refVar->Broadcast( SBX_HINT_DATAWANTED );
+ refVar->Broadcast( SfxHintId::BasicDataWanted );
if ( refVar->GetType() == SbxOBJECT )
{
if ( dynamic_cast<const SbxMethod *>(refVar.get()) != nullptr || ! refVar->GetParent() )
@@ -2806,7 +2806,7 @@ void SbiRuntime::StepARGN( sal_uInt32 nOp1 )
{
// named variables ( that are Any especially properties ) can be empty at this point and need a broadcast
if ( pVal->GetType() == SbxEMPTY )
- pVal->Broadcast( SBX_HINT_DATAWANTED );
+ pVal->Broadcast( SfxHintId::BasicDataWanted );
// evaluate methods and properties!
SbxVariable* pRes = new SbxVariable( *pVal );
pVal = pRes;
@@ -3862,7 +3862,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
SbxVariable* pDflt = getDefaultProp( pElem );
if ( pDflt )
{
- pDflt->Broadcast( SBX_HINT_DATAWANTED );
+ pDflt->Broadcast( SfxHintId::BasicDataWanted );
SbxBaseRef pDfltObj = pDflt->GetObject();
if( pDfltObj.Is() )
{
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 115252c..0eac637 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -824,15 +824,15 @@ void SbiStdObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const sal_uInt16 nCallId = static_cast<sal_uInt16>(pVar->GetUserData());
if( nCallId )
{
- const sal_uInt32 t = pHint->GetId();
- if( t == SBX_HINT_INFOWANTED )
+ const SfxHintId t = pHint->GetId();
+ if( t == SfxHintId::BasicInfoWanted )
pVar->SetInfo( GetInfo( static_cast<short>(pVar->GetUserData()) ) );
else
{
bool bWrite = false;
- if( t == SBX_HINT_DATACHANGED )
+ if( t == SfxHintId::BasicDataChanged )
bWrite = true;
- if( t == SBX_HINT_DATAWANTED || bWrite )
+ if( t == SfxHintId::BasicDataWanted || bWrite )
{
RtlCall p = aMethods[ nCallId-1 ].pFunc;
SbxArrayRef rPar( pPar_ );
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index a46520b..3635a47 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -134,7 +134,7 @@ void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if( pHint )
{
- if( pHint->GetId() == SBX_HINT_INFOWANTED )
+ if( pHint->GetId() == SfxHintId::BasicInfoWanted )
{
SbxObject::Notify( rBC, rHint );
return;
@@ -143,7 +143,7 @@ void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
const sal_uInt32 nWhich = pVar->GetUserData();
- bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ bool bWrite = pHint->GetId() == SfxHintId::BasicDataChanged;
// Propteries
switch( nWhich )
@@ -252,7 +252,7 @@ void SbStdFont::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if( pHint )
{
- if( pHint->GetId() == SBX_HINT_INFOWANTED )
+ if( pHint->GetId() == SfxHintId::BasicInfoWanted )
{
SbxObject::Notify( rBC, rHint );
return;
@@ -261,7 +261,7 @@ void SbStdFont::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
const sal_uInt32 nWhich = pVar->GetUserData();
- bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ bool bWrite = pHint->GetId() == SfxHintId::BasicDataChanged;
// Propteries
switch( nWhich )
@@ -407,7 +407,7 @@ void SbStdClipboard::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if( pHint )
{
- if( pHint->GetId() == SBX_HINT_INFOWANTED )
+ if( pHint->GetId() == SfxHintId::BasicInfoWanted )
{
SbxObject::Notify( rBC, rHint );
return;
@@ -416,7 +416,7 @@ void SbStdClipboard::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
const sal_uInt32 nWhich = pVar->GetUserData();
- bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ bool bWrite = pHint->GetId() == SfxHintId::BasicDataChanged;
// Methods
switch( nWhich )
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 8971c86..3fa3b69 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -117,9 +117,9 @@ void SbxCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint )
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
{
- const sal_uInt32 nId = p->GetId();
- bool bRead = ( nId == SBX_HINT_DATAWANTED );
- bool bWrite = ( nId == SBX_HINT_DATACHANGED );
+ const SfxHintId nId = p->GetId();
+ bool bRead = ( nId == SfxHintId::BasicDataWanted );
+ bool bWrite = ( nId == SfxHintId::BasicDataChanged );
SbxVariable* pVar = p->GetVar();
SbxArray* pArg = pVar->GetParameters();
if( bRead || bWrite )
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index 47775b0..24afd33 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -261,7 +261,7 @@ static SbxVariableRef Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod
}
else
// Simple call: once activating
- refVar->Broadcast( SBX_HINT_DATAWANTED );
+ refVar->Broadcast( SfxHintId::BasicDataWanted );
}
*ppBuf = p;
return refVar;
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index e4e7e38..098a580 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -136,9 +136,9 @@ void SbxObject::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
{
- const sal_uInt32 nId = p->GetId();
- bool bRead = ( nId == SBX_HINT_DATAWANTED );
- bool bWrite = ( nId == SBX_HINT_DATACHANGED );
+ const SfxHintId nId = p->GetId();
+ bool bRead = ( nId == SfxHintId::BasicDataWanted );
+ bool bWrite = ( nId == SfxHintId::BasicDataChanged );
SbxVariable* pVar = p->GetVar();
if( bRead || bWrite )
{
@@ -295,7 +295,7 @@ bool SbxObject::Call( const OUString& rName, SbxArray* pParam )
{
pMeth->SetParameters( pParam );
}
- pMeth->Broadcast( SBX_HINT_DATAWANTED );
+ pMeth->Broadcast( SfxHintId::BasicDataWanted );
pMeth->SetParameters( nullptr );
return true;
}
@@ -413,7 +413,7 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp
SetModified( true );
// The object listen always
StartListening( pVar->GetBroadcaster(), true );
- Broadcast( SBX_HINT_OBJECTCHANGED );
+ Broadcast( SfxHintId::BasicObjectChanged );
return pVar;
}
@@ -457,7 +457,7 @@ void SbxObject::Insert( SbxVariable* pVar )
pVar->SetParent( this );
}
SetModified( true );
- Broadcast( SBX_HINT_OBJECTCHANGED );
+ Broadcast( SfxHintId::BasicObjectChanged );
#ifdef DBG_UTIL
static const char* pCls[] =
{ "DontCare","Array","Value","Variable","Method","Property","Object" };
@@ -557,7 +557,7 @@ void SbxObject::Remove( SbxVariable* pVar )
pVar_->SetParent( nullptr );
}
SetModified( true );
- Broadcast( SBX_HINT_OBJECTCHANGED );
+ Broadcast( SfxHintId::BasicObjectChanged );
}
}
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 1c93523..6ce2239 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -59,7 +59,7 @@ SbxValue::SbxValue( const SbxValue& r )
}
else
{
- const_cast<SbxValue*>(&r)->Broadcast( SBX_HINT_DATAWANTED );
+ const_cast<SbxValue*>(&r)->Broadcast( SfxHintId::BasicDataWanted );
aData = r.aData;
// Copy pointer, increment references
switch( aData.eType )
@@ -133,7 +133,7 @@ SbxValue& SbxValue::operator=( const SbxValue& r )
SbxValue::~SbxValue()
{
- Broadcast( SBX_HINT_DYING );
+ Broadcast( SfxHintId::BasicDying );
SetFlag( SbxFlagBits::Write );
SbxValue::Clear();
}
@@ -182,7 +182,7 @@ void SbxValue::Clear()
// Dummy
-void SbxValue::Broadcast( sal_uInt32 )
+void SbxValue::Broadcast( SfxHintId )
{}
//////////////////////////// Readout data
@@ -284,7 +284,7 @@ bool SbxValue::Get( SbxValues& rRes ) const
p = TheRealValue( true );
if( p )
{
- p->Broadcast( SBX_HINT_DATAWANTED );
+ p->Broadcast( SfxHintId::BasicDataWanted );
switch( rRes.eType )
{
case SbxEMPTY:
@@ -519,7 +519,7 @@ bool SbxValue::Put( const SbxValues& rVal )
if( !IsError() )
{
p->SetModified( true );
- p->Broadcast( SBX_HINT_DATACHANGED );
+ p->Broadcast( SfxHintId::BasicDataChanged );
if( eOld != ERRCODE_SBX_OK )
SetError( eOld );
bRes = true;
@@ -689,7 +689,7 @@ bool SbxValue::ImpIsNumeric( bool bOnlyIntntl ) const
}
// Test downcast!!!
if( nullptr != dynamic_cast<const SbxVariable*>( this) )
- const_cast<SbxVariable*>(static_cast<const SbxVariable*>(this))->Broadcast( SBX_HINT_DATAWANTED );
+ const_cast<SbxVariable*>(static_cast<const SbxVariable*>(this))->Broadcast( SfxHintId::BasicDataWanted );
SbxDataType t = GetType();
if( t == SbxSTRING )
{
@@ -817,7 +817,7 @@ bool SbxValue::Convert( SbxDataType eTo )
Put( aNew );
SetModified( true );
}
- Broadcast( SBX_HINT_CONVERTED );
+ Broadcast( SfxHintId::BasicConverted );
return true;
}
else
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 27766df..5e8307d 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -155,20 +155,20 @@ SbxArray* SbxVariable::GetParameters() const
// Perhaps some day one could cut the parameter 0.
// Then the copying will be dropped...
-void SbxVariable::Broadcast( sal_uInt32 nHintId )
+void SbxVariable::Broadcast( SfxHintId nHintId )
{
if( pCst && !IsSet( SbxFlagBits::NoBroadcast ) )
{
// Because the method could be called from outside, check the
// rights here again
- if( nHintId & SBX_HINT_DATAWANTED )
+ if( nHintId == SfxHintId::BasicDataWanted )
{
if( !CanRead() )
{
return;
}
}
- if( nHintId & SBX_HINT_DATACHANGED )
+ if( nHintId == SfxHintId::BasicDataChanged )
{
if( !CanWrite() )
{
@@ -201,7 +201,7 @@ SbxInfo* SbxVariable::GetInfo()
{
if( !pInfo.Is() )
{
- Broadcast( SBX_HINT_INFOWANTED );
+ Broadcast( SfxHintId::BasicInfoWanted );
if( pInfo.Is() )
{
SetModified( true );
@@ -582,7 +582,7 @@ bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
pInfo = new SbxInfo;
pInfo->LoadData( rStrm, (sal_uInt16) cMark );
}
- Broadcast( SBX_HINT_DATACHANGED );
+ Broadcast( SfxHintId::BasicDataChanged );
nHash = MakeHashCode( maName );
SetModified( true );
return true;
@@ -662,20 +662,20 @@ SbxAlias::~SbxAlias()
}
}
-void SbxAlias::Broadcast( sal_uInt32 nHt )
+void SbxAlias::Broadcast( SfxHintId nHt )
{
if( xAlias.Is() )
{
xAlias->SetParameters( GetParameters() );
- if( nHt == SBX_HINT_DATAWANTED )
+ if( nHt == SfxHintId::BasicDataWanted )
{
SbxVariable::operator=( *xAlias );
}
- else if( nHt == SBX_HINT_DATACHANGED || nHt == SBX_HINT_CONVERTED )
+ else if( nHt == SfxHintId::BasicDataChanged || nHt == SfxHintId::BasicConverted )
{
*xAlias = *this;
}
- else if( nHt == SBX_HINT_INFOWANTED )
+ else if( nHt == SfxHintId::BasicInfoWanted )
{
xAlias->Broadcast( nHt );
pInfo = xAlias->GetInfo();
@@ -686,7 +686,7 @@ void SbxAlias::Broadcast( sal_uInt32 nHt )
void SbxAlias::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
- if( p && p->GetId() == SBX_HINT_DYING )
+ if( p && p->GetId() == SfxHintId::BasicDying )
{
xAlias.Clear();
// delete the alias?
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 5624865..142c85d 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -173,14 +173,14 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( pTextHint )
{
bool bLastVal = EndReached();
- const sal_uInt32 nId = pTextHint->GetId();
+ const SfxHintId nId = pTextHint->GetId();
- if ( nId == TEXT_HINT_PARAINSERTED )
+ if ( nId == SfxHintId::TextParaInserted )
{
if ( bLastVal )
mbEndReached = IsEndReached();
}
- else if ( nId == TEXT_HINT_VIEWSCROLLED )
+ else if ( nId == SfxHintId::TextViewScrolled )
{
if ( ! mbEndReached )
mbEndReached = IsEndReached();
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index e4b0fb0..8f37954 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2475,7 +2475,7 @@ void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
if ( GetNotifyHdl().IsSet() )
{
- EENotify aNotify( EE_NOTIFY_TEXTHEIGHTCHANGED );
+ EENotify aNotify( EE_NOTIFY_TextHeightChanged );
aNotify.pEditEngine = this;
aNotify.nParagraph = nPara;
pImpEditEngine->CallNotify( aNotify );
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 2331fe1..bcfb89e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -425,7 +425,7 @@ void ImpEditEngine::FormatDoc()
sal_uInt32 nNewHeight = CalcTextHeight( &nNewHeightNTP );
long nDiff = nNewHeight - nCurTextHeight;
if ( nDiff )
- aStatus.GetStatusWord() |= !IsVertical() ? EditStatusFlags::TEXTHEIGHTCHANGED : EditStatusFlags::TEXTWIDTHCHANGED;
+ aStatus.GetStatusWord() |= !IsVertical() ? EditStatusFlags::TextHeightChanged : EditStatusFlags::TEXTWIDTHCHANGED;
if ( nNewHeight < nCurTextHeight )
{
aInvalidRect.Bottom() = (long)std::max( nNewHeight, nCurTextHeight );
@@ -516,7 +516,7 @@ void ImpEditEngine::CheckAutoPageSize()
|| ( IsVertical() && ( aPaperSize.Height() != aPrevPaperSize.Height() ) ) )
{
// If ahead is centered / right or tabs ...
- aStatus.GetStatusWord() |= !IsVertical() ? EditStatusFlags::TEXTWIDTHCHANGED : EditStatusFlags::TEXTHEIGHTCHANGED;
+ aStatus.GetStatusWord() |= !IsVertical() ? EditStatusFlags::TEXTWIDTHCHANGED : EditStatusFlags::TextHeightChanged;
for ( sal_Int32 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
{
// Only paragraphs which are not aligned to the left need to be
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 1b3c5b3..100af46 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -143,32 +143,31 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if ( !bDowning )
{
- SfxStyleSheet* pStyle = nullptr;
- sal_uInt32 nId = 0;
-
const SfxStyleSheetHint* pStyleSheetHint = dynamic_cast<const SfxStyleSheetHint*>(&rHint);
if ( pStyleSheetHint )
{
DBG_ASSERT( dynamic_cast< const SfxStyleSheet* >(pStyleSheetHint->GetStyleSheet()) != nullptr, "No SfxStyleSheet!" );
- pStyle = static_cast<SfxStyleSheet*>( pStyleSheetHint->GetStyleSheet() );
- nId = pStyleSheetHint->GetHint();
+ SfxStyleSheet* pStyle = static_cast<SfxStyleSheet*>( pStyleSheetHint->GetStyleSheet() );
+ SfxHintId nId = pStyleSheetHint->GetId();
+ if ( ( nId == SfxHintId::StyleSheetInDestruction ) ||
+ ( nId == SfxHintId::StyleSheetErased ) )
+ {
+ RemoveStyleFromParagraphs( pStyle );
+ }
+ else if ( nId == SfxHintId::StyleSheetModified )
+ {
+ UpdateParagraphsWithStyleSheet( pStyle );
+ }
}
else if ( dynamic_cast< const SfxStyleSheet* >(&rBC) != nullptr )
{
- pStyle = static_cast<SfxStyleSheet*>(&rBC);
- nId = rHint.GetId();
- }
-
- if ( pStyle )
- {
- if ( ( nId == SFX_HINT_DYING ) ||
- ( nId == SfxStyleSheetHintId::INDESTRUCTION ) ||
- ( nId == SfxStyleSheetHintId::ERASED ) )
+ SfxStyleSheet* pStyle = static_cast<SfxStyleSheet*>(&rBC);
+ SfxHintId nId = rHint.GetId();
+ if ( nId == SfxHintId::Dying )
{
RemoveStyleFromParagraphs( pStyle );
}
- else if ( ( nId == SFX_HINT_DATACHANGED ) ||
- ( nId == SfxStyleSheetHintId::MODIFIED ) )
+ else if ( nId == SfxHintId::DataChanged )
{
UpdateParagraphsWithStyleSheet( pStyle );
}
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 268d188..646d009 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -26,14 +26,14 @@
#include <osl/diagnose.h>
-SvxEditSourceHint::SvxEditSourceHint( sal_uInt32 _nId ) :
+SvxEditSourceHint::SvxEditSourceHint( SfxHintId _nId ) :
TextHint( _nId ),
mnStart( 0 ),
mnEnd( 0 )
{
}
-SvxEditSourceHint::SvxEditSourceHint( sal_uInt32 _nId, sal_uLong nValue, sal_Int32 nStart, sal_Int32 nEnd ) :
+SvxEditSourceHint::SvxEditSourceHint( SfxHintId _nId, sal_uLong nValue, sal_Int32 nStart, sal_Int32 nEnd ) :
TextHint( _nId, nValue ),
mnStart( nStart),
mnEnd( nEnd )
@@ -48,37 +48,37 @@ SvxEditSourceHint::SvxEditSourceHint( sal_uInt32 _nId, sal_uLong nValue, sal_Int
switch( aNotify->eNotificationType )
{
case EE_NOTIFY_TEXTMODIFIED:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_MODIFIED, aNotify->nParagraph ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextModified, aNotify->nParagraph ) );
case EE_NOTIFY_PARAGRAPHINSERTED:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_PARAINSERTED, aNotify->nParagraph ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextParaInserted, aNotify->nParagraph ) );
case EE_NOTIFY_PARAGRAPHREMOVED:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_PARAREMOVED, aNotify->nParagraph ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextParaRemoved, aNotify->nParagraph ) );
case EE_NOTIFY_PARAGRAPHSMOVED:
- return ::std::unique_ptr<SfxHint>( new SvxEditSourceHint( EDITSOURCE_HINT_PARASMOVED, aNotify->nParagraph, aNotify->nParam1, aNotify->nParam2 ) );
+ return ::std::unique_ptr<SfxHint>( new SvxEditSourceHint( SfxHintId::EditSourceParasMoved, aNotify->nParagraph, aNotify->nParam1, aNotify->nParam2 ) );
- case EE_NOTIFY_TEXTHEIGHTCHANGED:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_TEXTHEIGHTCHANGED, aNotify->nParagraph ) );
+ case EE_NOTIFY_TextHeightChanged:
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextHeightChanged, aNotify->nParagraph ) );
case EE_NOTIFY_TEXTVIEWSCROLLED:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_VIEWSCROLLED ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextViewScrolled ) );
case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED:
- return ::std::unique_ptr<SfxHint>( new SvxEditSourceHint( EDITSOURCE_HINT_SELECTIONCHANGED ) );
+ return ::std::unique_ptr<SfxHint>( new SvxEditSourceHint( SfxHintId::EditSourceSelectionChanged ) );
case EE_NOTIFY_BLOCKNOTIFICATION_START:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_BLOCKNOTIFICATION_START, 0 ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextBlockNotificationStart, 0 ) );
case EE_NOTIFY_BLOCKNOTIFICATION_END:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_BLOCKNOTIFICATION_END, 0 ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextBlockNotificationEnd, 0 ) );
case EE_NOTIFY_INPUT_START:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_START, 0 ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextInputStart, 0 ) );
case EE_NOTIFY_INPUT_END:
- return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
+ return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextInputEnd, 0 ) );
case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
return ::std::unique_ptr<SfxHint>( new SvxEditSourceHintEndPara );
default:
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 3bc77a4..5a11fa9 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -276,10 +276,10 @@ namespace frm
{
EditStatusFlags nStatusWord( _rStatus.GetStatusWord() );
if ( ( nStatusWord & EditStatusFlags::TEXTWIDTHCHANGED )
- || ( nStatusWord & EditStatusFlags::TEXTHEIGHTCHANGED )
+ || ( nStatusWord & EditStatusFlags::TextHeightChanged )
)
{
- if ( ( nStatusWord & EditStatusFlags::TEXTHEIGHTCHANGED ) && windowHasAutomaticLineBreak() )
+ if ( ( nStatusWord & EditStatusFlags::TextHeightChanged ) && windowHasAutomaticLineBreak() )
m_pEngine->SetPaperSize( Size( m_pEngine->GetPaperSize().Width(), m_pEngine->GetTextHeight() ) );
updateScrollbars();
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 39576fb..4007103 100644
--- a/include/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
@@ -59,9 +59,6 @@ namespace o3tl {
#define SBXID_JSCRIPTMOD 0x6a62 // jm: JavaScript Module
#define SBXID_JSCRIPTMETH 0x6a64 // jm: JavaScript Module
-#define SBX_HINT_BASICSTART SFX_HINT_USER04
-#define SBX_HINT_BASICSTOP SFX_HINT_USER05
-
enum class PropertyMode
{
NONE,
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index e0d57a69..2a67dc7 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -62,7 +62,7 @@ public:
// Interface to execute a method from the applications
ErrCode Call( SbxValue* pRet, SbxVariable* pCaller = nullptr );
- virtual void Broadcast( sal_uInt32 nHintId ) override;
+ virtual void Broadcast( SfxHintId nHintId ) override;
};
typedef tools::SvRef<SbMethod> SbMethodRef;
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 35d09c4..d52b6ce 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -94,7 +94,7 @@ class BASIC_DLLPUBLIC SbxHint : public SfxHint
{
SbxVariable* pVar;
public:
- SbxHint( sal_uInt32 n, SbxVariable* v ) : SfxHint( n ), pVar( v ) {}
+ SbxHint( SfxHintId n, SbxVariable* v ) : SfxHint( n ), pVar( v ) {}
SbxVariable* GetVar() const { return pVar; }
};
@@ -103,7 +103,7 @@ class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public SfxListener
{
SbxVariableRef xAlias;
virtual ~SbxAlias() override;
- virtual void Broadcast( sal_uInt32 ) override;
+ virtual void Broadcast( SfxHintId ) override;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
public:
SbxAlias( const SbxAlias& );
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 4286398..44c75db 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -200,14 +200,6 @@ namespace o3tl
template<> struct typed_flags<SbxFlagBits> : is_typed_flags<SbxFlagBits, 0xffff> {};
}
-// Broadcaster-IDs:
-#define SBX_HINT_DYING SFX_HINT_DYING
-#define SBX_HINT_DATAWANTED SFX_HINT_USER00
-#define SBX_HINT_DATACHANGED SFX_HINT_DATACHANGED
-#define SBX_HINT_CONVERTED SFX_HINT_USER01
-#define SBX_HINT_INFOWANTED SFX_HINT_USER02
-#define SBX_HINT_OBJECTCHANGED SFX_HINT_USER03
-
// List of all creators for Load/Store
#define SBXCR_SBX 0x20584253 // SBX(blank)
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 9ad6cb3..82acb60 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -28,6 +28,7 @@
class SbxDecimal;
+enum class SfxHintId;
struct SbxValues
{
@@ -82,7 +83,7 @@ protected:
OUString aPic; // Picture-String
OUString aToolString; // tool string copy
- virtual void Broadcast( sal_uInt32 ); // Broadcast-Call
+ virtual void Broadcast( SfxHintId ); // Broadcast-Call
virtual ~SbxValue() override;
virtual bool LoadData( SvStream&, sal_uInt16 ) override;
virtual bool StoreData( SvStream& ) const override;
@@ -269,7 +270,7 @@ public:
// Due to data reduction and better DLL-hierarchy currently via casting
SfxBroadcaster& GetBroadcaster();
bool IsBroadcaster() const { return pCst != nullptr; }
- virtual void Broadcast( sal_uInt32 nHintId ) override;
+ virtual void Broadcast( SfxHintId nHintId ) override;
inline const SbxObject* GetParent() const { return pParent; }
SbxObject* GetParent() { return pParent;}
diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx
index aaa5f43..09af887 100644
--- a/include/editeng/AccessibleStaticTextBase.hxx
+++ b/include/editeng/AccessibleStaticTextBase.hxx
@@ -117,15 +117,15 @@ namespace accessibility
only be called from the main office thread.
The EditSource set here is required to broadcast out the
- following hints: EDITSOURCE_HINT_PARASMOVED,
- EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED,
- TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED,
- TEXT_HINT_TEXTHEIGHTCHANGED,
- TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes
+ following hints: SfxHintId::EditSourceParasMoved,
+ SfxHintId::EditSourceSelectionChanged, SfxHintId::TextModified,
+ SfxHintId::TextParaInserted, SfxHintId::TextParaRemoved,
+ SfxHintId::TextHeightChanged,
+ SfxHintId::TextViewScrolled. Otherwise, not all state changes
will get noticed by the accessibility object. Further
more, when the corresponding core object or the model is
dying, either the edit source must be set to NULL or it
- has to broadcast a SFX_HINT_DYING hint.
+ has to broadcast a SfxHintId::Dying hint.
This class does not have a dispose method, since it is not
a UNO component. Nevertheless, it holds C++ references to
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 33de259..34187ec 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -297,7 +297,7 @@ enum EENotifyType
EE_NOTIFY_PARAGRAPHSMOVED,
/// The height of at least one paragraph has changed
- EE_NOTIFY_TEXTHEIGHTCHANGED,
+ EE_NOTIFY_TextHeightChanged,
/// The view area of the EditEngine scrolled
EE_NOTIFY_TEXTVIEWSCROLLED,
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index fa5c771..c6b099d 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -86,7 +86,7 @@ enum class EditStatusFlags
CRSRMOVEFAIL = 0x0008,
CRSRLEFTPARA = 0x0010,
TEXTWIDTHCHANGED = 0x0020,
- TEXTHEIGHTCHANGED = 0x0040,
+ TextHeightChanged = 0x0040,
WRONGWORDCHANGED = 0x0080
};
namespace o3tl
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index ca8dac2..c085767 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -30,11 +30,8 @@
struct EENotify;
class EditEngine;
-#define EDITSOURCE_HINT_PARASMOVED 20
-#define EDITSOURCE_HINT_SELECTIONCHANGED 21
-
/** Extends TextHint by two additional parameters which are necessary
- for the EDITSOURCE_HINT_PARASMOVED hint. TextHint's value in this
+ for the SfxHintId::EditSourceParasMoved hint. TextHint's value in this
case denotes the destination position, the two parameters the
start and the end of the moved paragraph range.
*/
@@ -45,8 +42,8 @@ private:
sal_Int32 mnEnd;
public:
- SvxEditSourceHint( sal_uInt32 nId );
- SvxEditSourceHint( sal_uInt32 nId, sal_uLong nValue, sal_Int32 nStart, sal_Int32 nEnd );
+ SvxEditSourceHint( SfxHintId nId );
+ SvxEditSourceHint( SfxHintId nId, sal_uLong nValue, sal_Int32 nStart, sal_Int32 nEnd );
using TextHint::GetValue;
sal_Int32 GetStartValue() const { return mnStart;}
@@ -55,7 +52,7 @@ public:
class SvxEditSourceHintEndPara :public SvxEditSourceHint
{
public:
- SvxEditSourceHintEndPara() : SvxEditSourceHint(EDITSOURCE_HINT_SELECTIONCHANGED) {}
+ SvxEditSourceHintEndPara() : SvxEditSourceHint(SfxHintId::EditSourceSelectionChanged) {}
};
/** Helper class for common functionality in edit sources
*/
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index a31cea4..fb1f2d0 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -22,37 +22,105 @@
#include <sal/types.h>
#include <svl/svldllapi.h>
-#define SFX_HINT_DYING 0x00000001
-#define SFX_HINT_NAMECHANGED 0x00000002
-#define SFX_HINT_TITLECHANGED 0x00000004
-#define SFX_HINT_DATACHANGED 0x00000008
-#define SFX_HINT_DOCCHANGED 0x00000010
-#define SFX_HINT_UPDATEDONE 0x00000020
-#define SFX_HINT_DEINITIALIZING 0x00000040
-#define SFX_HINT_MODECHANGED 0x00000080
- // unused, formerly SFX_HINT_CANCELLABLE
- // unused, formerly SFX_HINT_DATAAVAILABLE
- // unused, formerly SFX_HINT_SAVECOMPLETED
- // unused, formerly SFX_HINT_RELEASEREF
-#define SFX_HINT_COLORS_CHANGED 0x00001000
-#define SFX_HINT_ACCESSIBILITY_CHANGED 0x00004000
- // unused, formerly SFX_HINT_VIEWCREATED
-#define SFX_HINT_USER00 0x00010000
-#define SFX_HINT_USER01 0x00020000
-#define SFX_HINT_USER02 0x00040000
-#define SFX_HINT_USER03 0x00080000
-#define SFX_HINT_USER04 0x00100000
-#define SFX_HINT_USER05 0x00200000
+enum class SfxHintId {
+ NONE,
+ Dying,
+ NameChanged,
+ TitleChanged,
+ DataChanged,
+ DocChanged,
+ UpdateDone,
+ Deinitializing,
+ ModeChanged,
+ ColorsChanged,
+ AccessibilityChanged,
+
+// VCL text hints
+ TextParaInserted,
+ TextParaRemoved,
+ TextParaContentChanged,
+ TextHeightChanged,
+ TextFormatPara,
+ TextFormatted,
+ TextModified,
+ TextBlockNotificationStart,
+ TextBlockNotificationEnd,
+ TextInputStart,
+ TextInputEnd,
+ TextViewScrolled,
+ TextViewSelectionChanged,
+ TextViewCaretChanged,
+
+// BASIC hints
+ BasicDying,
+ BasicDataWanted,
+ BasicDataChanged,
+ BasicConverted,
+ BasicInfoWanted,
+ BasicObjectChanged,
+ BasicStart,
+ BasicStop,
+
+// SVX edit source
+ EditSourceParasMoved,
+ EditSourceSelectionChanged,
+
+// SC hints
+ ScDataChanged,
+ ScTableOpDirty,
+ ScCalcAll,
+ ScReference,
+ ScDrawLayerNew,
+ ScDbAreasChanged,
+ ScAreasChanged,
+ ScTablesChanged,
+ ScDrawChanged,
+ ScDocNameChanged,
+ ScAreaLinksChanged,
+ ScShowRangeFinder,
+ ScDocSaved,
+ ScForceSetTab,
+ ScNavigatorUpdateAll,
+ ScAnyDataChanged,
+ ScPrintOptions,
+ ScRefModeChanged,
+ ScKillEditView,
+ ScKillEditViewNoPaint,
+
+// SC accessibility hints
+ ScAccTableChanged,
+ ScAccCursorChanged,
+ ScAccVisAreaChanged,
+ ScAccEnterEditMode,
+ ScAccLeaveEditMode,
+ ScAccMakeDrawLayer,
+ ScAccWindowResized,
+
+
+// SFX stylesheet
+ StyleSheetCreated, // new
+ StyleSheetModified, // changed
+ StyleSheetChanged, // erased and re-created (replaced)
+ StyleSheetErased, // erased
+ StyleSheetInDestruction, // in the process of being destructed
+
+// STARMATH
+ MathFormatChanged,
+
+// SW
+ SwDrawViewsCreated,
+ SwSplitNodeOperation,
+};
class SVL_DLLPUBLIC SfxHint
{
private:
- sal_uInt32 mnId;
+ SfxHintId mnId;
public:
- SfxHint() : mnId(0) {}
- explicit SfxHint( sal_uInt32 nId ) : mnId(nId) {}
+ SfxHint() : mnId(SfxHintId::NONE) {}
+ explicit SfxHint( SfxHintId nId ) : mnId(nId) {}
virtual ~SfxHint();
- sal_uInt32 GetId() const { return mnId; }
+ SfxHintId GetId() const { return mnId; }
};
#endif
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 6e0b0b9..69bc70f 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -49,24 +49,24 @@ must broadcast this using <SfxStyleSheetBasePool::GetBroadcaster()> broadcasts.
The class <SfxStyleSheetHint> is used for this, it contains an Action-Id and a
pointer to the <SfxStyleSheetBase>. The actions are:
-#define SfxStyleSheetHintId::CREATED // style is created
-#define SfxStyleSheetHintId::MODIFIED // style is modified
-#define SfxStyleSheetHintId::CHANGED // style is replaced
-#define SfxStyleSheetHintId::ERASED // style is deleted
+#define SfxHintId::StyleSheetCreated // style is created
+#define SfxHintId::StyleSheetModified // style is modified
+#define SfxHintId::StyleSheetChanged // style is replaced
+#define SfxHintId::StyleSheetErased // style is deleted
The following methods already broadcast themself
-SfxSimpleHint(SFX_HINT_DYING) from:
+SfxSimpleHint(SfxHintId::Dying) from:
SfxStyleSheetBasePool::~SfxStyleSheetBasePool()
-SfxStyleSheetHint( SfxStyleSheetHintId::CREATED, *p ) from:
+SfxStyleSheetHint( SfxHintId::StyleSheetCreated, *p ) from:
SfxStyleSheetBasePool::Make( const String& rName,
SfxStyleFamily eFam, sal_uInt16 mask)
-SfxStyleSheetHint( SfxStyleSheetHintId::CHANGED, *pNew ) from:
+SfxStyleSheetHint( SfxHintId::StyleSheetChanged, *pNew ) from:
SfxStyleSheetBasePool::Add( SfxStyleSheetBase& rSheet )
-SfxStyleSheetHint( SfxStyleSheetHintId::ERASED, *p ) from:
+SfxStyleSheetHint( SfxHintId::StyleSheetErased, *p ) from:
SfxStyleSheetBasePool::Erase( SfxStyleSheetBase* p )
SfxStyleSheetBasePool::Clear()
*/
@@ -292,15 +292,6 @@ public:
};
-enum SfxStyleSheetHintId
-{
- CREATED = 1, // new
- MODIFIED = 2, // changed
- CHANGED = 3, // erased and re-created (replaced)
- ERASED = 4, // erased
- INDESTRUCTION = 5, // in the process of being destructed
-};
-
class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
{
public:
@@ -311,14 +302,10 @@ public:
class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint
{
SfxStyleSheetBase* pStyleSh;
- sal_uInt16 nHint;
-
public:
- SfxStyleSheetHint( sal_uInt16, SfxStyleSheetBase& );
+ SfxStyleSheetHint( SfxHintId, SfxStyleSheetBase& );
SfxStyleSheetBase* GetStyleSheet() const
{ return pStyleSh; }
- sal_uInt16 GetHint() const
- { return nHint; }
};
class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
@@ -326,7 +313,7 @@ class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
OUString aName;
public:
- SfxStyleSheetHintExtended( sal_uInt16, const OUString& rOld,
+ SfxStyleSheetHintExtended( SfxHintId, const OUString& rOld,
SfxStyleSheetBase& );
const OUString& GetOldName() const { return aName; }
};
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index 7fdee91..f156397 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -85,7 +85,7 @@ namespace accessibility
AccessibleTextHelper will call the SvxEditSource and their
forwarder to update it's state. Avoid being inconsistent in
the facts you tell in the events, e.g. when sending a
- TEXT_HINT_PARAINSERTED event, the
+ SfxHintId::TextParaInserted event, the
SvxEditSource::GetTextForwarder().GetParagraphCount() should
already include the newly inserted paragraph.
@@ -147,15 +147,15 @@ namespace accessibility
from the main office thread.
The EditSource set here is required to broadcast out the
- following hints: EDITSOURCE_HINT_PARASMOVED,
- EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED,
- TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED,
- TEXT_HINT_TEXTHEIGHTCHANGED,
- TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes
+ following hints: SfxHintId::EditSourceParasMoved,
+ SfxHintId::EditSourceSelectionChanged, SfxHintId::TextModified,
+ SfxHintId::TextParaInserted, SfxHintId::TextParaRemoved,
+ SfxHintId::TextHeightChanged,
+ SfxHintId::TextViewScrolled. Otherwise, not all state changes
will get noticed by the accessibility object. Further
more, when the corresponding core object or the model is
dying, either the edit source must be set to NULL or it
- has to broadcast a SFX_HINT_DYING hint.
+ has to broadcast a SfxHintId::Dying hint.
If the SvxEditSource's managed text can change between
edit/non-edit mode (i.e. there are times when
@@ -262,7 +262,7 @@ namespace accessibility
children. Call this method if your visibility state has
changed somehow, e.g. if the visible area has changed and
the AccessibleTextHelper isn't notified internally
- (e.g. via TEXT_HINT_VIEWSCROLLED). Normally, there should
+ (e.g. via SfxHintId::TextViewScrolled). Normally, there should
not be a need to call this method.
*/
void UpdateChildren();
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index abcd662..de0dabd 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -111,30 +111,14 @@ inline bool TextSelection::operator != ( const TextSelection& rSel ) const
return !( *this == rSel );
}
-#define TEXT_HINT_PARAINSERTED 1
-#define TEXT_HINT_PARAREMOVED 2
-#define TEXT_HINT_PARACONTENTCHANGED 3
-#define TEXT_HINT_TEXTHEIGHTCHANGED 4
-#define TEXT_HINT_FORMATPARA 5
-#define TEXT_HINT_TEXTFORMATTED 6
-#define TEXT_HINT_MODIFIED 7
-#define TEXT_HINT_BLOCKNOTIFICATION_START 8
-#define TEXT_HINT_BLOCKNOTIFICATION_END 9
-#define TEXT_HINT_INPUT_START 10
-#define TEXT_HINT_INPUT_END 11
-
-#define TEXT_HINT_VIEWSCROLLED 100
-#define TEXT_HINT_VIEWSELECTIONCHANGED 101
-#define TEXT_HINT_VIEWCARETCHANGED 102
-
class VCL_DLLPUBLIC TextHint : public SfxHint
{
private:
sal_uLong mnValue;
public:
- TextHint( sal_uInt32 nId );
- TextHint( sal_uInt32 nId, sal_uLong nValue );
+ TextHint( SfxHintId nId );
+ TextHint( SfxHintId nId, sal_uLong nValue );
sal_uLong GetValue() const { return mnValue; }
};
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 0b0fcf1..ecf834a 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -191,7 +191,7 @@ void OXUndoEnvironment::ModeChanged()
void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
- if (rHint.GetId() == SFX_HINT_MODECHANGED )
+ if (rHint.GetId() == SfxHintId::ModeChanged )
ModeChanged();
}
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index b119a1b..bbd66c5 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -51,7 +51,7 @@ void OColorListener::dispose()
void OColorListener::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint)
{
- if (rHint.GetId() == SFX_HINT_COLORS_CHANGED)
+ if (rHint.GetId() == SfxHintId::ColorsChanged)
{
m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor();
m_nTextBoundaries = m_aColorConfig.GetColorValue(::svtools::DOCBOUNDARIES).nColor;
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 0e1d0f3..5927632 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -253,7 +253,7 @@ void OStartMarker::setTitle(const OUString& _sTitle)
void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
{
OColorListener::Notify(rBc, rHint);
- if (rHint.GetId() == SFX_HINT_COLORS_CHANGED)
+ if (rHint.GetId() == SfxHintId::ColorsChanged)
{
setColor();
Invalidate(InvalidateFlags::Children);
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index 5a283bc..fc0fb7e 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SC_INC_BRDCST_HXX
#include "address.hxx"
-#include "simplehintids.hxx"
#include <svl/hint.hxx>
class SvtBroadcaster;
@@ -30,7 +29,7 @@ class ScHint : public SfxHint
ScAddress aAddress;
public:
- ScHint( sal_uInt32 n, const ScAddress& a );
+ ScHint( SfxHintId n, const ScAddress& a );
const ScAddress& GetAddress() const { return aAddress; }
ScAddress& GetAddress() { return aAddress; }
};
diff --git a/sc/inc/bulkdatahint.hxx b/sc/inc/bulkdatahint.hxx
index 0fc35fe..913019e 100644
--- a/sc/inc/bulkdatahint.hxx
+++ b/sc/inc/bulkdatahint.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_BULKDATAHINT_HXX
#define INCLUDED_SC_BULKDATAHINT_HXX
-#include <simplehintids.hxx>
+#include <svl/hint.hxx>
#include <memory>
class ScDocument;
@@ -28,7 +28,7 @@ class BulkDataHint : public SfxHint
BulkDataHint& operator= ( const BulkDataHint& ) = delete;
public:
- BulkDataHint( ScDocument& rDoc, sal_uInt32 nHintId );
+ BulkDataHint( ScDocument& rDoc, SfxHintId nHintId );
virtual ~BulkDataHint() override;
void setSpans( const ColumnSpanSet* pSpans );
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 5539f82..0568aa9 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -584,7 +584,7 @@ public:
void PrepareBroadcastersForDestruction();
void Broadcast( SCROW nRow );
- void BroadcastCells( const std::vector<SCROW>& rRows, sal_uInt32 nHint );
+ void BroadcastCells( const std::vector<SCROW>& rRows, SfxHintId nHint );
// cell notes
ScPostIt* GetCellNote( SCROW nRow );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 44092fd..3d5d8f7 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -36,7 +36,7 @@
#include "typedstrdata.hxx"
#include "calcmacros.hxx"
#include "calcconfig.hxx"
-#include <simplehintids.hxx>
+#include <svl/hint.hxx>
#include <tools/gen.hxx>
#include <svl/zforlist.hxx>
@@ -2041,7 +2041,7 @@ public:
*/
void Broadcast( const ScHint& rHint );
- void BroadcastCells( const ScRange& rRange, sal_uInt32 nHint, bool bBroadcastSingleBroadcasters = true );
+ void BroadcastCells( const ScRange& rRange, SfxHintId nHint, bool bBroadcastSingleBroadcasters = true );
void BroadcastRefMoved( const sc::RefMovedHint& rHint );
/// only area, no cell broadcast
@@ -2084,10 +2084,10 @@ public:
void ClearFormulaTree();
void AppendToFormulaTrack( ScFormulaCell* pCell );
void RemoveFromFormulaTrack( ScFormulaCell* pCell );
- void TrackFormulas( sal_uInt32 nHintId = SC_HINT_DATACHANGED );
+ void TrackFormulas( SfxHintId nHintId = SfxHintId::ScDataChanged );
void SetTrackFormulasPending() { mbTrackFormulasPending = true; }
bool IsTrackFormulasPending() const { return mbTrackFormulasPending; }
- void FinalTrackFormulas( sal_uInt32 nHintId );
+ void FinalTrackFormulas( SfxHintId nHintId );
bool IsFinalTrackFormulas() const { return mbFinalTrackFormulas; }
bool IsInFormulaTree( ScFormulaCell* pCell ) const;
bool IsInFormulaTrack( ScFormulaCell* pCell ) const;
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index a162774..e558c8e 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_SC_INC_REFHINT_HXX
#include "address.hxx"
-#include "simplehintids.hxx"
+#include <svl/hint.hxx>
namespace sc {
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index d5b87c4..ddf6012 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -203,23 +203,14 @@
#define FID_INPUTLINE_STATUS (SC_MESSAGE_START)
#define FID_INPUTLINE_ENTER (SC_MESSAGE_START + 1)
#define FID_REPAINT (SC_MESSAGE_START + 2)
-#define FID_DATACHANGED (SC_MESSAGE_START + 3)
-#define FID_REFMODECHANGED (SC_MESSAGE_START + 4)
-#define FID_KILLEDITVIEW (SC_MESSAGE_START + 5)
#define SID_SOLVE (SC_MESSAGE_START + 6)
#define FID_FILTER_OK (SC_MESSAGE_START + 8)
-#define SC_HINT_DRWLAYER_NEW (SC_MESSAGE_START + 9)
#define FID_INPUTLINE_MATRIX (SC_MESSAGE_START + 11)
#define SID_DLG_RETOK (SC_MESSAGE_START + 12)
-#define FID_ANYDATACHANGED (SC_MESSAGE_START + 13)
#define SID_STATUS_DOCPOS (SC_MESSAGE_START + 14)
#define SID_STATUS_PAGESTYLE (SC_MESSAGE_START + 15)
#define SID_STATUS_SELMODE (SC_MESSAGE_START + 16)
-#define FID_KILLEDITVIEW_NOPAINT (SC_MESSAGE_START + 17)
#define SID_DLG_MATRIX (SC_MESSAGE_START + 18)
-#define SC_HINT_DBAREAS_CHANGED (SC_MESSAGE_START + 19)
-#define SC_HINT_AREAS_CHANGED (SC_MESSAGE_START + 20)
-#define SC_HINT_TABLES_CHANGED (SC_MESSAGE_START + 21)
#define SID_STATUS_SELMODE_ERG (SC_MESSAGE_START + 22)
#define SID_STATUS_SELMODE_ERW (SC_MESSAGE_START + 23)
@@ -235,12 +226,6 @@
#define SID_STATUS_SUM (SC_MESSAGE_START + 30)
-#define SC_HINT_DRAW_CHANGED (SC_MESSAGE_START + 31)
-#define SC_HINT_DOCNAME_CHANGED (SC_MESSAGE_START + 32)
-#define SC_HINT_AREALINKS_CHANGED (SC_MESSAGE_START + 33)
-#define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34)
-#define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35)
-#define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36)
#define SID_ENTER_STRING (SC_MESSAGE_START + 37)
#define SID_ROWCOL_SELCOUNT (SC_MESSAGE_START + 38)
#define SID_AUTO_SUM (SC_MESSAGE_START + 39)
@@ -256,7 +241,6 @@
#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
#define SID_OPENDLG_CONDFRMT_MANAGER (SC_MESSAGE_START + 62)
#define SID_POPUP_CONDFRMT (SC_MESSAGE_START + 63)
-#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
#define SID_OPENDLG_COLORSCALE (SC_MESSAGE_START + 66)
#define SID_OPENDLG_DATABAR (SC_MESSAGE_START + 67)
#define SID_OPENDLG_ICONSET (SC_MESSAGE_START + 68)
diff --git a/sc/inc/simplehintids.hxx b/sc/inc/simplehintids.hxx
deleted file mode 100644
index 9794072..0000000
--- a/sc/inc/simplehintids.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_SC_INC_SIMPLEHINTIDS_HXX
-#define INCLUDED_SC_INC_SIMPLEHINTIDS_HXX
-
-#include <svl/hint.hxx>
-
-#define SC_HINT_DATACHANGED SFX_HINT_DATACHANGED
-#define SC_HINT_TABLEOPDIRTY SFX_HINT_USER00
-#define SC_HINT_CALCALL SFX_HINT_USER01
-#define SC_HINT_REFERENCE SFX_HINT_USER02
-#define SC_HINT_BULK_DATACHANGED SFX_HINT_USER03
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 64cf53c..3cef49a 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -260,7 +260,7 @@ ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea(
namespace {
-void broadcastRangeByCell( SvtBroadcaster& rBC, const ScRange& rRange, sal_uInt32 nHint )
+void broadcastRangeByCell( SvtBroadcaster& rBC, const ScRange& rRange, SfxHintId nHint )
{
ScHint aHint(nHint, ScAddress());
ScAddress& rPos = aHint.GetAddress();
@@ -281,7 +281,7 @@ void broadcastRangeByCell( SvtBroadcaster& rBC, const ScRange& rRange, sal_uInt3
}
-bool ScBroadcastAreaSlot::AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint )
+bool ScBroadcastAreaSlot::AreaBroadcast( const ScRange& rRange, SfxHintId nHint )
{
if (aBroadcastAreaTbl.empty())
return false;
@@ -828,7 +828,7 @@ void ScBroadcastAreaSlotMachine::EndListeningArea(
}
}
-bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint )
+bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScRange& rRange, SfxHintId nHint )
{
bool bBroadcasted = false;
SCTAB nEndTab = rRange.aEnd.Tab();
@@ -1095,7 +1095,7 @@ void ScBroadcastAreaSlotMachine::EnterBulkBroadcast()
++nInBulkBroadcast;
}
-void ScBroadcastAreaSlotMachine::LeaveBulkBroadcast( sal_uInt32 nHintId )
+void ScBroadcastAreaSlotMachine::LeaveBulkBroadcast( SfxHintId nHintId )
{
if (nInBulkBroadcast > 0)
{
@@ -1131,7 +1131,7 @@ void ScBroadcastAreaSlotMachine::InsertBulkGroupArea( ScBroadcastArea* pArea, co
pSet->set(rRange, true);
}
-bool ScBroadcastAreaSlotMachine::BulkBroadcastGroupAreas( sal_uInt32 nHintId )
+bool ScBroadcastAreaSlotMachine::BulkBroadcastGroupAreas( SfxHintId nHintId )
{
if (m_BulkGroupAreas.empty())
return false;
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 5f87b32..2690be1 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -135,7 +135,7 @@ void ScFormulaListener::Notify(const SfxHint& rHint)
{
mbDirty = true;
- if (rHint.GetId() == SFX_HINT_DYING)
+ if (rHint.GetId() == SfxHintId::Dying)
return;
if (maCallbackFunction)
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index dd2d2e0..d143e48 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1963,7 +1963,7 @@ void ScColumn::MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol)
rCol.CellStorageModified();
// Broadcast on moved ranges. Area-broadcast only.
- ScHint aHint(SC_HINT_DATACHANGED, ScAddress(nCol, 0, nTab));
+ ScHint aHint(SfxHintId::ScDataChanged, ScAddress(nCol, 0, nTab));
ScAddress& rPos = aHint.GetAddress();
sc::SingleColumnSpanSet::SpansType::const_iterator itRange = aRanges.begin(), itRangeEnd = aRanges.end();
for (; itRange != itRangeEnd; ++itRange)
@@ -2749,7 +2749,7 @@ public:
{
std::vector<SCROW> aRows;
maValueRanges.getRows(aRows);
- mrColumn.BroadcastCells(aRows, SC_HINT_DATACHANGED);
+ mrColumn.BroadcastCells(aRows, SfxHintId::ScDataChanged);
}
void fillBroadcastSpans( sc::ColumnSpanSet& rBroadcastSpans ) const
@@ -2793,7 +2793,7 @@ public:
{
std::vector<SCROW> aRows;
maValueRanges.getRows(aRows);
- mrColumn.BroadcastCells(aRows, SC_HINT_TABLEOPDIRTY);
+ mrColumn.BroadcastCells(aRows, SfxHintId::ScTableOpDirty);
}
};
@@ -3222,7 +3222,7 @@ void ScColumn::SetDirty( SCROW nRow1, SCROW nRow2, BroadcastMode eMode )
SetDirtyOnRangeHandler aHdl(*this);
sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aHdl);
// Broadcast all broadcasters in range.
- ScHint aHint( SC_HINT_DATACHANGED, ScAddress( nCol, nRow1, nTab));
+ ScHint aHint( SfxHintId::ScDataChanged, ScAddress( nCol, nRow1, nTab));
if (BroadcastBroadcasters( nRow1, nRow2, aHint))
{
// SetDirtyOnRangeHandler implicitly tracks notified
@@ -3285,7 +3285,7 @@ void ScColumn::BroadcastRecalcOnRefMove()
sc::AutoCalcSwitch aSwitch(*pDocument, false);
RecalcOnRefMoveCollector aFunc;
sc::ProcessFormula(maCells, aFunc);
- BroadcastCells(aFunc.getDirtyRows(), SC_HINT_DATACHANGED);
+ BroadcastCells(aFunc.getDirtyRows(), SfxHintId::ScDataChanged);
}
namespace {
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 3af350d..f736aa0 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -71,11 +71,11 @@ using namespace formula;
void ScColumn::Broadcast( SCROW nRow )
{
- ScHint aHint(SC_HINT_DATACHANGED, ScAddress(nCol, nRow, nTab));
+ ScHint aHint(SfxHintId::ScDataChanged, ScAddress(nCol, nRow, nTab));
pDocument->Broadcast(aHint);
}
-void ScColumn::BroadcastCells( const std::vector<SCROW>& rRows, sal_uInt32 nHint )
+void ScColumn::BroadcastCells( const std::vector<SCROW>& rRows, SfxHintId nHint )
{
if (rRows.empty())
return;
@@ -707,7 +707,7 @@ void ScColumn::DeleteArea(
// cells that were already empty before the deletion.
std::vector<SCROW> aRows;
aDeletedRows.getRows(aRows);
- BroadcastCells(aRows, SC_HINT_DATACHANGED);
+ BroadcastCells(aRows, SfxHintId::ScDataChanged);
}
}
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index e3cfb3d..ddf18d6 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -277,7 +277,7 @@ void ScColumn::SetValues( SCROW nRow, const std::vector<double>& rVals )
for (SCROW i = nRow; i <= nLastRow; ++i)
aRows.push_back(i);
- BroadcastCells(aRows, SC_HINT_DATACHANGED);
+ BroadcastCells(aRows, SfxHintId::ScDataChanged);
}
void ScColumn::TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues& rDest )
@@ -302,7 +302,7 @@ void ScColumn::TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues& rD
for (SCROW i = nRow; i <= nLastRow; ++i)
aRows.push_back(i);
- BroadcastCells(aRows, SC_HINT_DATACHANGED);
+ BroadcastCells(aRows, SfxHintId::ScDataChanged);
}
void ScColumn::CopyCellValuesFrom( SCROW nRow, const sc::CellValues& rSrc )
@@ -327,7 +327,7 @@ void ScColumn::CopyCellValuesFrom( SCROW nRow, const sc::CellValues& rSrc )
for (SCROW i = nRow; i <= nLastRow; ++i)
aRows.push_back(i);
- BroadcastCells(aRows, SC_HINT_DATACHANGED);
+ BroadcastCells(aRows, SfxHintId::ScDataChanged);
}
namespace {
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 05f2e56..23569de 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -330,7 +330,7 @@ IMPL_LINK_NOARG(ScDocument, TrackTimeHdl, Idle *, void)
else if (pShell) // execute
{
TrackFormulas();
- pShell->Broadcast( SfxHint( FID_DATACHANGED ) );
+ pShell->Broadcast( SfxHint( SfxHintId::ScDataChanged ) );
// modified...
@@ -386,7 +386,7 @@ ScDocument::~ScDocument()
delete pBASM; // BroadcastAreaSlotMachine
pBASM = nullptr;
- delete pUnoBroadcaster; // broadcasted nochmal SFX_HINT_DYING
+ delete pUnoBroadcaster; // broadcasted nochmal SfxHintId::Dying
pUnoBroadcaster = nullptr;
delete pUnoRefUndoList;
@@ -1009,7 +1009,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
sc::CopyToDocContext aCxt(*this);
nDestPos = std::min(nDestPos, (SCTAB)(GetTableCount() - 1));
{ // scope for bulk broadcast
- ScBulkBroadcast aBulkBroadcast( pBASM, SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( pBASM, SfxHintId::ScDataChanged);
if (!bResultsOnly)
{
const bool bGlobalNamesToLocal = false;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 7a5376e..3e2d1ac 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -936,7 +936,7 @@ void ScDocument::BroadcastUno( const SfxHint &rHint )
// because they can add or remove objects from pUnoBroadcaster.
if ( pUnoListenerCalls &&
- rHint.GetId() == SFX_HINT_DATACHANGED &&
+ rHint.GetId() == SfxHintId::DataChanged &&
!bInUnoListenerCall )
{
// Listener calls may lead to BroadcastUno calls again. The listener calls
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 437cf4c..9ea2a2e 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -82,7 +82,7 @@ void ScDocument::Broadcast( const ScHint& rHint )
}
}
-void ScDocument::BroadcastCells( const ScRange& rRange, sal_uInt32 nHint, bool bBroadcastSingleBroadcasters )
+void ScDocument::BroadcastCells( const ScRange& rRange, SfxHintId nHint, bool bBroadcastSingleBroadcasters )
{
PrepareFormulaCalc();
@@ -126,7 +126,7 @@ void ScDocument::BroadcastCells( const ScRange& rRange, sal_uInt32 nHint, bool b
pTab->SetStreamValid(false);
}
- BroadcastUno(SfxHint(SC_HINT_DATACHANGED));
+ BroadcastUno(SfxHint(SfxHintId::ScDataChanged));
}
namespace {
@@ -535,7 +535,7 @@ bool ScDocument::IsInFormulaTrack( ScFormulaCell* pCell ) const
return pCell->GetPreviousTrack() || pFormulaTrack == pCell;
}
-void ScDocument::FinalTrackFormulas( sal_uInt32 nHintId )
+void ScDocument::FinalTrackFormulas( SfxHintId nHintId )
{
mbTrackFormulasPending = false;
mbFinalTrackFormulas = true;
@@ -556,9 +556,9 @@ void ScDocument::FinalTrackFormulas( sal_uInt32 nHintId )
The next is broadcasted again, and so on.
View initiates Interpret.
*/
-void ScDocument::TrackFormulas( sal_uInt32 nHintId )
+void ScDocument::TrackFormulas( SfxHintId nHintId )
{
- if (pBASM->IsInBulkBroadcast() && !IsFinalTrackFormulas() && nHintId == SC_HINT_DATACHANGED)
+ if (pBASM->IsInBulkBroadcast() && !IsFinalTrackFormulas() && nHintId == SfxHintId::ScDataChanged)
{
SetTrackFormulasPending();
return;
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index e2a339c..55ca6a5 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -849,7 +849,7 @@ void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin)
if (bAny)
{
TrackFormulas();
- pShell->Broadcast( SfxHint(FID_DATACHANGED) );
+ pShell->Broadcast( SfxHint(SfxHintId::ScDataChanged) );
// #i101960# set document modified, as in TrackTimeHdl for DDE links
if (!pShell->IsModified())
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 17ed40c..429eff0 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1241,7 +1241,7 @@ struct BroadcastRecalcOnRefMoveHandler : std::unary_function<ScTable*, void>
explicit BroadcastRecalcOnRefMoveHandler( ScDocument* pDoc ) :
aSwitch( *pDoc, false),
- aBulk( pDoc->GetBASM(), SC_HINT_DATACHANGED)
+ aBulk( pDoc->GetBASM(), SfxHintId::ScDataChanged)
{
}
@@ -2734,7 +2734,7 @@ public:
assert(mpCol);
ScRange aRange(mpCol->GetCol(), nRow1, mpCol->GetTab());
aRange.aEnd.SetRow(nRow2);
- mrDoc.BroadcastCells(aRange, SC_HINT_DATACHANGED);
+ mrDoc.BroadcastCells(aRange, SfxHintId::ScDataChanged);
};
};
@@ -2943,7 +2943,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
StartListeningFromClip( nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, nInsFlag );
{
- ScBulkBroadcast aBulkBroadcast( GetBASM(), SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( GetBASM(), SfxHintId::ScDataChanged);
// Set all formula cells dirty, and collect non-empty non-formula cell
// positions so that we can broadcast on them below.
@@ -3031,7 +3031,7 @@ void ScDocument::CopyMultiRangeFromClip(
aDestRange.aEnd.Col(), aDestRange.aEnd.Row(), rMark, nInsFlag );
{
- ScBulkBroadcast aBulkBroadcast( GetBASM(), SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( GetBASM(), SfxHintId::ScDataChanged);
// Set formula cells dirty and collect non-formula cells.
SetDirtyFromClip(
@@ -3325,7 +3325,7 @@ bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString&
// Listeners may just have been setup that are affected by the current
// position thus were not notified by a ScColumn::BroadcastNewCell()
// during ScTable::SetString(), so do it here.
- Broadcast( ScHint( SC_HINT_DATACHANGED, aPos));
+ Broadcast( ScHint( SfxHintId::ScDataChanged, aPos));
}
else
{
@@ -3436,7 +3436,7 @@ void ScDocument::SetValue( const ScAddress& rPos, double fVal )
// Listeners may just have been setup that are affected by the current
// position thus were not notified by a ScColumn::BroadcastNewCell()
// during ScTable::SetValue(), so do it here.
- Broadcast( ScHint( SC_HINT_DATACHANGED, rPos));
+ Broadcast( ScHint( SfxHintId::ScDataChanged, rPos));
}
else
{
@@ -3774,7 +3774,7 @@ void ScDocument::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt )
bool bOldAutoCalc = GetAutoCalc();
bAutoCalc = false; // no mulitple calculations
{ // scope for bulk broadcast
- ScBulkBroadcast aBulkBroadcast( GetBASM(), SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( GetBASM(), SfxHintId::ScDataChanged);
TableContainer::iterator it = maTabs.begin();
for (;it != maTabs.end(); ++it)
if (*it)
@@ -3795,7 +3795,7 @@ void ScDocument::SetDirty( const ScRange& rRange, bool bIncludeEmptyCells )
bool bOldAutoCalc = GetAutoCalc();
bAutoCalc = false; // no mulitple calculations
{ // scope for bulk broadcast
- ScBulkBroadcast aBulkBroadcast( GetBASM(), SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( GetBASM(), SfxHintId::ScDataChanged);
SCTAB nTab2 = rRange.aEnd.Tab();
for (SCTAB i=rRange.aStart.Tab(); i<=nTab2 && i < static_cast<SCTAB>(maTabs.size()); i++)
if (maTabs[i]) maTabs[i]->SetDirty( rRange,
@@ -3806,7 +3806,7 @@ void ScDocument::SetDirty( const ScRange& rRange, bool bIncludeEmptyCells )
* desired side effect, or should we come up with a method that
* doesn't? */
if (bIncludeEmptyCells)
- BroadcastCells( rRange, SC_HINT_DATACHANGED, false);
+ BroadcastCells( rRange, SfxHintId::ScDataChanged, false);
}
SetAutoCalc( bOldAutoCalc );
}
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index f59ad09..56646fb 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2204,8 +2204,8 @@ void ScFormulaCell::Notify( const SfxHint& rHint )
if (pDocument->IsInDtorClear())
return;
- const sal_uInt32 nHint = rHint.GetId();
- if (nHint == SC_HINT_REFERENCE)
+ const SfxHintId nHint = rHint.GetId();
+ if (nHint == SfxHintId::ScReference)
{
const sc::RefHint& rRefHint = static_cast<const sc::RefHint&>(rHint);
@@ -2272,10 +2272,10 @@ void ScFormulaCell::Notify( const SfxHint& rHint )
if ( pDocument->GetHardRecalcState() == ScDocument::HARDRECALCSTATE_OFF )
{
- if (nHint & (SC_HINT_DATACHANGED | SC_HINT_TABLEOPDIRTY))
+ if (nHint == SfxHintId::ScDataChanged || nHint == SfxHintId::ScTableOpDirty)
{
bool bForceTrack = false;
- if ( nHint & SC_HINT_TABLEOPDIRTY )
+ if ( nHint == SfxHintId::ScTableOpDirty )
{
bForceTrack = !bTableOpDirty;
if ( !bTableOpDirty )
@@ -2395,7 +2395,7 @@ void ScFormulaCell::SetTableOpDirty()
bTableOpDirty = true;
}
pDocument->AppendToFormulaTrack( this );
- pDocument->TrackFormulas( SC_HINT_TABLEOPDIRTY );
+ pDocument->TrackFormulas( SfxHintId::ScTableOpDirty );
}
}
}
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index fedd318..a9ee535 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -269,7 +269,7 @@ bool ScStyleSheet::IsUsed() const
void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- if ( rHint.GetId() == SFX_HINT_DYING )
+ if ( rHint.GetId() == SfxHintId::Dying )
GetItemSet().SetParent( nullptr );
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index a046bc5..defa169 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -242,7 +242,7 @@ void ScTable::DeleteRow(
}
{ // scope for bulk broadcast
- ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM(), SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM(), SfxHintId::ScDataChanged);
for (SCCOL j=nStartCol; j<=nEndCol; j++)
aCol[j].DeleteRow(nStartRow, nSize, pGroupPos);
}
@@ -430,7 +430,7 @@ void ScTable::DeleteArea(
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
{
{ // scope for bulk broadcast
- ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM(), SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM(), SfxHintId::ScDataChanged);
for (SCCOL i = nCol1; i <= nCol2; i++)
aCol[i].DeleteArea(nRow1, nRow2, nDelFlag, bBroadcast, pBroadcastSpans);
}
@@ -457,7 +457,7 @@ void ScTable::DeleteArea(
void ScTable::DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast )
{
{ // scope for bulk broadcast
- ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM(), SC_HINT_DATACHANGED);
+ ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM(), SfxHintId::ScDataChanged);
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].DeleteSelection(nDelFlag, rMark, bBroadcast);
}
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 29a9934..fd91de8 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -211,7 +211,7 @@ public:
void EndListeningArea(
const ScRange& rRange, bool bGroupListening, SvtListener* pListener, ScBroadcastArea*& rpArea );
- bool AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint );
+ bool AreaBroadcast( const ScRange& rRange, SfxHintId nHint );
bool AreaBroadcast( const ScHint& rHint );
void DelBroadcastAreasInRange( const ScRange& rRange );
void UpdateRemove( UpdateRefMode eUpdateRefMode,
@@ -310,7 +310,7 @@ public:
void EndListeningArea(
const ScRange& rRange, bool bGroupListening, SvtListener* pListener );
- bool AreaBroadcast( const ScRange& rRange, sal_uInt32 nHint );
+ bool AreaBroadcast( const ScRange& rRange, SfxHintId nHint );
bool AreaBroadcast( const ScHint& rHint ) const;
// return: at least one broadcast occurred
void DelBroadcastAreasInRange( const ScRange& rRange );
@@ -318,12 +318,12 @@ public:
const ScRange& rRange,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
void EnterBulkBroadcast();
- void LeaveBulkBroadcast( sal_uInt32 nHintId );
+ void LeaveBulkBroadcast( SfxHintId nHintId );
bool InsertBulkArea( const ScBroadcastArea* p );
void InsertBulkGroupArea( ScBroadcastArea* pArea, const ScRange& rRange );
void RemoveBulkGroupArea( ScBroadcastArea* pArea );
- bool BulkBroadcastGroupAreas( sal_uInt32 nHintId );
+ bool BulkBroadcastGroupAreas( SfxHintId nHintId );
/// @return: how many removed
size_t RemoveBulkArea( const ScBroadcastArea* p );
@@ -350,9 +350,9 @@ public:
class ScBulkBroadcast
{
ScBroadcastAreaSlotMachine* pBASM;
- sal_uInt32 mnHintId;
+ SfxHintId mnHintId;
public:
- explicit ScBulkBroadcast( ScBroadcastAreaSlotMachine* p, sal_uInt32 nHintId ) :
+ explicit ScBulkBroadcast( ScBroadcastAreaSlotMachine* p, SfxHintId nHintId ) :
pBASM(p),
mnHintId(nHintId)
{
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index 73e73a6..95ebc60 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -114,13 +114,13 @@ void SAL_CALL ScAddInListener::modified( const css::sheet::ResultEvent& aEvent )
// notify document of changes
- Broadcast( ScHint(SC_HINT_DATACHANGED, ScAddress()) );
+ Broadcast( ScHint(SfxHintId::ScDataChanged, ScAddress()) );
for ( ScAddInDocs::iterator it = pDocs->begin(); it != pDocs->end(); ++it )
{
ScDocument* pDoc = *it;
pDoc->TrackFormulas();
- pDoc->GetDocumentShell()->Broadcast( SfxHint( FID_DATACHANGED ) );
+ pDoc->GetDocumentShell()->Broadcast( SfxHint( SfxHintId::ScDataChanged ) );
}
}
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index 83548bd..7d2150f 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -106,13 +106,13 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData )
return;
}
p->bValid = true;
- p->Broadcast( ScHint(SC_HINT_DATACHANGED, ScAddress()) );
+ p->Broadcast( ScHint(SfxHintId::ScDataChanged, ScAddress()) );
for ( ScAddInDocs::iterator it = p->pDocs->begin(); it != p->pDocs->end(); ++it )
{
ScDocument* pDoc = *it;
pDoc->TrackFormulas();
- pDoc->GetDocumentShell()->Broadcast( SfxHint( FID_DATACHANGED ) );
+ pDoc->GetDocumentShell()->Broadcast( SfxHint( SfxHintId::ScDataChanged ) );
}
}
diff --git a/sc/source/core/tool/brdcst.cxx b/sc/source/core/tool/brdcst.cxx
index ce740c0..963a4fb 100644
--- a/sc/source/core/tool/brdcst.cxx
+++ b/sc/source/core/tool/brdcst.cxx
@@ -19,7 +19,7 @@
#include "brdcst.hxx"
-ScHint::ScHint( sal_uInt32 n, const ScAddress& a ) :
+ScHint::ScHint( SfxHintId n, const ScAddress& a ) :
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list