moved createBaseProcessor2DFromOutputDevice to drawinglayer module
Change-Id: Ia1c30f93eb20f88d989987265b1ddbc964deb390
This commit is contained in:
Cédric Bosdonnat
parent
8b1f298150
commit
eb1c174f26
16 changed files with 40 additions and 38 deletions
|
|
@ -158,6 +158,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
|
|||
drawinglayer/source/processor2d/helperwrongspellrenderer \
|
||||
drawinglayer/source/processor2d/hittestprocessor2d \
|
||||
drawinglayer/source/processor2d/linegeometryextractor2d \
|
||||
drawinglayer/source/processor2d/processorfromoutputdevice \
|
||||
drawinglayer/source/processor2d/textaspolygonextractor2d \
|
||||
drawinglayer/source/processor2d/vclhelperbitmaprender \
|
||||
drawinglayer/source/processor2d/vclhelperbitmaptransform \
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@ $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/
|
|||
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/canvasprocessor.hxx,drawinglayer/processor2d/canvasprocessor.hxx))
|
||||
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/contourextractor2d.hxx,drawinglayer/processor2d/contourextractor2d.hxx))
|
||||
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/hittestprocessor2d.hxx,drawinglayer/processor2d/hittestprocessor2d.hxx))
|
||||
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/processorfromoutputdevice.hxx,drawinglayer/processor2d/processorfromoutputdevice.hxx))
|
||||
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/linegeometryextractor2d.hxx,drawinglayer/processor2d/linegeometryextractor2d.hxx))
|
||||
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx,drawinglayer/processor2d/textaspolygonextractor2d.hxx))
|
||||
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx,drawinglayer/processor2d/vclmetafileprocessor2d.hxx))
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
*
|
||||
************************************************************************/
|
||||
|
||||
#ifndef _SDR_CONTACT_OBJECTCONTACTTOOLS_HXX
|
||||
#define _SDR_CONTACT_OBJECTCONTACTTOOLS_HXX
|
||||
#ifndef _PROCESSOR_FROM_OUTPUTDEVICE_HXX
|
||||
#define _PROCESSOR_FROM_OUTPUTDEVICE_HXX
|
||||
|
||||
#include <drawinglayer/geometry/viewinformation2d.hxx>
|
||||
#include "svx/svxdllapi.h"
|
||||
#include "drawinglayer/drawinglayerdllapi.h"
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
// predeclarations
|
||||
|
|
@ -43,23 +43,23 @@ namespace drawinglayer { namespace processor2d {
|
|||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
namespace sdr
|
||||
namespace drawinglayer
|
||||
{
|
||||
namespace contact
|
||||
namespace processor2d
|
||||
{
|
||||
// create a mating VCL-Provessor for given OutputDevice. This includes
|
||||
// looking for MetaFile-recording. The returned renderer changes owner,
|
||||
// deletion is duty of the caller
|
||||
SVX_DLLPUBLIC drawinglayer::processor2d::BaseProcessor2D* createBaseProcessor2DFromOutputDevice(
|
||||
DRAWINGLAYER_DLLPUBLIC drawinglayer::processor2d::BaseProcessor2D* createBaseProcessor2DFromOutputDevice(
|
||||
OutputDevice& rTargetOutDev,
|
||||
const drawinglayer::geometry::ViewInformation2D& rViewInformation2D);
|
||||
|
||||
} // end of namespace contact
|
||||
} // end of namespace sdr
|
||||
} // end of namespace processor2d
|
||||
} // end of namespace drawinglayer
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#endif //_SDR_CONTACT_OBJECTCONTACTTOOLS_HXX
|
||||
#endif //_PROCESSOR_FROM_OUTPUTDEVICE_HXX
|
||||
|
||||
// eof
|
||||
|
||||
|
|
@ -27,12 +27,12 @@
|
|||
************************************************************************/
|
||||
|
||||
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <vcl/outdev.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <basegfx/range/b2drange.hxx>
|
||||
#include <vcl/gdimtf.hxx>
|
||||
#include <basegfx/tools/canvastools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <drawinglayer/processor2d/vclmetafileprocessor2d.hxx>
|
||||
#include <drawinglayer/processor2d/vclpixelprocessor2d.hxx>
|
||||
#include <drawinglayer/processor2d/canvasprocessor.hxx>
|
||||
|
|
@ -44,9 +44,9 @@ using namespace com::sun::star;
|
|||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
namespace sdr
|
||||
namespace drawinglayer
|
||||
{
|
||||
namespace contact
|
||||
namespace processor2d
|
||||
{
|
||||
drawinglayer::processor2d::BaseProcessor2D* createBaseProcessor2DFromOutputDevice(
|
||||
OutputDevice& rTargetOutDev,
|
||||
|
|
@ -96,8 +96,8 @@ namespace sdr
|
|||
#endif
|
||||
}
|
||||
}
|
||||
} // end of namespace contact
|
||||
} // end of namespace sdr
|
||||
} // end of namespace processor2d
|
||||
} // end of namespace drawinglayer
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
// eof
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
#include <drawinglayer/geometry/viewinformation2d.hxx>
|
||||
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <vcl/lineinfo.hxx>
|
||||
#include <vcl/gradient.hxx>
|
||||
#include <svx/unoapi.hxx>
|
||||
|
|
@ -1806,7 +1806,7 @@ drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( )
|
|||
0.0,
|
||||
uno::Sequence< beans::PropertyValue >() );
|
||||
|
||||
return sdr::contact::createBaseProcessor2DFromOutputDevice(
|
||||
return drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
*pDev, aNewViewInfos );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -174,7 +174,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
|
|||
svx/source/sdr/contact/viewcontact \
|
||||
svx/source/sdr/contact/viewcontactofsdrole2obj \
|
||||
svx/source/sdr/contact/displayinfo \
|
||||
svx/source/sdr/contact/objectcontacttools \
|
||||
svx/source/sdr/contact/viewcontactofe3dscene \
|
||||
svx/source/sdr/contact/viewcontactofsdrrectobj \
|
||||
svx/source/sdr/contact/viewobjectcontactofsdrole2obj \
|
||||
|
|
|
|||
|
|
@ -244,7 +244,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive3d/sdrattributecr
|
|||
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dextrude.hxx,svx/sdr/contact/viewcontactofe3dextrude.hxx))
|
||||
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofvirtobj.hxx,svx/sdr/contact/viewcontactofvirtobj.hxx))
|
||||
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dscene.hxx,svx/sdr/contact/viewcontactofe3dscene.hxx))
|
||||
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontacttools.hxx,svx/sdr/contact/objectcontacttools.hxx))
|
||||
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontact.hxx,svx/sdr/contact/objectcontact.hxx))
|
||||
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofpageobj.hxx,svx/sdr/contact/viewcontactofpageobj.hxx))
|
||||
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dcube.hxx,svx/sdr/contact/viewcontactofe3dcube.hxx))
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include <svx/svdmodel.hxx>
|
||||
#include <drawinglayer/processor2d/vclprocessor2d.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <svx/unoapi.hxx>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -137,8 +137,9 @@ namespace sdr
|
|||
// if there is something to show, use a vclProcessor to render it
|
||||
if(xPrimitiveSequence.hasElements())
|
||||
{
|
||||
drawinglayer::processor2d::BaseProcessor2D* pProcessor2D = createBaseProcessor2DFromOutputDevice(
|
||||
*pTargetDevice, getViewInformation2D());
|
||||
drawinglayer::processor2d::BaseProcessor2D* pProcessor2D =
|
||||
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
*pTargetDevice, getViewInformation2D());
|
||||
|
||||
if(pProcessor2D)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#include <drawinglayer/processor2d/vclprocessor2d.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
|
||||
#include <svx/unoapi.hxx>
|
||||
|
||||
|
|
@ -259,8 +259,9 @@ namespace sdr
|
|||
pOutDev->SetLayoutMode(0); // reset, default is no BiDi/RTL
|
||||
|
||||
// create renderer
|
||||
drawinglayer::processor2d::BaseProcessor2D* pProcessor2D = createBaseProcessor2DFromOutputDevice(
|
||||
rTargetOutDev, getViewInformation2D());
|
||||
drawinglayer::processor2d::BaseProcessor2D* pProcessor2D =
|
||||
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
rTargetOutDev, getViewInformation2D());
|
||||
|
||||
if(pProcessor2D)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include <svx/sdr/overlay/overlayobject.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
@ -58,9 +58,10 @@ namespace sdr
|
|||
const bool bIsAntiAliasing(getDrawinglayerOpt().IsAntiAliasing());
|
||||
|
||||
// create processor
|
||||
drawinglayer::processor2d::BaseProcessor2D* pProcessor = ::sdr::contact::createBaseProcessor2DFromOutputDevice(
|
||||
rDestinationDevice,
|
||||
getCurrentViewInformation2D());
|
||||
drawinglayer::processor2d::BaseProcessor2D* pProcessor =
|
||||
::drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
rDestinationDevice,
|
||||
getCurrentViewInformation2D());
|
||||
|
||||
if(pProcessor)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include <basegfx/polygon/b2dpolypolygon.hxx>
|
||||
#include <basegfx/polygon/b2dpolygontools.hxx>
|
||||
#include <basegfx/polygon/b2dpolypolygontools.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
|
||||
#include <drawinglayer/geometry/viewinformation2d.hxx>
|
||||
#include <drawinglayer/processor2d/vclpixelprocessor2d.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <svx/sdr/overlay/overlaymanager.hxx>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
#include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
|
||||
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
|
||||
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <svx/unoapi.hxx>
|
||||
#include <comphelper/sequenceasvector.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
|
|
@ -4952,7 +4952,7 @@ drawinglayer::processor2d::BaseProcessor2D * SwFrm::CreateProcessor2D( ) const
|
|||
0.0,
|
||||
uno::Sequence< beans::PropertyValue >() );
|
||||
|
||||
return sdr::contact::createBaseProcessor2DFromOutputDevice(
|
||||
return drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
*getRootFrm()->GetCurrShell()->GetOut(),
|
||||
aNewViewInfos );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
|
||||
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
|
||||
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
|
||||
SwDashedLine::SwDashedLine( Window* pParent, Color& ( *pColorFn )() ) :
|
||||
|
|
@ -50,7 +50,7 @@ void SwDashedLine::Paint( const Rectangle& )
|
|||
{
|
||||
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
|
||||
drawinglayer::processor2d::BaseProcessor2D * pProcessor =
|
||||
sdr::contact::createBaseProcessor2DFromOutputDevice(
|
||||
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
*this, aNewViewInfos );
|
||||
|
||||
// Compute the start and end points
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
#include <editeng/boxitem.hxx>
|
||||
#include <svtools/svtresid.hxx>
|
||||
#include <svx/hdft.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <vcl/decoview.hxx>
|
||||
#include <vcl/gradient.hxx>
|
||||
#include <vcl/menubtn.hxx>
|
||||
|
|
@ -380,7 +380,7 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
|
|||
// Create the processor and process the primitives
|
||||
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
|
||||
drawinglayer::processor2d::BaseProcessor2D * pProcessor =
|
||||
sdr::contact::createBaseProcessor2DFromOutputDevice(
|
||||
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
*this, aNewViewInfos );
|
||||
|
||||
// TODO Ghost it all if needed
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
|
||||
#include <editeng/brkitem.hxx>
|
||||
#include <sfx2/dispatch.hxx>
|
||||
#include <svx/sdr/contact/objectcontacttools.hxx>
|
||||
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
|
||||
#define BUTTON_WIDTH 30
|
||||
|
|
@ -211,7 +211,7 @@ void SwPageBreakWin::Paint( const Rectangle& )
|
|||
// Create the processor and process the primitives
|
||||
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
|
||||
drawinglayer::processor2d::BaseProcessor2D * pProcessor =
|
||||
sdr::contact::createBaseProcessor2DFromOutputDevice(
|
||||
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
||||
*this, aNewViewInfos );
|
||||
|
||||
pProcessor->process( aGhostedSeq );
|
||||
|
|
|
|||
Loading…
Reference in a new issue