summaryrefslogtreecommitdiff
path: root/include/drawinglayer/processor2d
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-01-30 12:10:59 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-17 09:23:26 +0100
commitd1310b7628a68fe13284818ba4a5d38eaef742c4 (patch)
treece32baf72bb637d5dcd68eab7c263a542d1c82ef /include/drawinglayer/processor2d
parenta074ee056a8b73fc14724522a5c0d1c34850c529 (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 'include/drawinglayer/processor2d')
-rw-r--r--include/drawinglayer/processor2d/processor2dtools.hxx79
-rw-r--r--include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx2
-rw-r--r--include/drawinglayer/processor2d/vclpixelprocessor2d.hxx2
-rw-r--r--include/drawinglayer/processor2d/vclprocessor2d.hxx2
4 files changed, 82 insertions, 3 deletions
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 <drawinglayer/drawinglayerdllapi.h>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// 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