[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit e00ae77fce4e6ff4e168b37d5ae25f6d3d0ee635
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat Jun 8 14:17:16 2013 +0200
remove obsolete backports
diff --git a/patches/1-d4bab97023e3569571a92551040574b20aceca7c.patch b/patches/1-d4bab97023e3569571a92551040574b20aceca7c.patch
deleted file mode 100644
index 0f5c6df..0000000
--- a/patches/1-d4bab97023e3569571a92551040574b20aceca7c.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From d4bab97023e3569571a92551040574b20aceca7c Mon Sep 17 00:00:00 2001
-From: Mark Wright <markwright@internode.on.net>
-Date: Sat, 09 Feb 2013 15:04:02 +0000
-Subject: fix compile for change to boost 1.53.0 declaring smart pointer operator bool as explicity for C++11 compilers
-
-Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79
-Reviewed-on: https://gerrit.libreoffice.org/2064
-Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
-Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
----
-diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
-index 9b4fe1b..6c34074 100644
---- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
-+++ b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
-@@ -78,7 +78,7 @@ public:
-
- operator bool () const
- {
-- return m_aItem;
-+ return static_cast< bool >(m_aItem);
- }
-
- virtual ~scoped_disposing_ptr()
-diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
-index fd99e8b..75a2eb2 100644
---- a/sc/source/filter/excel/xechart.cxx
-+++ b/sc/source/filter/excel/xechart.cxx
-@@ -683,7 +683,7 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT
-
- bool XclExpChEscherFormat::IsValid() const
- {
-- return maData.mxEscherSet;
-+ return static_cast< bool >(maData.mxEscherSet);
- }
-
- void XclExpChEscherFormat::Save( XclExpStream& rStrm )
-diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
-index c493560..81e9ac2 100644
---- a/sc/source/filter/excel/xehelper.cxx
-+++ b/sc/source/filter/excel/xehelper.cxx
-@@ -303,7 +303,7 @@ rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlFie
- if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7
- {
- // there was/is already a HLINK record
-- mbMultipleUrls = mxLinkRec;
-+ mbMultipleUrls = static_cast< bool >(mxLinkRec);
-
- mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) );
-
-diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
-index 63c9c43..f2321bf 100644
---- a/sc/source/filter/excel/xichart.cxx
-+++ b/sc/source/filter/excel/xichart.cxx
-@@ -2690,7 +2690,7 @@ void XclImpChTypeGroup::Finalize()
- maType.Finalize( bStockChart );
-
- // extended type info
-- maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false );
-+ maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false );
-
- // reverse series order for some unstacked 2D chart types
- if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() )
-diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
-index 57538f0..7c44412 100644
---- a/sc/source/filter/inc/xichart.hxx
-+++ b/sc/source/filter/inc/xichart.hxx
-@@ -1230,9 +1230,9 @@ public:
- /** Returns true, if the axis contains caption labels. */
- inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); }
- /** Returns true, if the axis shows its major grid lines. */
-- inline bool HasMajorGrid() const { return mxMajorGrid; }
-+ inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); }
- /** Returns true, if the axis shows its minor grid lines. */
-- inline bool HasMinorGrid() const { return mxMinorGrid; }
-+ inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); }
-
- /** Creates an API axis object. */
- XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;
-diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
-index e63d600..5d421c2 100644
---- a/slideshow/source/engine/animatedsprite.cxx
-+++ b/slideshow/source/engine/animatedsprite.cxx
-@@ -151,7 +151,7 @@ namespace slideshow
- }
- }
-
-- return mpSprite;
-+ return static_cast< bool >(mpSprite);
- }
-
- void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset )
-diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
-index 20c73de..621535f 100644
---- a/slideshow/source/engine/shapes/viewshape.cxx
-+++ b/slideshow/source/engine/shapes/viewshape.cxx
-@@ -178,7 +178,7 @@ namespace slideshow
- }
- }
-
-- return io_rCacheEntry.mpRenderer;
-+ return static_cast< bool >(io_rCacheEntry.mpRenderer);
- }
-
- bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
-diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
-index c5636cc..da28159 100644
---- a/slideshow/source/engine/shapesubset.cxx
-+++ b/slideshow/source/engine/shapesubset.cxx
-@@ -104,7 +104,7 @@ namespace slideshow
- maTreeNode );
- }
-
-- return mpSubsetShape;
-+ return static_cast< bool >(mpSubsetShape);
- }
-
- void ShapeSubset::disableSubsetShape()
-diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
-index 5f5e9f5..7d4c788 100644
---- a/slideshow/source/engine/slide/slideanimations.cxx
-+++ b/slideshow/source/engine/slide/slideanimations.cxx
-@@ -74,7 +74,7 @@ namespace slideshow
-
- SHOW_NODE_TREE( mpRootNode );
-
-- return mpRootNode;
-+ return static_cast< bool >(mpRootNode);
- }
-
- bool SlideAnimations::isAnimated() const
-diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
-index 88405f8..d725255 100644
---- a/slideshow/source/inc/shapeattributelayer.hxx
-+++ b/slideshow/source/inc/shapeattributelayer.hxx
-@@ -467,7 +467,7 @@ namespace slideshow
- // ShapeAttributeLayer(const ShapeAttributeLayer&);
- // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& );
-
-- bool haveChild() const { return mpChild; }
-+ bool haveChild() const { return static_cast< bool >(mpChild); }
- void updateStateIds();
-
- template< typename T > T calcValue( const T& rCurrValue,
-diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx
-index e53be46..22ce4f3 100644
---- a/slideshow/source/inc/shapeattributelayerholder.hxx
-+++ b/slideshow/source/inc/shapeattributelayerholder.hxx
-@@ -83,7 +83,7 @@ namespace slideshow
- if( mpShape )
- mpAttributeLayer = mpShape->createAttributeLayer();
-
-- return mpAttributeLayer;
-+ return static_cast< bool >(mpAttributeLayer);
- }
-
- ShapeAttributeLayerSharedPtr get() const
-diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
-index 6937a19..bab92bb 100644
---- a/sw/source/core/inc/bookmrk.hxx
-+++ b/sw/source/core/inc/bookmrk.hxx
-@@ -75,7 +75,7 @@ namespace sw {
-
- virtual bool IsCoveringPosition(const SwPosition& rPos) const;
- virtual bool IsExpanded() const
-- { return m_pPos2; }
-+ { return static_cast< bool >(m_pPos2); }
-
- virtual void SetName(const ::rtl::OUString& rName)
- { m_aName = rName; }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/2-c91d353872b7d4e1a39192bff1444b46cab6e5eb.patch b/patches/2-c91d353872b7d4e1a39192bff1444b46cab6e5eb.patch
deleted file mode 100644
index 1674ae0..0000000
--- a/patches/2-c91d353872b7d4e1a39192bff1444b46cab6e5eb.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From c91d353872b7d4e1a39192bff1444b46cab6e5eb Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Thu, 14 Feb 2013 14:21:46 +0000
-Subject: rhbz#908674: Adapt rtl::Allocator::construct to C++11
-
-...otherwise, at least with some --with-system-boost versions and C++11
-compilers, like with Fedora's boost-1.50.0-4.fc18.x86_64 and
-gcc-c++-4.7.2-8.fc18.x86_64, using this to copy-construct an instance of
-boost::unordered::detail::ptr_node<std::pair<rtl::OUString,Bootstrap_Impl*>> in
-the call to p_bootstrap_map->insert(...) in rtl_bootstrap_args_open
-(sal/rtl/source/bootstrap.cxx) would memcopy the ptr_node and fail to call
-rtl_uString_acquire, leading to memory corruption later on when
-rtl_uString_release is called one time too often.
-
-It is not entirely clear to me whether this is a shortcoming of the given Boost
-version, but this patch solves the problem and brings rtl::Allocator::construct
-in line with the (changed) Allocator requirements of C++11 anyway.
-
-The problem potentially lurks with every use of rtl::Allocator, but only showed
-now begining with LO 4.0 where e5111574fd904b38a3980ca4ea3d21cfcb22dea6 "Revert
-'sb140: sb140: #i116981# clean up memory upon exit'" re-introduced code into
-rtl_bootstrap_args_open that inserts into a boost::unordered_map that uses
-rtl::Allocator.
-
-Change-Id: I3be22f59a8eb49d31458480c27f3ce15803c7fd4
----
-diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
-index 0f85b59..5e7150b 100644
---- a/config_host/config_global.h.in
-+++ b/config_host/config_global.h.in
-@@ -14,6 +14,7 @@ Any change in this header will cause a rebuild of almost everything.
-
- #undef HAVE_CXX11_DELETE
- #undef HAVE_CXX11_OVERRIDE
-+#undef HAVE_CXX11_PERFECT_FORWARDING
- #undef HAVE_GCC_BUILTIN_ATOMIC
- #undef HAVE_SFINAE_ANONYMOUS_BROKEN
- #undef HAVE_THREADSAFE_STATICS
-diff --git a/configure.ac b/configure.ac
-index a23e8d4..1061507 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5786,6 +5786,29 @@ else
- fi
-
- dnl ===================================================================
-+dnl Check for C++11 perfect forwarding support
-+dnl ===================================================================
-+HAVE_CXX11_PERFECT_FORWARDING=
-+AC_MSG_CHECKING([whether $CXX supports C++11 perfect forwarding])
-+save_CXXFLAGS=$CXXFLAGS
-+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-+AC_LANG_PUSH([C++])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+ #include <utility>
-+ template<typename T, typename... Args> T * f(Args &&... v) {
-+ return new T(std::forward<Args>(v)...);
-+ }
-+ ]], [[
-+ f<int>(0);
-+ ]])], [perfect_forwarding=yes], [perfect_forwarding=no])
-+AC_LANG_POP([C++])
-+CXXFLAGS=$save_CXXFLAGS
-+AC_MSG_RESULT([$perfect_forwarding])
-+if test "$perfect_forwarding" = yes; then
-+ AC_DEFINE([HAVE_CXX11_PERFECT_FORWARDING])
-+fi
-+
-+dnl ===================================================================
- dnl system stl sanity tests
- dnl ===================================================================
- HAVE_GCC_VISIBILITY_BROKEN=
-diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
-index 4900d97..a70abff 100644
---- a/sal/inc/rtl/allocator.hxx
-+++ b/sal/inc/rtl/allocator.hxx
-@@ -23,6 +23,10 @@
- #include "rtl/alloc.h"
- #include <cstddef>
-
-+#if defined LIBO_INTERNAL_ONLY
-+#include "config_global.h"
-+#endif
-+
- /// @cond INTERNAL
-
- //######################################################
-@@ -125,10 +129,18 @@ public:
- }
-
- //-----------------------------------------
-+#if defined HAVE_CXX11_PERFECT_FORWARDING
-+ template< typename... Args >
-+ void construct (pointer p, Args &&... value)
-+ {
-+ new ((void*)p)T(std::forward< Args >(value)...);
-+ }
-+#else
- void construct (pointer p, const T& value)
- {
- new ((void*)p)T(value);
- }
-+#endif
-
- //-----------------------------------------
- void destroy (pointer p)
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/3-b62048701cea5024383e19314592f2edcd9810fd.patch b/patches/3-b62048701cea5024383e19314592f2edcd9810fd.patch
deleted file mode 100644
index be562ff..0000000
--- a/patches/3-b62048701cea5024383e19314592f2edcd9810fd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b62048701cea5024383e19314592f2edcd9810fd Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Sat, 16 Feb 2013 21:39:13 +0000
-Subject: Work around problem with boost::shared_array(NULL) ctor and Boost 1.53.0
-
-...claiming
-
- template<class Y> boost::shared_array<T>::shared_array(Y*)
-
-is not a viable option due to mismatched types 'Y*' and 'long int'
-
-Change-Id: I8db321cd25cd73c84fa2a3124c9ec1018c131d5f
----
-diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
-index 01707e6..e64646f 100644
---- a/vcl/source/gdi/svgdata.cxx
-+++ b/vcl/source/gdi/svgdata.cxx
-@@ -166,7 +166,7 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng
-
- //////////////////////////////////////////////////////////////////////////////
- SvgData::SvgData(const OUString& rPath):
-- maSvgDataArray(NULL),
-+ maSvgDataArray(),
- mnSvgDataArrayLength(0),
- maPath(rPath),
- maRange(),
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/4-faf72664d11deaa570a0f8c7e702ff07bf5914c8.patch b/patches/4-faf72664d11deaa570a0f8c7e702ff07bf5914c8.patch
deleted file mode 100644
index 0d81b4b..0000000
--- a/patches/4-faf72664d11deaa570a0f8c7e702ff07bf5914c8.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From faf72664d11deaa570a0f8c7e702ff07bf5914c8 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Sun, 17 Feb 2013 10:49:34 +0000
-Subject: Missing include in liborcus when building against Boost 1.53.0
-
-Change-Id: Ie6c944d53d6e2fcdd161f674e32c9fbfd761d844
----
-diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
-index ca5232d..de0788a 100644
---- a/liborcus/UnpackedTarball_orcus.mk
-+++ b/liborcus/UnpackedTarball_orcus.mk
-@@ -18,6 +18,10 @@ orcus_patches :=
- orcus_patches += liborcus_0.1.0-configure.patch
- # disable boost "auto lib" in MSVC build
- orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
-+# <https://gitorious.org/orcus/orcus/merge_requests/2#
-+# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
-+# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
-+orcus_patches += liborcus_0.1.0-boost-include.patch.1
-
- $(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
- vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
-diff --git a/liborcus/liborcus_0.1.0-boost-include.patch.1 b/liborcus/liborcus_0.1.0-boost-include.patch.1
-new file mode 100644
-index 0000000..07558b0
---- a/dev/null
-+++ b/liborcus/liborcus_0.1.0-boost-include.patch.1
-@@ -0,0 +1,26 @@
-+From f60d6eecee72349993a392a9a63ddf3383d3b8c8 Mon Sep 17 00:00:00 2001
-+From: Stephan Bergmann <sbergman@redhat.com>
-+Date: Sat, 16 Feb 2013 13:25:44 +0100
-+Subject: [PATCH] Missing include <boost/noncopyable.hpp>
-+
-+(at least when compiling against Boost 1.53.0)
-+---
-+ src/liborcus/dom_tree.cpp | 2 ++
-+ 1 file changed, 2 insertions(+)
-+
-+diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp
-+index ecf7beb..14725ad 100644
-+--- a/src/liborcus/dom_tree.cpp
-++++ b/src/liborcus/dom_tree.cpp
-+@@ -34,6 +34,8 @@
-+ #include <iostream>
-+ #include <sstream>
-+
-++#include <boost/noncopyable.hpp>
-++
-+ using namespace std;
-+
-+ namespace orcus {
-+--
-+1.8.1.2
-+
---
-cgit v0.9.0.2-2-gbebe
--
LibreOffice packaging repository
Reply to: