[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/postithelper.hxx              |    4 ++--
 sw/source/uibase/docvw/PostItMgr.cxx |   16 ++++++++--------
 sw/source/uibase/utlui/content.cxx   |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit d3ef6070dc0a597a1a7cef7c39c50b95d664976d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jan 14 09:18:13 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jan 15 12:47:00 2019 +0100

    rename GetBroadCaster->GetBroadcaster
    
    Change-Id: I76ca0cd28b4c6a95d9021c760f61db982283377b
    Reviewed-on: https://gerrit.libreoffice.org/66313
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index e0f934dfe025..3c22ad9fd357 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -118,7 +118,7 @@ public:
     virtual SwPosition GetAnchorPosition() const = 0;
     virtual bool UseElement(SwRootFrame const&, IDocumentRedlineAccess 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,
                                                                 SwPostItMgr& aMgr) = 0;
 };
@@ -140,7 +140,7 @@ public:
     {
         return mrFormatField;
     }
-    virtual const SfxBroadcaster* GetBroadCaster() const override
+    virtual const SfxBroadcaster* GetBroadcaster() const override
     {
         return dynamic_cast<const SfxBroadcaster *> (&mrFormatField);
     }
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 73dba00005a4..19bdcd385679 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -248,7 +248,7 @@ void SwPostItMgr::CheckForRemovedPostIts()
     {
         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);
             it = mvPostItFields.erase(it);
             if (GetActiveSidebarWin() == p->pPostIt)
@@ -282,7 +282,7 @@ SwSidebarItem* SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExisten
     {
         for (auto const& postItField : mvPostItFields)
         {
-            if ( postItField->GetBroadCaster() == pItem )
+            if ( postItField->GetBroadcaster() == pItem )
                 return nullptr;
         }
     }
@@ -303,7 +303,7 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
 {
     EndListening(*pBroadcast);
     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())
     {
         std::unique_ptr<SwSidebarItem> p = std::move(*i);
@@ -394,7 +394,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC);
                 for (auto const& postItField : mvPostItFields)
                 {
-                    if ( pFormatField == postItField->GetBroadCaster() )
+                    if ( pFormatField == postItField->GetBroadcaster() )
                     {
                         if (postItField->pPostIt)
                         {
@@ -418,7 +418,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC);
                 for (auto const& postItField : mvPostItFields)
                 {
-                    if ( pFormatField == postItField->GetBroadCaster() )
+                    if ( pFormatField == postItField->GetBroadcaster() )
                     {
                         if (postItField->pPostIt)
                         {
@@ -502,7 +502,7 @@ void SwPostItMgr::Focus(SfxBroadcaster& rBC)
     for (auto const& postItField : mvPostItFields)
     {
         // field to get the focus is the broadcaster
-        if ( &rBC == postItField->GetBroadCaster() )
+        if ( &rBC == postItField->GetBroadcaster() )
         {
             if (postItField->pPostIt)
             {
@@ -1322,7 +1322,7 @@ void SwPostItMgr::RemoveSidebarWin()
 {
     for (auto& postItField : mvPostItFields)
     {
-        EndListening( *const_cast<SfxBroadcaster*>(postItField->GetBroadCaster()) );
+        EndListening( *const_cast<SfxBroadcaster*>(postItField->GetBroadcaster()) );
         postItField->pPostIt.disposeAndClear();
         postItField.reset();
     }
@@ -1691,7 +1691,7 @@ SwAnnotationWin* SwPostItMgr::GetSidebarWin( const SfxBroadcaster* pBroadcaster)
 {
     for (auto const& postItField : mvPostItFields)
     {
-        if ( postItField->GetBroadCaster() == pBroadcaster)
+        if ( postItField->GetBroadcaster() == pBroadcaster)
             return postItField->pPostIt;
     }
     return nullptr;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index bd0277316b02..0de5b0cc71b7 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -445,7 +445,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
             {
                 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() &&
                             (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
@@ -753,7 +753,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
             {
                 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() &&
                             (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )