From 7566d20155bf137a51fe038a9f55e992021cb0c0 Mon Sep 17 00:00:00 2001
From: Armin Weiss <aw@openoffice.org>
Date: Tue, 24 Jul 2001 14:53:45 +0000
Subject: #89764# if export of position is supressed for group shape, positions
 of contained objects should be written relative to the upper left edge of the
 group.

---
 xmloff/source/draw/shapeexport2.cxx | 16 ++++++++++++++--
 xmloff/source/draw/shapeexport3.cxx | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 3cc68d095645..7865c3ba74e9 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shapeexport2.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: bm $ $Date: 2001-07-02 13:24:00 $
+ *  last change: $Author: aw $ $Date: 2001-07-24 15:53:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -557,6 +557,18 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape
         ImpExportEvents( xShape );
         ImpExportGluePoints( xShape );
 
+        // #89764# if export of position is supressed for group shape,
+        // positions of contained objects should be written relative to
+        // the upper left edge of the group.
+        awt::Point aUpperLeft;
+
+        if(!(nFeatures & SEF_EXPORT_POSITION))
+        {
+            nFeatures |= SEF_EXPORT_POSITION;
+            aUpperLeft = xShape->getPosition();
+            pRefPoint = &aUpperLeft;
+        }
+
         // write members
         exportShapes( xShapes, nFeatures, pRefPoint );
     }
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index 1d0cff60948a..50c62d042f7e 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shapeexport3.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: aw $ $Date: 2001-07-24 15:53:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -165,6 +165,18 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap
             // write 3DSceneLights
             export3DLamps( xPropSet );
 
+            // #89764# if export of position is supressed for group shape,
+            // positions of contained objects should be written relative to
+            // the upper left edge of the group.
+            awt::Point aUpperLeft;
+
+            if(!(nFeatures & SEF_EXPORT_POSITION))
+            {
+                nFeatures |= SEF_EXPORT_POSITION;
+                aUpperLeft = xShape->getPosition();
+                pRefPoint = &aUpperLeft;
+            }
+
             // write members
             exportShapes( xShapes, nFeatures, pRefPoint );
         }
-- 
cgit