diff options
| author | Armin Le Grand <alg@apache.org> | 2013-01-30 12:10:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-17 09:23:26 +0100 |
| commit | d1310b7628a68fe13284818ba4a5d38eaef742c4 (patch) | |
| tree | ce32baf72bb637d5dcd68eab7c263a542d1c82ef /sw | |
| parent | a074ee056a8b73fc14724522a5c0d1c34850c529 (diff) | |
Related: #i121532# unified processor2d usages from other modules
(cherry picked from commit f371f92c89d296207ef9a219518ba8caa481bcfe)
Conflicts:
drawinglayer/Library_drawinglayer.mk
drawinglayer/Package_inc.mk
drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
drawinglayer/source/processor2d/processor2dtools.cxx
svx/Package_inc.mk
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
svx/source/sdr/contact/objectcontactofpageview.cxx
svx/source/sdr/overlay/overlaymanager.cxx
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
svx/source/svdraw/svdedxv.cxx
sw/source/core/doc/notxtfrm.cxx
Change-Id: Iea4a79133f4375cb0625b187eeb3d727b50ff0fe
Related: #i121532# missing defaultprocessor3d.hxx breaks build
Revision 1440387 changed defaultprocessor3d.hxx to be no longer "delivered".
It is needed in svx by being included indirectly via cutfindprocessor3d.hxx.
Fixing the build breaker by "delivering" the missing header file again.
(cherry picked from commit 3bd3ea81c8d54109950b435225c3aac011d56c3d)
Conflicts:
drawinglayer/Package_inc.mk
Change-Id: If0dcea79cfff4cf20a1ca1af3d0a34f86eb2e24e
Related: #i121532# removed include to no longer existing file
(cherry picked from commit a4c602d9b5b17e220dbaa4dec2cef91d39945154)
Conflicts:
sw/source/core/doc/notxtfrm.cxx
Change-Id: I7dc2f99684fa285225dfdcfc7add553695b8412e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
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 <accessibilityoptions.hxx> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/EmbedStates.hpp> - #include <svtools/embedhlp.hxx> #include <svx/charthelper.hxx> #include <dview.hxx> // #i99665# - #include <basegfx/matrix/b2dhommatrix.hxx> -#include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <drawinglayer/processor2d/processor2dtools.hxx> 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) |