Kaydet (Commit) d3ef6070 authored tarafından Noel Grandin's avatar Noel Grandin

rename GetBroadCaster->GetBroadcaster

Change-Id: I76ca0cd28b4c6a95d9021c760f61db982283377b
Reviewed-on: https://gerrit.libreoffice.org/66313
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst d9cc1208
...@@ -118,7 +118,7 @@ public: ...@@ -118,7 +118,7 @@ public:
virtual SwPosition GetAnchorPosition() const = 0; virtual SwPosition GetAnchorPosition() const = 0;
virtual bool UseElement(SwRootFrame const&, IDocumentRedlineAccess const&) = 0; virtual bool UseElement(SwRootFrame const&, IDocumentRedlineAccess const&) = 0;
virtual const SwFormatField& GetFormatField() const = 0; virtual const SwFormatField& GetFormatField() const = 0;
virtual const SfxBroadcaster* GetBroadCaster() const = 0; virtual const SfxBroadcaster* GetBroadcaster() const = 0;
virtual VclPtr<sw::annotation::SwAnnotationWin> GetSidebarWindow( SwEditWin& rEditWin, virtual VclPtr<sw::annotation::SwAnnotationWin> GetSidebarWindow( SwEditWin& rEditWin,
SwPostItMgr& aMgr) = 0; SwPostItMgr& aMgr) = 0;
}; };
...@@ -140,7 +140,7 @@ public: ...@@ -140,7 +140,7 @@ public:
{ {
return mrFormatField; return mrFormatField;
} }
virtual const SfxBroadcaster* GetBroadCaster() const override virtual const SfxBroadcaster* GetBroadcaster() const override
{ {
return dynamic_cast<const SfxBroadcaster *> (&mrFormatField); return dynamic_cast<const SfxBroadcaster *> (&mrFormatField);
} }
......
...@@ -248,7 +248,7 @@ void SwPostItMgr::CheckForRemovedPostIts() ...@@ -248,7 +248,7 @@ void SwPostItMgr::CheckForRemovedPostIts()
{ {
if (!(*it)->UseElement(*mpWrtShell->GetLayout(), rIDRA)) if (!(*it)->UseElement(*mpWrtShell->GetLayout(), rIDRA))
{ {
EndListening(const_cast<SfxBroadcaster&>(*(*it)->GetBroadCaster())); EndListening(const_cast<SfxBroadcaster&>(*(*it)->GetBroadcaster()));
std::unique_ptr<SwSidebarItem> p = std::move(*it); std::unique_ptr<SwSidebarItem> p = std::move(*it);
it = mvPostItFields.erase(it); it = mvPostItFields.erase(it);
if (GetActiveSidebarWin() == p->pPostIt) if (GetActiveSidebarWin() == p->pPostIt)
...@@ -282,7 +282,7 @@ SwSidebarItem* SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExisten ...@@ -282,7 +282,7 @@ SwSidebarItem* SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExisten
{ {
for (auto const& postItField : mvPostItFields) for (auto const& postItField : mvPostItFields)
{ {
if ( postItField->GetBroadCaster() == pItem ) if ( postItField->GetBroadcaster() == pItem )
return nullptr; return nullptr;
} }
} }
...@@ -303,7 +303,7 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast ) ...@@ -303,7 +303,7 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
{ {
EndListening(*pBroadcast); EndListening(*pBroadcast);
auto i = std::find_if(mvPostItFields.begin(), mvPostItFields.end(), auto i = std::find_if(mvPostItFields.begin(), mvPostItFields.end(),
[&pBroadcast](const std::unique_ptr<SwSidebarItem>& pField) { return pField->GetBroadCaster() == pBroadcast; }); [&pBroadcast](const std::unique_ptr<SwSidebarItem>& pField) { return pField->GetBroadcaster() == pBroadcast; });
if (i != mvPostItFields.end()) if (i != mvPostItFields.end())
{ {
std::unique_ptr<SwSidebarItem> p = std::move(*i); std::unique_ptr<SwSidebarItem> p = std::move(*i);
...@@ -394,7 +394,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) ...@@ -394,7 +394,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC); SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC);
for (auto const& postItField : mvPostItFields) for (auto const& postItField : mvPostItFields)
{ {
if ( pFormatField == postItField->GetBroadCaster() ) if ( pFormatField == postItField->GetBroadcaster() )
{ {
if (postItField->pPostIt) if (postItField->pPostIt)
{ {
...@@ -418,7 +418,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) ...@@ -418,7 +418,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC); SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC);
for (auto const& postItField : mvPostItFields) for (auto const& postItField : mvPostItFields)
{ {
if ( pFormatField == postItField->GetBroadCaster() ) if ( pFormatField == postItField->GetBroadcaster() )
{ {
if (postItField->pPostIt) if (postItField->pPostIt)
{ {
...@@ -502,7 +502,7 @@ void SwPostItMgr::Focus(SfxBroadcaster& rBC) ...@@ -502,7 +502,7 @@ void SwPostItMgr::Focus(SfxBroadcaster& rBC)
for (auto const& postItField : mvPostItFields) for (auto const& postItField : mvPostItFields)
{ {
// field to get the focus is the broadcaster // field to get the focus is the broadcaster
if ( &rBC == postItField->GetBroadCaster() ) if ( &rBC == postItField->GetBroadcaster() )
{ {
if (postItField->pPostIt) if (postItField->pPostIt)
{ {
...@@ -1322,7 +1322,7 @@ void SwPostItMgr::RemoveSidebarWin() ...@@ -1322,7 +1322,7 @@ void SwPostItMgr::RemoveSidebarWin()
{ {
for (auto& postItField : mvPostItFields) for (auto& postItField : mvPostItFields)
{ {
EndListening( *const_cast<SfxBroadcaster*>(postItField->GetBroadCaster()) ); EndListening( *const_cast<SfxBroadcaster*>(postItField->GetBroadcaster()) );
postItField->pPostIt.disposeAndClear(); postItField->pPostIt.disposeAndClear();
postItField.reset(); postItField.reset();
} }
...@@ -1691,7 +1691,7 @@ SwAnnotationWin* SwPostItMgr::GetSidebarWin( const SfxBroadcaster* pBroadcaster) ...@@ -1691,7 +1691,7 @@ SwAnnotationWin* SwPostItMgr::GetSidebarWin( const SfxBroadcaster* pBroadcaster)
{ {
for (auto const& postItField : mvPostItFields) for (auto const& postItField : mvPostItFields)
{ {
if ( postItField->GetBroadCaster() == pBroadcaster) if ( postItField->GetBroadcaster() == pBroadcaster)
return postItField->pPostIt; return postItField->pPostIt;
} }
return nullptr; return nullptr;
......
...@@ -445,7 +445,7 @@ void SwContentType::Init(bool* pbInvalidateWindow) ...@@ -445,7 +445,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
{ {
for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i) for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
{ {
if (const SwFormatField* pFormatField = dynamic_cast<const SwFormatField *>((*i)->GetBroadCaster())) // SwPostit if (const SwFormatField* pFormatField = dynamic_cast<const SwFormatField *>((*i)->GetBroadcaster())) // SwPostit
{ {
if (pFormatField->GetTextField() && pFormatField->IsFieldInDoc() && if (pFormatField->GetTextField() && pFormatField->IsFieldInDoc() &&
(*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE ) (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
...@@ -753,7 +753,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) ...@@ -753,7 +753,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
{ {
for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i) for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
{ {
if (const SwFormatField* pFormatField = dynamic_cast<const SwFormatField *>((*i)->GetBroadCaster())) // SwPostit if (const SwFormatField* pFormatField = dynamic_cast<const SwFormatField *>((*i)->GetBroadcaster())) // SwPostit
{ {
if (pFormatField->GetTextField() && pFormatField->IsFieldInDoc() && if (pFormatField->GetTextField() && pFormatField->IsFieldInDoc() &&
(*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE ) (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment