#i39532# finetuning

2 files changed, 19 insertions, 4 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
index 985a69e7a791..069464533695 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: controlprimitive2d.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2007-03-06 12:30:46 $
+ *  last change: $Author: aw $ $Date: 2007-10-15 16:10:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -88,11 +88,21 @@ namespace drawinglayer
                 const basegfx::B2DHomMatrix& rTransform,
                 const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& rxControlModel);
 
+            // constructor with an additional XControl as parameter to allow to hand it over at incarnation time
+            // if it exists. This will avoid to create a 2nd one on demand in createXControl()
+            // and thus double the XControls.
+            ControlPrimitive2D(
+                const basegfx::B2DHomMatrix& rTransform,
+                const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& rxControlModel,
+                const com::sun::star::uno::Reference< com::sun::star::awt::XControl >& rxXControl);
+
             // get data
             const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
             const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& getControlModel() const { return mxControlModel; }
 
             // mxControl access. This will on demand create the awt::XControl using createXControl()
+            // if it does not exist. It may already have been created or even handed over at
+            // incarnation
             const com::sun::star::uno::Reference< com::sun::star::awt::XControl >& getXControl() const;
 
             // compare operator
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
index 593239caa0bd..8d51b201593f 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: vclprocessor2d.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: aw $ $Date: 2007-09-20 09:51:21 $
+ *  last change: $Author: aw $ $Date: 2007-10-15 16:10:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -71,6 +71,7 @@ namespace drawinglayer { namespace primitive2d {
     class PointArrayPrimitive2D;
     class ModifiedColorPrimitive2D;
     class WrongSpellPrimitive2D;
+    class ControlPrimitive2D;
 }}
 
 //////////////////////////////////////////////////////////////////////////////
@@ -109,6 +110,10 @@ namespace drawinglayer
             void RenderPointArrayPrimitive2D(const primitive2d::PointArrayPrimitive2D& rPointArrayCandidate);
             void RenderWrongSpellPrimitive2D(const primitive2d::WrongSpellPrimitive2D& rWrongSpellCandidate);
 
+            /////////////////////////////////////////////////////////////////////////////
+            // FormControl support
+            basegfx::B2DPoint PositionAndSizeControl(const primitive2d::ControlPrimitive2D& rControlPrimitive2D);
+
             // as tooling, the process() implementation takes over API handling and calls this
             // virtual render method when the primitive implementation is BasePrimitive2D-based.
             virtual void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) = 0;