Various loplugin warnings in --enable-telepathy

Change-Id: I4c437491466c3029f2a9c93fb630c7b5a8d2ff21

3 files changed, 30 insertions, 30 deletions

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 6831cb8919de..8b28962ccee8 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -35,14 +35,14 @@ EditTextObject stringToEdit( const OUString& /* rStr */ )
 {
     // FIXME: implement me.
     // The code here only serves to make this file compilable.
-    EditEngine aEditEngine(0);
+    EditEngine aEditEngine(nullptr);
     return *aEditEngine.CreateTextObject();
 }
 
 ScFormulaCell* stringToFormulaCell( const OUString &rString )
 {
     (void)rString; // FIXME: implement me
-    return NULL;
+    return nullptr;
 }
 
 struct ProtocolError {
@@ -77,7 +77,7 @@ public:
                     eState = FIND_LAST_QUOTE;
                     break;
                 }
-                // else drop through
+                SAL_FALLTHROUGH;
             case IN_TEXT:
                 if (rString[n] == ';')
                 {
@@ -206,7 +206,7 @@ public:
         appendSeparator();
     }
 
-    void appendBool( sal_Bool b )
+    void appendBool( bool b )
     {
         aMessage.appendAscii( b ? "true" : "false" );
         appendSeparator();
@@ -320,7 +320,7 @@ void ScDocFuncSend::EndListAction()
     SendMessage( aOp );
 }
 
-sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, sal_Bool bApi )
+bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, bool bApi )
 {
     ScChangeOpWriter aOp( "setNormalString" );
     aOp.appendAddress( rPos );
@@ -331,7 +331,7 @@ sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& r
     o_rbNumFmtSet = false;
 
     if ( OUString( rText ) == "saveme" )
-        mpCollaboration->SaveAndSendFile( NULL );
+        mpCollaboration->SaveAndSendFile( nullptr );
 
     if ( OUString( rText ) == "contacts" )
         mpCollaboration->DisplayContacts();
@@ -410,7 +410,7 @@ bool ScDocFuncSend::ShowNote( const ScAddress& rPos, bool bShow )
     return true; // needs some code auditing action
 }
 
-bool ScDocFuncSend::SetNoteText( const ScAddress& rPos, const OUString& rNoteText, sal_Bool bApi )
+bool ScDocFuncSend::SetNoteText( const ScAddress& rPos, const OUString& rNoteText, bool bApi )
 {
     ScChangeOpWriter aOp( "setNoteText" );
     aOp.appendAddress( rPos );
@@ -420,8 +420,8 @@ bool ScDocFuncSend::SetNoteText( const ScAddress& rPos, const OUString& rNoteTex
     return true; // needs some code auditing action
 }
 
-sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const OUString& rName,
-                                     sal_Bool bRecord, sal_Bool bApi )
+bool ScDocFuncSend::RenameTable( SCTAB nTab, const OUString& rName,
+                                     bool bRecord, bool bApi )
 {
     ScChangeOpWriter aOp( "renameTable" );
     aOp.appendInt( nTab );
@@ -432,22 +432,22 @@ sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const OUString& rName,
     return true; // needs some code auditing action
 }
 
-sal_Bool ScDocFuncSend::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
-                                         sal_Bool bApi )
+bool ScDocFuncSend::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
+                                         bool bApi )
 {
     SAL_INFO( "sc.tubes", "ApplyAttributes not implemented!" );
     return ScDocFunc::ApplyAttributes( rMark, rPattern, bApi );
 }
 
-sal_Bool ScDocFuncSend::ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
-                                    sal_Bool bApi )
+bool ScDocFuncSend::ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
+                                    bool bApi )
 {
     SAL_INFO( "sc.tubes", "ApplyStyle not implemented!" );
     return ScDocFunc::ApplyStyle( rMark, rStyleName, bApi );
 }
 
-sal_Bool ScDocFuncSend::MergeCells( const ScCellMergeOption& rOption, sal_Bool bContents,
-                             sal_Bool bRecord, sal_Bool bApi )
+bool ScDocFuncSend::MergeCells( const ScCellMergeOption& rOption, bool bContents,
+                             bool bRecord, bool bApi )
 {
     SAL_INFO( "sc.tubes", "MergeCells not implemented!" );
     return ScDocFunc::MergeCells( rOption, bContents, bRecord, bApi );
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index 1baacd58818a..b0bfc80d2bf3 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -28,12 +28,12 @@ public:
     // FIXME: really ScDocFunc should be an abstract base, so
     // we don't need the rDocSh hack/pointer
     ScDocFuncSend( ScDocShell& rDocSh, ScDocFuncDirect* pDirect, ScCollaboration* pCollaboration );
-    virtual ~ScDocFuncSend();
+    virtual ~ScDocFuncSend() override;
 
     virtual void        EnterListAction( sal_uInt16 nNameResId );
     virtual void        EndListAction();
 
-    virtual sal_Bool    SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, sal_Bool bApi );
+    virtual bool SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, bool bApi );
     virtual bool SetValueCell( const ScAddress& rPos, double fVal, bool bInteraction );
     virtual bool SetValueCells( const ScAddress& rPos, const std::vector<double>& aVals, bool bInteraction );
     virtual bool SetStringCell( const ScAddress& rPos, const OUString& rStr, bool bInteraction );
@@ -44,14 +44,14 @@ public:
         const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish,
         bool bApi, const formula::FormulaGrammar::Grammar eGrammar );
     virtual bool        ShowNote( const ScAddress& rPos, bool bShow = true );
-    virtual bool        SetNoteText( const ScAddress& rPos, const OUString& rNoteText, sal_Bool bApi );
-    virtual sal_Bool    RenameTable( SCTAB nTab, const OUString& rName, sal_Bool bRecord, sal_Bool bApi );
-    virtual sal_Bool    ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
-                                         sal_Bool bApi );
-    virtual sal_Bool    ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
-                                    sal_Bool bApi );
-    virtual sal_Bool    MergeCells( const ScCellMergeOption& rOption, sal_Bool bContents,
-                                    sal_Bool bRecord, sal_Bool bApi );
+    virtual bool        SetNoteText( const ScAddress& rPos, const OUString& rNoteText, bool bApi );
+    virtual bool        RenameTable( SCTAB nTab, const OUString& rName, bool bRecord, bool bApi );
+    virtual bool        ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
+                                         bool bApi );
+    virtual bool        ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
+                                    bool bApi );
+    virtual bool        MergeCells( const ScCellMergeOption& rOption, bool bContents,
+                                    bool bRecord, bool bApi );
 };
 
 #endif
diff --git a/sc/source/ui/inc/sccollaboration.hxx b/sc/source/ui/inc/sccollaboration.hxx
index f0801e44b5d2..b3639233eab0 100644
--- a/sc/source/ui/inc/sccollaboration.hxx
+++ b/sc/source/ui/inc/sccollaboration.hxx
@@ -21,12 +21,12 @@ class ScCollaboration : public Collaboration
     ScDocShell* mpScDocShell;
 public:
             ScCollaboration( ScDocShell* pScDocShell );
-    virtual ~ScCollaboration();
+    virtual ~ScCollaboration() override;
 
-    virtual void  EndCollaboration() const;
-    virtual void  PacketReceived( const OString& rPacket ) const;
-    virtual void  SaveAndSendFile( TpContact* pContact ) const;
-    virtual void  StartCollaboration( TeleConference* pConference );
+    virtual void  EndCollaboration() const override;
+    virtual void  PacketReceived( const OString& rPacket ) const override;
+    virtual void  SaveAndSendFile( TpContact* pContact ) const override;
+    virtual void  StartCollaboration( TeleConference* pConference ) override;
 private:
     friend class ScDocShell;
     ScDocFuncSend* GetScDocFuncSend() const;