diff options
28 files changed, 72 insertions, 115 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 849b9d900f51..84d589e90bf3 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -525,7 +525,7 @@ void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) if (SbxHint const* pSbxHint = dynamic_cast<SbxHint const*>(&rHint)) { - sal_uLong nHintId = pSbxHint->GetId(); + const sal_uInt32 nHintId = pSbxHint->GetId(); if ( ( nHintId == SBX_HINT_BASICSTART ) || ( nHintId == SBX_HINT_BASICSTOP ) ) { diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index a59da1ee26e6..745f4b30af7f 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -2118,7 +2118,7 @@ void BasicCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint ) const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p ) { - sal_uIntPtr nId = p->GetId(); + const sal_uInt32 nId = p->GetId(); bool bRead = nId == SBX_HINT_DATAWANTED; bool bWrite = nId == SBX_HINT_DATACHANGED; bool bRequestInfo = nId == SBX_HINT_INFOWANTED; diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index db0275c37d55..94ae86a294f0 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -820,10 +820,10 @@ void SbiStdObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar_ = pVar->GetParameters(); - sal_uLong t = pHint->GetId(); const sal_uInt16 nCallId = static_cast<sal_uInt16>(pVar->GetUserData()); if( nCallId ) { + const sal_uInt32 t = pHint->GetId(); if( t == SBX_HINT_INFOWANTED ) pVar->SetInfo( GetInfo( static_cast<short>(pVar->GetUserData()) ) ); else diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 9a91d354a436..83df80bd6869 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -117,7 +117,7 @@ void SbxCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint ) const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p ) { - sal_uLong nId = p->GetId(); + const sal_uInt32 nId = p->GetId(); bool bRead = ( nId == SBX_HINT_DATAWANTED ); bool bWrite = ( nId == SBX_HINT_DATACHANGED ); SbxVariable* pVar = p->GetVar(); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 3704d288db93..6d0154aaae6a 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -137,7 +137,7 @@ void SbxObject::Notify( SfxBroadcaster&, const SfxHint& rHint ) const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p ) { - sal_uLong nId = p->GetId(); + const sal_uInt32 nId = p->GetId(); bool bRead = ( nId == SBX_HINT_DATAWANTED ); bool bWrite = ( nId == SBX_HINT_DATACHANGED ); SbxVariable* pVar = p->GetVar(); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index c0420c43e940..ec47151e26f4 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -177,7 +177,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( pTextHint ) { bool bLastVal = EndReached(); - sal_uLong nId = pTextHint->GetId(); + const sal_uInt32 nId = pTextHint->GetId(); if ( nId == TEXT_HINT_PARAINSERTED ) { diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 51d947e2a8f3..027c3ce1d844 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -144,7 +144,7 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { SfxStyleSheet* pStyle = nullptr; - sal_uLong nId = 0; + sal_uInt32 nId = 0; const SfxStyleSheetHint* pStyleSheetHint = dynamic_cast<const SfxStyleSheetHint*>(&rHint); if ( pStyleSheetHint ) diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 1c6d358b5961..fbb3d90f03a2 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -2167,7 +2167,7 @@ void ScFormulaCell::Notify( const SfxHint& rHint ) if (!pSimpleHint) return; - sal_uLong nHint = pSimpleHint->GetId(); + const sal_uInt32 nHint = pSimpleHint->GetId(); if (nHint == SC_HINT_REFERENCE) { const sc::RefHint& rRefHint = static_cast<const sc::RefHint&>(rHint); diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index bb1ae5669c23..59fbb9b9b261 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -888,8 +888,7 @@ void ScDBData::Notify( const SfxHint& rHint ) if (!pScHint) return; - sal_uLong nHint = pScHint->GetId(); - if (nHint & SC_HINT_DATACHANGED) + if (pScHint->GetId() & SC_HINT_DATACHANGED) { mbTableColumnNamesDirty = true; if (!mpContainer) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 54f456bd3f66..34c1ca250dd6 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -122,7 +122,7 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint& const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); if (pSimpleHint) { - sal_uLong nId = pSimpleHint->GetId(); + const sal_uInt32 nId {pSimpleHint->GetId()}; if (nId == SC_HINT_ACC_VISAREACHANGED) { if (mpTextHelper) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index b1af3790bc83..4e083a6b9106 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -89,14 +89,14 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); if (pSimpleHint) { - sal_uLong nId = pSimpleHint->GetId(); + const sal_uInt32 nId {pSimpleHint->GetId()}; if ( nId == SFX_HINT_DATACHANGED ) { // column / row layout may change with any document change, // so it must be invalidated DELETEZ( mpTableInfo ); } - else if (pSimpleHint->GetId() == SC_HINT_ACC_VISAREACHANGED) + else if (nId == SC_HINT_ACC_VISAREACHANGED) { AccessibleEventObject aEvent; aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED; diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 13f23a3f6da6..4edcec97bbed 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -723,17 +723,13 @@ ScAccessibleCellTextData::~ScAccessibleCellTextData() void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if ( nId == SFX_HINT_DYING ) - { - mpViewShell = nullptr; // invalid now - if (mpViewForwarder) - mpViewForwarder->SetInvalid(); - if (mpEditViewForwarder) - mpEditViewForwarder->SetInvalid(); - } + mpViewShell = nullptr; // invalid now + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); + if (mpEditViewForwarder) + mpEditViewForwarder->SetInvalid(); } ScAccessibleCellBaseTextData::Notify(rBC, rHint); } @@ -979,20 +975,16 @@ ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData() void ScAccessibleEditObjectTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if ( nId == SFX_HINT_DYING ) - { - mpWindow = nullptr; - mpEditView = nullptr; - mpEditEngine = nullptr; - DELETEZ(mpForwarder); - if (mpViewForwarder) - mpViewForwarder->SetInvalid(); - if (mpEditViewForwarder) - mpEditViewForwarder->SetInvalid(); - } + mpWindow = nullptr; + mpEditView = nullptr; + mpEditEngine = nullptr; + DELETEZ(mpForwarder); + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); + if (mpEditViewForwarder) + mpEditViewForwarder->SetInvalid(); } ScAccessibleTextData::Notify(rBC, rHint); } @@ -1240,15 +1232,11 @@ ScAccessiblePreviewCellTextData::~ScAccessiblePreviewCellTextData() void ScAccessiblePreviewCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if ( nId == SFX_HINT_DYING ) - { - mpViewShell = nullptr; // invalid now - if (mpViewForwarder) - mpViewForwarder->SetInvalid(); - } + mpViewShell = nullptr; // invalid now + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } ScAccessibleCellBaseTextData::Notify(rBC, rHint); } @@ -1318,15 +1306,11 @@ ScAccessiblePreviewHeaderCellTextData::~ScAccessiblePreviewHeaderCellTextData() void ScAccessiblePreviewHeaderCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if ( nId == SFX_HINT_DYING ) - { - mpViewShell = nullptr; // invalid now - if (mpViewForwarder) - mpViewForwarder->SetInvalid(); - } + mpViewShell = nullptr; // invalid now + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } ScAccessibleCellBaseTextData::Notify(rBC, rHint); } @@ -1441,16 +1425,12 @@ ScAccessibleTextData* ScAccessibleHeaderTextData::Clone() const void ScAccessibleHeaderTextData::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if ( nId == SFX_HINT_DYING ) - { - mpViewShell = nullptr;// invalid now - mpDocSh = nullptr; - if (mpViewForwarder) - mpViewForwarder->SetInvalid(); - } + mpViewShell = nullptr;// invalid now + mpDocSh = nullptr; + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } } @@ -1556,16 +1536,12 @@ ScAccessibleTextData* ScAccessibleNoteTextData::Clone() const void ScAccessibleNoteTextData::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if ( nId == SFX_HINT_DYING ) - { - mpViewShell = nullptr;// invalid now - mpDocSh = nullptr; - if (mpViewForwarder) - mpViewForwarder->SetInvalid(); - } + mpViewShell = nullptr;// invalid now + mpDocSh = nullptr; + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } } @@ -1697,16 +1673,12 @@ ScAccessibleCsvTextData::~ScAccessibleCsvTextData() void ScAccessibleCsvTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if( nId == SFX_HINT_DYING ) - { - mpWindow = nullptr; - mpEditEngine = nullptr; - if (mpViewForwarder.get()) - mpViewForwarder->SetInvalid(); - } + mpWindow = nullptr; + mpEditEngine = nullptr; + if (mpViewForwarder.get()) + mpViewForwarder->SetInvalid(); } ScAccessibleTextData::Notify( rBC, rHint ); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 026389e3b864..d30805a2e14a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2045,7 +2045,7 @@ void ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& rHint ) const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); if ( pSimpleHint ) { - sal_uLong nHintId = pSimpleHint->GetId(); + const sal_uInt32 nHintId = pSimpleHint->GetId(); if ( nHintId == SC_HINT_AREAS_CHANGED || nHintId == SC_HINT_NAVIGATOR_UPDATEALL) FillRangeNames(); } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index eaafb66c388b..ebdd2fe2dfe7 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -318,14 +318,10 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DEINITIALIZING ) { - sal_uLong nHintId = pSimpleHint->GetId(); - if ( nHintId == SFX_HINT_DEINITIALIZING ) - { - // ConfigItems must be removed before ConfigManager - DeleteCfg(); - } + // ConfigItems must be removed before ConfigManager + DeleteCfg(); } } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 43f87563231b..87f2d6afd1d7 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -620,8 +620,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) // Without parameter { - sal_uLong nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId(); - switch ( nSlot ) + switch ( static_cast<const SfxSimpleHint&>(rHint).GetId() ) { case SFX_HINT_TITLECHANGED: aDocument.SetName( SfxShell::GetName() ); diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 6cb3fa982890..2c215dcf2dd0 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -239,8 +239,7 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } else if (const SfxSimpleHint *pSplHint = dynamic_cast<const SfxSimpleHint*>(&rHint)) { - sal_uLong nId = pSplHint->GetId(); - if (nId == SFX_HINT_DYING) + if (pSplHint->GetId() == SFX_HINT_DYING) { // If the range is being deleted, listening must be restarted // after the deletion is complete (done in GetData) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 2c1f1608cd7f..bc9e495ec173 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -823,7 +823,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint ); if ( pSimpleHint ) { - sal_uLong nHintId = pSimpleHint->GetId(); + const sal_uInt32 nHintId = pSimpleHint->GetId(); if ( nHintId == SC_HINT_DOCNAME_CHANGED ) { diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 776a918b40da..df1de74049fb 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1598,7 +1598,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) { - sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); + const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); if ( nId == SFX_HINT_DYING ) { ForgetCurrentAttrs(); @@ -9408,7 +9408,7 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) { - sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); + const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); if ( nId == SFX_HINT_DYING ) { pDocShell = nullptr; // ungueltig geworden @@ -9471,8 +9471,7 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) { - sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); - if ( nId == SFX_HINT_DYING ) + if ( static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DYING ) pDocShell = nullptr; // ungueltig geworden } } @@ -9729,8 +9728,7 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi } else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) { - sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); - if ( nId == SFX_HINT_DYING ) + if ( static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DYING ) pDocShell = nullptr; // ungueltig geworden } } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 20932b4043e0..673055984fed 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2806,7 +2806,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); if ( pSimpleHint ) { - sal_uLong nId = pSimpleHint->GetId(); + const sal_uInt32 nId = pSimpleHint->GetId(); if ( nId ==SFX_HINT_DYING ) { m_pDocument = nullptr; diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index ab7486db7d02..70921f106245 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -991,13 +991,9 @@ ScFilterDescriptorBase::~ScFilterDescriptorBase() void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) { - sal_uLong nId = pSimpleHint->GetId(); - if ( nId == SFX_HINT_DYING ) - { - pDocSh = nullptr; // invalid - } + pDocSh = nullptr; // invalid } } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 7a7b0644ef5e..2bdab211823f 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1063,7 +1063,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); if ( pSimpleHint ) { - sal_uLong nId = pSimpleHint->GetId(); + const sal_uInt32 nId = pSimpleHint->GetId(); if ( nId == SFX_HINT_DYING ) { pDocShell = nullptr; // has become invalid diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 219d74b7b559..d52b7730d522 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -202,7 +202,7 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) { - sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); + const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); if ( nId == SFX_HINT_DYING ) { pDocShell = nullptr; // ungueltig geworden diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 1ea1215b1859..0578c1fb5242 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -1036,7 +1036,7 @@ void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) ) { - sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); + const sal_uInt32 nId = static_cast<const SfxSimpleHint&>(rHint).GetId(); if ( nId == SFX_HINT_DYING ) { pDocShell = nullptr; // invalid now diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 10edc68cbc07..0b8af5dd7ad1 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -32,8 +32,7 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if (dynamic_cast<const SfxSimpleHint*>(&rHint)) { - sal_uLong nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId(); - switch ( nSlot ) + switch ( static_cast<const SfxSimpleHint&>(rHint).GetId() ) { case FID_DATACHANGED: case SID_SCPRINTOPTIONS: diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 9ccfb503b872..674dc6544e48 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -44,7 +44,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if (dynamic_cast<const SfxSimpleHint*>(&rHint)) // ohne Parameter { - sal_uLong nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId(); + const sal_uInt32 nSlot = static_cast<const SfxSimpleHint&>(rHint).GetId(); switch ( nSlot ) { case FID_DATACHANGED: diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index aafe9c7ddd5f..2b7c1dda7894 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1540,7 +1540,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint // possible that a new one is registered after the timer is up - // works bad in UpdateStyles_Impl ()! - sal_uIntPtr nId = pSfxSimpleHint ? pSfxSimpleHint->GetId() : 0; + const sal_uInt32 nId = pSfxSimpleHint ? pSfxSimpleHint->GetId() : 0; if(!bDontUpdate && nId != SFX_HINT_DYING && (dynamic_cast<const SfxStyleSheetPoolHint*>(&rHint) || diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 553ec70bef34..b20487920a1f 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1564,7 +1564,7 @@ line (CL). The number of object margins per object varies between 0 and 3: void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint); - sal_uIntPtr nId=pSimple==nullptr ? 0 : pSimple->GetId(); + const sal_uInt32 nId = pSimple==nullptr ? 0 : pSimple->GetId(); bool bDataChg=nId==SFX_HINT_DATACHANGED; bool bDying=nId==SFX_HINT_DYING; bool bObj1=aCon1.pObj!=nullptr && aCon1.pObj->GetBroadcaster()==&rBC; diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index bd18537a5e39..e4e34c9177fc 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -746,8 +746,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } else if(dynamic_cast<const SfxSimpleHint*>(&rHint)) { - sal_uInt16 nHintId = static_cast<const SfxSimpleHint&>(rHint).GetId(); - if(SFX_HINT_DEINITIALIZING == nHintId) + if (static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DEINITIALIZING) { DELETEZ(m_pWebUsrPref); DELETEZ(m_pUsrPref) ; |