drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx | 37 ---------- drawinglayer/source/processor3d/baseprocessor3d.cxx | 18 ---- svx/source/svdraw/svdoashp.cxx | 2 3 files changed, 1 insertion(+), 56 deletions(-)
New commits: commit 06957447394682b35d5c861f8b81956ccf65508a Author: Caolán McNamara <[email protected]> Date: Wed Feb 29 10:58:21 2012 +0000 WaE: C4805: '!=' : unsafe mix of type 'bool' and type 'const sal_Bool' diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 2cd4a04..0c51f65 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1369,7 +1369,7 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const // set path and poly conversion if one is possible since // this object will first be broken - const sal_Bool bCanConvToPathOrPoly(aInfo.bCanConvToPath || aInfo.bCanConvToPoly); + const bool bCanConvToPathOrPoly(aInfo.bCanConvToPath || aInfo.bCanConvToPoly); if(rInfo.bCanConvToPath != bCanConvToPathOrPoly) { rInfo.bCanConvToPath = bCanConvToPathOrPoly; commit a5ea9ddaad65853d1e14686ddb096da2e62731e0 Author: Caolán McNamara <[email protected]> Date: Wed Feb 29 10:33:25 2012 +0000 CollectingProcessor3D cannot be instantiated diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx index 0dce674..16b6022 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx @@ -79,43 +79,6 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -namespace drawinglayer -{ - namespace processor3d - { - /** CollectingProcessor3D class - - A processor which just collects all primitives given to it in - process(..) calls to maPrimitive3DSequence. This can e.g. be used to - hand around as instance over various methods where every called - method can add graphic content to it. - */ - class DRAWINGLAYER_DLLPUBLIC CollectingProcessor3D : public BaseProcessor3D - { - private: - primitive3d::Primitive3DSequence maPrimitive3DSequence; - - public: - virtual ~CollectingProcessor3D(); - - /// the central processing method - virtual void process(const primitive3d::Primitive3DSequence& rSource); - - /// helpers for adding to local sequence - void appendPrimitive3DReference(const primitive3d::Primitive3DReference& rSource) - { - primitive3d::appendPrimitive3DReferenceToPrimitive3DSequence(maPrimitive3DSequence, rSource); - } - - /// data access and reset - const primitive3d::Primitive3DSequence& getPrimitive3DSequence() const { return maPrimitive3DSequence; } - void reset() { maPrimitive3DSequence = primitive3d::Primitive3DSequence(); } - }; - } // end of namespace processor3d -} // end of namespace drawinglayer - -////////////////////////////////////////////////////////////////////////////// - #endif //_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX // eof diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx index 9abef4a..9e1f16b 100644 --- a/drawinglayer/source/processor3d/baseprocessor3d.cxx +++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx @@ -85,24 +85,6 @@ namespace drawinglayer } // end of namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - -namespace drawinglayer -{ - namespace processor3d - { - CollectingProcessor3D::~CollectingProcessor3D() - { - } - - void CollectingProcessor3D::process(const primitive3d::Primitive3DSequence& rSource) - { - // accept everything - primitive3d::appendPrimitive3DSequenceToPrimitive3DSequence(maPrimitive3DSequence, rSource); - } - } // end of namespace processor3d -} // end of namespace drawinglayer - -////////////////////////////////////////////////////////////////////////////// // eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
