[Libreoffice-commits] core.git: 2 commits - basctl/source comphelper/source include/canvas include/comphelper

[Caolán McNamara]

 basctl/source/basicide/baside2.hxx         |    2 +-
 basctl/source/basicide/baside2b.cxx        |    2 +-
 comphelper/source/misc/syntaxhighlight.cxx |   24 ++++++++++++------------
 include/canvas/base/graphicdevicebase.hxx  |    2 +-
 include/comphelper/syntaxhighlight.hxx     |    2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit b921e1fd65090373be98d9df28a7aa3137e9f0fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 12 10:55:59 2015 +0000

    coverity#1269573 Uncaught exception
    
    Change-Id: I50a8705ec9285fe7ede32d623a0691e69de3f323

diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index fb5c494..239ac40 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -278,7 +278,7 @@ namespace canvas
 
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             MutexType aGuard( BaseType::m_aMutex );
 
commit f8b80701e0dea65349aab90ed96afa184b51ae22
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 12 10:53:18 2015 +0000

    these can all be made const
    
    Change-Id: I6a8af82e8612196f20143f4997eb95c80a2ca13d

diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 2247820..9bfcd03 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -157,7 +157,7 @@ public:
 
     void            UpdateSyntaxHighlighting ();
 
-    bool            GetProcedureName(OUString& rLine, OUString& rProcType, OUString& rProcName);
+    bool            GetProcedureName(OUString& rLine, OUString& rProcType, OUString& rProcName) const;
 };
 
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 0aadfea..60fa48a 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -789,7 +789,7 @@ void EditorWindow::HandleProcedureCompletion()
     }
 }
 
-bool EditorWindow::GetProcedureName(OUString& rLine, OUString& rProcType, OUString& rProcName)
+bool EditorWindow::GetProcedureName(OUString& rLine, OUString& rProcType, OUString& rProcName) const
 {
     std::vector<HighlightPortion> aPortions;
     aHighlighter.getHighlightPortions(rLine, aPortions);
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index 76b72b1..b7a0186 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -261,11 +261,11 @@ class SyntaxHighlighter::Tokenizer
     sal_uInt16 aCharTypeTab[256];
 
     // Auxiliary function: testing of the character flags
-    bool testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags );
+    bool testCharFlags(sal_Unicode c, sal_uInt16 nTestFlags) const;
 
     // Get new token, EmptyString == nothing more over there
-    bool getNextToken( const sal_Unicode*& pos, /*out*/TokenTypes& reType,
-        /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos );
+    bool getNextToken(const sal_Unicode*& pos, /*out*/TokenTypes& reType,
+        /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos) const;
 
     const char** ppListKeyWords;
     sal_uInt16 nKeyWordCount;
@@ -276,13 +276,13 @@ public:
     Tokenizer( HighlighterLanguage aLang );
     ~Tokenizer( void );
 
-    void getHighlightPortions( const OUString& rLine,
-                               /*out*/std::vector<HighlightPortion>& portions );
+    void getHighlightPortions(const OUString& rLine,
+                               /*out*/std::vector<HighlightPortion>& portions) const;
     void setKeyWords( const char** ppKeyWords, sal_uInt16 nCount );
 };
 
 // Helper function: test character flag
-bool SyntaxHighlighter::Tokenizer::testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags )
+bool SyntaxHighlighter::Tokenizer::testCharFlags(sal_Unicode c, sal_uInt16 nTestFlags) const
 {
     bool bRet = false;
     if( c != 0 && c <= 255 )
@@ -303,8 +303,8 @@ void SyntaxHighlighter::Tokenizer::setKeyWords( const char** ppKeyWords, sal_uIn
     nKeyWordCount = nCount;
 }
 
-bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /*out*/TokenTypes& reType,
-    /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos )
+bool SyntaxHighlighter::Tokenizer::getNextToken(const sal_Unicode*& pos, /*out*/TokenTypes& reType,
+    /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos) const
 {
     reType = TT_UNKNOWN;
 
@@ -665,8 +665,8 @@ SyntaxHighlighter::Tokenizer::~Tokenizer( void )
 {
 }
 
-void SyntaxHighlighter::Tokenizer::getHighlightPortions( const OUString& rLine,
-                                                 /*out*/std::vector<HighlightPortion>& portions  )
+void SyntaxHighlighter::Tokenizer::getHighlightPortions(const OUString& rLine,
+                                                 /*out*/std::vector<HighlightPortion>& portions) const
 {
     // Set the position to the beginning of the source string
     const sal_Unicode* pos = rLine.getStr();
@@ -706,8 +706,8 @@ SyntaxHighlighter::SyntaxHighlighter(HighlighterLanguage language):
 
 SyntaxHighlighter::~SyntaxHighlighter() {}
 
-void SyntaxHighlighter::getHighlightPortions( const OUString& rLine,
-                                              /*out*/std::vector<HighlightPortion>& portions )
+void SyntaxHighlighter::getHighlightPortions(const OUString& rLine,
+                                              /*out*/std::vector<HighlightPortion>& portions) const
 {
     m_tokenizer->getHighlightPortions( rLine, portions );
 }
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index 081be1d..ef190bc 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.hxx
@@ -78,7 +78,7 @@ public:
     ~SyntaxHighlighter();
 
     void getHighlightPortions( const OUString& rLine,
-                               std::vector<HighlightPortion>& pPortions );
+                               std::vector<HighlightPortion>& pPortions ) const;
 
     HighlighterLanguage GetLanguage();
 };