[Libreoffice-commits] core.git: 4 commits - scaddins/source sc/source

[Tor Lillqvist]

 sc/source/core/inc/bcaslot.hxx            |    2 +-
 sc/source/core/tool/grouparealistener.cxx |    4 ++--
 sc/source/filter/excel/xetable.cxx        |    2 +-
 scaddins/source/analysis/analysis.cxx     |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7f4222a5a59a8ccd8fcc5a56ed521bc0a9655737
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 18 16:16:00 2014 +0200

    WaE: overriding virtual function declaration not marked 'override'
    
    Change-Id: I82cfe96c4081afbd43fa1a9c41a9a92433f6bdb1

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 770f30e..01c286d 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2052,7 +2052,7 @@ public:
                  mrColXFIndexes( rColXFIndexes ) {}
     virtual ~RowFinalizeTask() {}
     void     push_back( XclExpRow *pRow ) { maRows.push_back( pRow ); }
-    virtual void doWork()
+    virtual void doWork() SAL_OVERRIDE
     {
         for (size_t i = 0; i < maRows.size(); i++ )
             maRows[ i ]->Finalize( mrColXFIndexes, mbProgress );
commit cddc69f6e51d2c77214337308ceccf0a72bdf3e5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 18 15:48:23 2014 +0200

    WaE: overriding virtual function declaration not marked 'override'
    
    Change-Id: I7f2dede9171f7478467a83ea000baa7da85aeac6

diff --git a/sc/source/core/tool/grouparealistener.cxx b/sc/source/core/tool/grouparealistener.cxx
index 7a83461..6392192 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -40,13 +40,13 @@ public:
     CollectCellAction( const FormulaGroupAreaListener& rAreaListener ) :
         mrAreaListener(rAreaListener) {}
 
-    virtual void startColumn( ScColumn* pCol )
+    virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE
     {
         maPos.SetTab(pCol->GetTab());
         maPos.SetCol(pCol->GetCol());
     }
 
-    virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal )
+    virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE
     {
         if (!bVal)
             return;
commit 69183fd1a26d7f5e2b04fcc492ee02a5dae71550
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 18 15:44:50 2014 +0200

    WaE: implicit conversion (IntegralCast) from bool to 'unsigned long'
    
    Change-Id: Icff8f89f64f335d8601ced11c83d4d30c2abac18

diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 27c87f8..63e5a6b 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -101,7 +101,7 @@ struct ScBroadcastAreaHash
 {
     size_t operator()( const ScBroadcastAreaEntry& rEntry ) const
     {
-        return rEntry.mpArea->GetRange().hashArea() + rEntry.mpArea->IsGroupListening();
+        return rEntry.mpArea->GetRange().hashArea() + static_cast<size_t>(rEntry.mpArea->IsGroupListening());
     }
 };
 
commit ce239f392cd22a9f5ca7146272fc020395f865f5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 18 15:42:27 2014 +0200

    RANDBETWEEN is supposed to return an integer
    
    Change-Id: I82e7963b55cf2ab28c193f40fe8f30e097364653

diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 63a532a..c0137f3 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -702,7 +702,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) throw(
     if( fMin > fMax )
         throw lang::IllegalArgumentException();
 
-    double fRet = comphelper::rng::uniform_real_distribution(fMin, boost::math::nextafter(fMax, DBL_MAX));
+    double fRet = floor(comphelper::rng::uniform_real_distribution(fMin, boost::math::nextafter(fMax+1, -DBL_MAX)));
     RETURN_FINITE( fRet );
 }