[Libreoffice-commits] core.git: 3 commits - external/boost include/sfx2 include/svtools svtools/source

[Tor Lillqvist]

 external/boost/UnpackedTarball_boost.mk          |    2 --
 external/boost/boost.random.Wuninitialized.patch |   10 ----------
 include/sfx2/recentdocsviewitem.hxx              |    4 ++--
 include/svtools/tabbar.hxx                       |    2 +-
 svtools/source/control/tabbar.cxx                |    4 ++--
 5 files changed, 5 insertions(+), 17 deletions(-)

New commits:
commit 1053688105c1064a4e04dcb2c6056b4326c4a880
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 28 18:42:27 2014 +0300

    Bin outdated patch
    
    We use gcc 4.8 for Android now.
    
    Change-Id: I607499c9a61529349d2c3154593b2edf48eccb7e

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 29c478c..8af8c36 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -65,8 +65,6 @@ boost_patches += boost.ptr_container.Wextra.warnings.patch
 boost_patches += boost.ptr_container.Wunused-parameter.warnings.patch
 # https://svn.boost.org/trac/boost/ticket/9898
 boost_patches += boost.random.Wshadow.warnings.patch
-# https://svn.boost.org/trac/boost/ticket/9899
-boost_patches += boost.random.Wuninitialized.patch
 # fixed upstream
 boost_patches += boost.random.Wunused-local-typedefs.warnings.patch
 # https://svn.boost.org/trac/boost/ticket/9900
diff --git a/external/boost/boost.random.Wuninitialized.patch b/external/boost/boost.random.Wuninitialized.patch
deleted file mode 100644
index 1b6384e..0000000
--- a/external/boost/boost.random.Wuninitialized.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- foo/foo/foo/boost/random/binomial_distribution.hpp
-+++ foo/foo/foo/boost/random/binomial_distribution.hpp
-@@ -278,6 +278,7 @@
-         m = static_cast<IntType>((t_lcl+1)*p_lcl);
- 
-         if(use_inversion()) {
-+            btrd.r = btrd.nr = btrd.npq = btrd.b = btrd.a = btrd.c = btrd.alpha = btrd.v_r = btrd.u_rv_r = 0;
-             q_n = pow((1 - p_lcl), static_cast<RealType>(t_lcl));
-         } else {
-             btrd.r = p_lcl/(1-p_lcl);
commit f0a266681974ef3d7ae881e1d8342a6bdfd9d737
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 28 17:00:20 2014 +0300

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

diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx
index 96cd84c..b1a51fe 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -31,9 +31,9 @@ public:
     virtual OUString getHelpText() const SAL_OVERRIDE;
 
     virtual void Paint(drawinglayer::processor2d::BaseProcessor2D *pProcessor,
-                       const ThumbnailItemAttributes *pAttrs);
+                       const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
 
-    virtual void MouseButtonUp(const MouseEvent& rMEvt);
+    virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
 
     /// Called when the user clicks a document - it will open it.
     void OpenDocument();
commit 6f59894afca1f3aee968be10c98167cd0900340d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 28 16:49:12 2014 +0300

    WaE: implicit conversion from bool to 'long'
    
    Change-Id: Ibe8bf3070fb64b447315b280c7c06a7851f7a7ed

diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 20e644b..bc15dd4 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -389,7 +389,7 @@ private:
     SVT_DLLPRIVATE void            ImplEnableControls();
     SVT_DLLPRIVATE void            ImplSelect();
     SVT_DLLPRIVATE void            ImplActivatePage();
-    SVT_DLLPRIVATE long            ImplDeactivatePage();
+    SVT_DLLPRIVATE bool            ImplDeactivatePage();
     SVT_DLLPRIVATE void            ImplPrePaint();
     SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount );
     SVT_DLLPRIVATE Rectangle       ImplGetInsertTabRect(ImplTabBarItem* pItem) const;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 2b1f0ed..9183f73 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1718,9 +1718,9 @@ void TabBar::ActivatePage()
 
 
 
-long TabBar::ImplDeactivatePage()
+bool TabBar::ImplDeactivatePage()
 {
-    long nRet = DeactivatePage();
+    bool nRet = DeactivatePage();
 
     CallEventListeners( VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)) );