From d566256b78f56bfb2e6eba747d54087527ba4baf Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Fri, 19 Dec 2014 22:01:19 +0100
Subject: xShapeGroup *is* the control's global xShape, so use it as such

this allows the rest of the code to automagically do the right stuff:
 - get&set position
 - group this control with its label
 - set the label property to the label control
 - ...

Conflicts:
	wizards/com/sun/star/wizards/document/TimeStampControl.java

Change-Id: Ibf3cb0ae82ba5c8a23fde05f6466f8eec8308186
---
 .../com/sun/star/wizards/document/TimeStampControl.java | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'wizards')

diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 42b8b5351d89..0fced1d3b595 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -40,7 +40,6 @@ public class TimeStampControl extends DatabaseControl
     private double nreldatewidth;
     private double nreltimewidth;
     private int nDBWidth;
-    private XShape xShapeGroup;
 
     public TimeStampControl(Resource _oResource, FormHandler _oFormHandler, XNameContainer _xFormName, String _curFieldName, Point _aPoint)
     {
@@ -57,7 +56,7 @@ public class TimeStampControl extends DatabaseControl
         nDBWidth = nDateWidth + nTimeWidth + 10;
         xShapes.add(oDateControl.xShape);
         xShapes.add(oTimeControl.xShape);
-        xShapeGroup = _oFormHandler.xShapeGrouper.group(xShapes);
+        xShape = _oFormHandler.xShapeGrouper.group(xShapes);
         nreldatewidth = 1.0 / ((double) getSize().Width / (double) nDateWidth);
         nreltimewidth = 1.0 - nreldatewidth;
     }
@@ -122,20 +121,6 @@ public class TimeStampControl extends DatabaseControl
         return new Size(ncontrolwidth, oDateControl.xShape.getSize().Height);
     }
 
-    public Point getPosition()
-    {
-        return xShapeGroup.getPosition();
-    }
-
-    public void setPosition(Point _aPoint)
-    {
-        // --> TESTING
-        Point aBeforePt = xShapeGroup.getPosition();
-        xShapeGroup.setPosition(_aPoint);
-        // --> TESTING
-        Point aAfterPt = xShapeGroup.getPosition();
-    }
-
     public int getControlType()
     {
         return FormHandler.SODATETIMECONTROL;
-- 
cgit