[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d90b46468fcb2addd9af0e3a3482e2360386134
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue May 21 09:13:13 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue May 21 16:26:01 2019 +0200

    wsd: fix -Werror,-Winconsistent-missing-override
    
    (cherry picked from commit 73108db91330d049afa5520e9f82a99846737d4d)
    
    Change-Id: Ide9921e410a8e1401a25b85fda04de1b5a45617a
    Reviewed-on: https://gerrit.libreoffice.org/72684
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 74ede3310..72cedf852 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -169,7 +169,7 @@ public:
         return TerminatingPoll::continuePolling();
     }
 
-    virtual void pollingThread()
+    void pollingThread() override
     {
         // Delegate to the docBroker.
         _docBroker.pollThread();