wizards/com/sun/star/wizards/document/Shape.java | 8 ++++++--
wizards/com/sun/star/wizards/form/FormDocument.java | 12 ++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 6f903afd4e94594a396f7e9087bd04c0eb84541c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 24 08:47:06 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Sep 24 18:08:41 2024 +0200
cid#1607381 PA: Public Attribute
Change-Id: I9aa852422a0ce3daa527599f9d3ed033b5943d04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173842
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/document/Shape.java
b/wizards/com/sun/star/wizards/document/Shape.java
index 72c17d7f84f1..45389fe89c53 100644
--- a/wizards/com/sun/star/wizards/document/Shape.java
+++ b/wizards/com/sun/star/wizards/document/Shape.java
@@ -36,8 +36,7 @@ import com.sun.star.wizards.common.Helper;
*/
public class Shape
{
-
- public XShape xShape;
+ protected XShape xShape;
protected FormHandler oFormHandler;
public XServiceInfo xServiceInfo;
protected Point aPoint;
@@ -128,4 +127,9 @@ public class Shape
{
xShape.setPosition(_aPoint);
}
+
+ public XShape getShape()
+ {
+ return xShape;
+ }
}
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java
b/wizards/com/sun/star/wizards/form/FormDocument.java
index cec2358658c6..810f640e5e36 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -368,7 +368,7 @@ public class FormDocument extends TextDocument
curArrangement = _curArrangement;
if (oGridControl != null)
{
- oFormHandler.xDrawPage.remove(oGridControl.xShape);
+ oFormHandler.xDrawPage.remove(oGridControl.getShape());
oGridControl.xComponent.dispose();
oGridControl = null;
}
@@ -446,7 +446,7 @@ public class FormDocument extends TextDocument
{
if (curArrangement == FormWizard.AS_GRID)
{
- return oGridControl.xShape.getSize().Height;
+ return oGridControl.getSize().Height;
}
else
{
@@ -458,7 +458,7 @@ public class FormDocument extends TextDocument
{
if (curArrangement == FormWizard.AS_GRID)
{
- return oGridControl.xShape.getPosition().Y;
+ return oGridControl.getPosition().Y;
}
else
{
@@ -543,13 +543,13 @@ public class FormDocument extends TextDocument
{
if ((oLabelControls[i] != null) && (oDBControls[i] !=
null))
{
- oFormHandler.removeShape(oLabelControls[i].xShape);
- oFormHandler.removeShape(oDBControls[i].xShape);
+
oFormHandler.removeShape(oLabelControls[i].getShape());
+
oFormHandler.removeShape(oDBControls[i].getShape());
}
}
else
{
- oFormHandler.groupShapesTogether(xMSF,
oLabelControls[i].xShape, oDBControls[i].xShape);
+ oFormHandler.groupShapesTogether(xMSF,
oLabelControls[i].getShape(), oDBControls[i].getShape());
}
}
}
