diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 308a948dab64..4694cf1c1b28 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -134,6 +134,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive3d/textureprimitive3d \ drawinglayer/source/primitive3d/transformprimitive3d \ drawinglayer/source/processor2d/baseprocessor2d \ + drawinglayer/source/processor2d/processor2dtools \ drawinglayer/source/processor2d/contourextractor2d \ drawinglayer/source/processor2d/getdigitlanguage \ drawinglayer/source/processor2d/helperwrongspellrenderer \ diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx new file mode 100644 index 000000000000..041b311d6596 --- /dev/null +++ b/drawinglayer/source/processor2d/processor2dtools.cxx @@ -0,0 +1,63 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#include +#include +#include + +////////////////////////////////////////////////////////////////////////////// + +using namespace com::sun::star; + +////////////////////////////////////////////////////////////////////////////// + +namespace drawinglayer +{ + namespace processor2d + { + BaseProcessor2D* createPixelProcessor2DFromOutputDevice( + OutputDevice& rTargetOutDev, + const drawinglayer::geometry::ViewInformation2D& rViewInformation2D) + { + // create Pixel Vcl-Processor + return new VclPixelProcessor2D(rViewInformation2D, rTargetOutDev); + } + + BaseProcessor2D* createProcessor2DFromOutputDevice( + OutputDevice& rTargetOutDev, + const drawinglayer::geometry::ViewInformation2D& rViewInformation2D) + { + const GDIMetaFile* pMetaFile = rTargetOutDev.GetConnectMetaFile(); + const bool bOutputToRecordingMetaFile(pMetaFile && pMetaFile->IsRecord() && !pMetaFile->IsPause()); + + if(bOutputToRecordingMetaFile) + { + // create MetaFile Vcl-Processor and process + return new VclMetafileProcessor2D(rViewInformation2D, rTargetOutDev); + } + else + { + // create Pixel Vcl-Processor + return createPixelProcessor2DFromOutputDevice( + rTargetOutDev, + rViewInformation2D); + } + } + } // end of namespace processor2d +} // end of namespace drawinglayer + +////////////////////////////////////////////////////////////////////////////// diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index 1bbbe43b6359..75712014a02b 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -19,10 +19,10 @@ #include #include -#include #include #include #include +#include #include #ifdef DBG_UTIL @@ -36,7 +36,7 @@ namespace drawinglayer { namespace tools { - BitmapEx DRAWINGLAYER_DLLPUBLIC convertToBitmapEx( + BitmapEx convertToBitmapEx( const drawinglayer::primitive2d::Primitive2DSequence& rSeq, const geometry::ViewInformation2D& rViewInformation2D, sal_uInt32 nDiscreteWidth, @@ -81,42 +81,48 @@ namespace drawinglayer maContent.SetBackground(Wallpaper(Color(COL_WHITE))); maContent.Erase(); - // create processor - processor2d::VclPixelProcessor2D aContentProcessor(aViewInformation2D, maContent); + // create pixel processor + processor2d::BaseProcessor2D* pContentProcessor = processor2d::createPixelProcessor2DFromOutputDevice( + maContent, + aViewInformation2D); - // render content - aContentProcessor.process(aSequence); + if(pContentProcessor) + { + // render content + pContentProcessor->process(aSequence); - // get content - maContent.EnableMapMode(false); - const Bitmap aContent(maContent.GetBitmap(aEmptyPoint, aSizePixel)); + // get content + maContent.EnableMapMode(false); + const Bitmap aContent(maContent.GetBitmap(aEmptyPoint, aSizePixel)); - // prepare for mask creation - maContent.SetMapMode(aMapModePixel); - maContent.SetAntialiasing(true); + // prepare for mask creation + maContent.SetMapMode(aMapModePixel); + maContent.SetAntialiasing(true); - // set alpha to all white (fully transparent) - maContent.Erase(); + // set alpha to all white (fully transparent) + maContent.Erase(); - // embed primitives to paint them black - const primitive2d::Primitive2DReference xRef( - new primitive2d::ModifiedColorPrimitive2D( - aSequence, - basegfx::BColorModifier( - basegfx::BColor(0.0, 0.0, 0.0), - 0.5, - basegfx::BCOLORMODIFYMODE_REPLACE))); - const primitive2d::Primitive2DSequence xSeq(&xRef, 1); + // embed primitives to paint them black + const primitive2d::Primitive2DReference xRef( + new primitive2d::ModifiedColorPrimitive2D( + aSequence, + basegfx::BColorModifier( + basegfx::BColor(0.0, 0.0, 0.0), + 0.5, + basegfx::BCOLORMODIFYMODE_REPLACE))); + const primitive2d::Primitive2DSequence xSeq(&xRef, 1); - // render - aContentProcessor.process(xSeq); + // render + pContentProcessor->process(xSeq); + delete pContentProcessor; - // get alpha cahannel from vdev - maContent.EnableMapMode(false); - const AlphaMask aAlphaMask(maContent.GetBitmap(aEmptyPoint, aSizePixel)); + // get alpha cahannel from vdev + maContent.EnableMapMode(false); + const AlphaMask aAlphaMask(maContent.GetBitmap(aEmptyPoint, aSizePixel)); - // create BitmapEx result - aRetval = BitmapEx(aContent, aAlphaMask); + // create BitmapEx result + aRetval = BitmapEx(aContent, aAlphaMask); + } } #ifdef DBG_UTIL diff --git a/include/drawinglayer/processor2d/processor2dtools.hxx b/include/drawinglayer/processor2d/processor2dtools.hxx new file mode 100644 index 000000000000..31cb6661c7a4 --- /dev/null +++ b/include/drawinglayer/processor2d/processor2dtools.hxx @@ -0,0 +1,79 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSOR2DTOOLS_HXX +#define INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSOR2DTOOLS_HXX + +#include +#include +#include + +////////////////////////////////////////////////////////////////////////////// +// predefines + +class OutputDevice; + +////////////////////////////////////////////////////////////////////////////// + +namespace drawinglayer +{ + namespace processor2d + { + /** create the best available pixel based BaseProcessor2D + (which may be system-dependent) + + @param rTargetOutDev + The target OutputDevice + + @param rViewInformation2D + The ViewInformation to use + + @return + the created BaseProcessor2D (ownership change) or null if + something went wrong + */ + DRAWINGLAYER_DLLPUBLIC BaseProcessor2D* createPixelProcessor2DFromOutputDevice( + OutputDevice& rTargetOutDev, + const drawinglayer::geometry::ViewInformation2D& rViewInformation2D); + + /** create a BaseProcessor2D dependent on some states of the + given OutputDevice. If metafile is recorded, the needed + VclMetafileProcessor2D will be created. If a pixel renderer + is requested, the best one is incarnated + + @param rTargetOutDev + The target OutputDevice + + @param rViewInformation2D + The ViewInformation to use + + @return + the created BaseProcessor2D (ownership change) or null if + something went wrong + */ + DRAWINGLAYER_DLLPUBLIC BaseProcessor2D* createProcessor2DFromOutputDevice( + OutputDevice& rTargetOutDev, + const drawinglayer::geometry::ViewInformation2D& rViewInformation2D); + + } // end of namespace processor2d +} // end of namespace drawinglayer + +////////////////////////////////////////////////////////////////////////////// + +#endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSOR2DTOOLS_HXX + +// eof diff --git a/include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx index fa85105939c8..84bfea4bf195 100644 --- a/include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx +++ b/include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx @@ -69,7 +69,7 @@ namespace drawinglayer and the extra-data added to it (which can be seen mostly as 'extensions' or simply as 'hacks'). */ - class DRAWINGLAYER_DLLPUBLIC VclMetafileProcessor2D : public VclProcessor2D + class VclMetafileProcessor2D : public VclProcessor2D { private: /// local helper(s) diff --git a/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx index c3003f096467..778d218c3457 100644 --- a/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx +++ b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx @@ -37,7 +37,7 @@ namespace drawinglayer all feeded primitives to a VCL Window. It is the currently used renderer for all VCL editing output from the DrawingLayer. */ - class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public VclProcessor2D + class VclPixelProcessor2D : public VclProcessor2D { private: protected: diff --git a/include/drawinglayer/processor2d/vclprocessor2d.hxx b/include/drawinglayer/processor2d/vclprocessor2d.hxx index 2995b34cc3cd..b8d984ea9967 100644 --- a/include/drawinglayer/processor2d/vclprocessor2d.hxx +++ b/include/drawinglayer/processor2d/vclprocessor2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer This processor is the base class for VCL-Based processors. It has no processBasePrimitive2D implementation and thus is not usable directly. */ - class DRAWINGLAYER_DLLPUBLIC VclProcessor2D : public BaseProcessor2D + class VclProcessor2D : public BaseProcessor2D { protected: // the destination OutDev diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index 010fba3b1f1d..f2277670796d 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -71,7 +71,7 @@ namespace drawinglayer rasterconvertB3DPolyPolygon for filled geometry is called. It is a beseclass to e.g. base a Z-Buffer supported renderer on the 3D primitive processing. */ - class DRAWINGLAYER_DLLPUBLIC DefaultProcessor3D : public BaseProcessor3D + class DefaultProcessor3D : public BaseProcessor3D { protected: /// read-only scene infos (normal handling, etc...) diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx index 8570809b465d..fd05c088457b 100644 --- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle transparent content. */ - class DRAWINGLAYER_DLLPUBLIC ZBufferProcessor3D : public DefaultProcessor3D + class ZBufferProcessor3D : public DefaultProcessor3D { private: /// the raster target, a Z-Buffer diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index def4dfec6e09..28c4be55265e 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -24,9 +24,8 @@ #include #include #include -#include #include -#include +#include #include ////////////////////////////////////////////////////////////////////////////// @@ -128,9 +127,9 @@ namespace sdr // if there is something to show, use a vclProcessor to render it if(xPrimitiveSequence.hasElements()) { - drawinglayer::processor2d::BaseProcessor2D* pProcessor2D = - drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice( - *pTargetDevice, getViewInformation2D()); + drawinglayer::processor2d::BaseProcessor2D* pProcessor2D = drawinglayer::processor2d::createProcessor2DFromOutputDevice( + *pTargetDevice, + getViewInformation2D()); if(pProcessor2D) { diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index d53539ffceb8..bbc69ed7a4ab 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -29,11 +29,10 @@ #include #include #include -#include #include #include -#include #include +#include #include ////////////////////////////////////////////////////////////////////////////// @@ -240,7 +239,7 @@ namespace sdr // if there is something to show, use a primitive processor to render it. There // is a choice between VCL and Canvas processors currently. The decision is made in - // createBaseProcessor2DFromOutputDevice and takes into accout things like the + // createProcessor2DFromOutputDevice and takes into accout things like the // Target is a MetaFile, a VDev or something else. The Canvas renderer is triggered // currently using the shown boolean. Canvas is not yet the default. if(xPrimitiveSequence.hasElements()) @@ -251,7 +250,7 @@ namespace sdr // create renderer drawinglayer::processor2d::BaseProcessor2D* pProcessor2D = - drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice( + drawinglayer::processor2d::createProcessor2DFromOutputDevice( rTargetOutDev, getViewInformation2D()); if(pProcessor2D) diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index d9a0ef4772ac..2509d16bbbaf 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -25,8 +25,7 @@ #include #include #include -#include -#include +#include ////////////////////////////////////////////////////////////////////////////// @@ -48,10 +47,9 @@ namespace sdr const bool bIsAntiAliasing(getDrawinglayerOpt().IsAntiAliasing()); // create processor - drawinglayer::processor2d::BaseProcessor2D* pProcessor = - ::drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice( - rDestinationDevice, - getCurrentViewInformation2D()); + drawinglayer::processor2d::BaseProcessor2D* pProcessor = drawinglayer::processor2d::createProcessor2DFromOutputDevice( + rDestinationDevice, + getCurrentViewInformation2D()); if(pProcessor) { diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index 823eb74978e5..33dcbc3a19b4 100644 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx @@ -20,8 +20,6 @@ #include #include -#include -#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 492b0a754365..150cc25ecd77 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -59,8 +59,7 @@ #include #include #include -#include -#include +#include //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -343,8 +342,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang { // completely reworked to use primitives; this ensures same look and functionality const drawinglayer::geometry::ViewInformation2D aViewInformation2D; - - drawinglayer::processor2d::BaseProcessor2D* pProcessor = drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice( + drawinglayer::processor2d::BaseProcessor2D* pProcessor = drawinglayer::processor2d::createProcessor2DFromOutputDevice( rTargetDevice, aViewInformation2D); diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 88eeedbe365d..ee0565fc52a6 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -64,16 +64,14 @@ #include #include #include - #include #include #include // #i99665# - #include -#include #include #include #include +#include using namespace com::sun::star; @@ -762,7 +760,7 @@ bool paintUsingPrimitivesHelper( // get a primitive processor for rendering drawinglayer::processor2d::BaseProcessor2D* pProcessor2D = - drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice( + drawinglayer::processor2d::createProcessor2DFromOutputDevice( rOutputDevice, aViewInformation2D); if(pProcessor2D)