boost/boost_1_44_0-logical-op-parentheses.patch | 12 +
boost/boost_1_44_0-unused-parameters.patch | 77
boost/makefile.mk|1
cppcanvas/source/mtfrenderer/bitmapaction.cxx|2
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx |2
cppcanvas/source/mtfrenderer/polypolyaction.cxx |6
cppcanvas/source/mtfrenderer/rendergraphicaction.cxx |2
framework/source/classes/menumanager.cxx |8
sc/qa/unit/helper/debughelper.hxx|3
sc/source/core/data/dpgroup.cxx |9
sc/source/filter/oox/worksheetfragment.cxx | 20 --
vcl/inc/ios/salframeview.h |5
vcl/ios/source/gdi/salcoretextfontutils.cxx | 177 ---
vcl/ios/source/gdi/salcoretextlayout.cxx | 26 ++
vcl/ios/source/gdi/salnativewidgets.cxx | 18 +
vcl/ios/source/window/salframeview.mm| 16 +
16 files changed, 168 insertions(+), 216 deletions(-)
New commits:
commit 86b99ab408c7235604a1a02d7bc531fe5d5f97f6
Author: Tor Lillqvist t...@iki.fi
Date: Wed Apr 4 00:57:00 2012 +0300
Clang WaE: -Woverloaded-virtual weirdness, this seems to help
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 2129ca5..39f240a 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -60,6 +60,8 @@ namespace cppcanvas
class BitmapAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
BitmapAction( const ::BitmapEx,
const ::basegfx::B2DPoint rDstPoint,
const CanvasSharedPtr,
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 8cef77f..4e72cae 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -79,11 +79,11 @@ namespace cppcanvas
protected:
using Action::render;
-private:
virtual bool render( ::com::sun::star::uno::Reference
::com::sun::star::rendering::XCachedPrimitive rCachedPrimitive,
const ::basegfx::B2DHomMatrix
rTransformation ) const = 0;
+private:
CanvasSharedPtr
mpCanvas;
mutable ::com::sun::star::uno::Reference
::com::sun::star::rendering::XCachedPrimitive
mxCachedPrimitive;
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index dcfe33c..2ff5316 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -61,6 +61,8 @@ namespace cppcanvas
class PolyPolyAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
PolyPolyAction( const ::basegfx::B2DPolyPolygon,
const CanvasSharedPtr,
const OutDevState,
@@ -245,6 +247,8 @@ namespace cppcanvas
class TexturedPolyPolyAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon rPoly,
const CanvasSharedPtr
rCanvas,
const OutDevState
rState,
@@ -359,6 +363,8 @@ namespace cppcanvas
class StrokedPolyPolyAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon
rPoly,
const CanvasSharedPtr
rCanvas,
const OutDevState
rState,
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
index f5ce0ee..237f781 100644
--- a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
+++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
@@ -60,6 +60,8 @@ namespace cppcanvas
class RenderGraphicAction : public CachedPrimitiveBase
{
public:
+using CachedPrimitiveBase::render;
+
RenderGraphicAction( const ::vcl::RenderGraphic
rRenderGraphic,
const ::basegfx::B2DPoint rDstPoint,
const ::basegfx::B2DVector