#103641# fixed possible duplicated attributes

3 files changed, 137 insertions, 122 deletions

diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 9ac659c31763..34b979bf9f9b 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GradientStyle.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: thb $ $Date: 2001-10-23 10:05:52 $
+ *  last change: $Author: cl $ $Date: 2002-09-25 16:19:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -311,69 +311,74 @@ sal_Bool XMLGradientStyleExport::exportXML(
             SvXMLUnitConverter& rUnitConverter =
                 rExport.GetMM100UnitConverter();
 
-            // Name
-            OUString aStrName( rStrName );
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStrName );
-
             // Style
             if( !rUnitConverter.convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
-                return sal_False;
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
-
-            // Center x/y
-            if( aGradient.Style != awt::GradientStyle_LINEAR &&
-                aGradient.Style != awt::GradientStyle_AXIAL   )
             {
-                rUnitConverter.convertPercent( aOut, aGradient.XOffset );
-                aStrValue = aOut.makeStringAndClear();
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
+                bRet = sal_False;
+            }
+            else
+            {
+                // Name
+                OUString aStrName( rStrName );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStrName );
 
-                rUnitConverter.convertPercent( aOut, aGradient.YOffset );
                 aStrValue = aOut.makeStringAndClear();
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
-            }
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
 
-            Color aColor;
+                // Center x/y
+                if( aGradient.Style != awt::GradientStyle_LINEAR &&
+                    aGradient.Style != awt::GradientStyle_AXIAL   )
+                {
+                    rUnitConverter.convertPercent( aOut, aGradient.XOffset );
+                    aStrValue = aOut.makeStringAndClear();
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
 
-            // Color start
-            aColor.SetColor( aGradient.StartColor );
-            rUnitConverter.convertColor( aOut, aColor );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START_COLOR, aStrValue );
+                    rUnitConverter.convertPercent( aOut, aGradient.YOffset );
+                    aStrValue = aOut.makeStringAndClear();
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
+                }
+
+                Color aColor;
 
-            // Color end
-            aColor.SetColor( aGradient.EndColor );
-            rUnitConverter.convertColor( aOut, aColor );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END_COLOR, aStrValue );
+                // Color start
+                aColor.SetColor( aGradient.StartColor );
+                rUnitConverter.convertColor( aOut, aColor );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START_COLOR, aStrValue );
 
-            // Intensity start
-            rUnitConverter.convertPercent( aOut, aGradient.StartIntensity );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START_INTENSITY, aStrValue );
+                // Color end
+                aColor.SetColor( aGradient.EndColor );
+                rUnitConverter.convertColor( aOut, aColor );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END_COLOR, aStrValue );
 
-            // Intensity end
-            rUnitConverter.convertPercent( aOut, aGradient.EndIntensity );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END_INTENSITY, aStrValue );
+                // Intensity start
+                rUnitConverter.convertPercent( aOut, aGradient.StartIntensity );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START_INTENSITY, aStrValue );
 
-            // Angle
-            if( aGradient.Style != awt::GradientStyle_RADIAL )
-            {
-                rUnitConverter.convertNumber( aOut, sal_Int32( aGradient.Angle ) );
+                // Intensity end
+                rUnitConverter.convertPercent( aOut, aGradient.EndIntensity );
                 aStrValue = aOut.makeStringAndClear();
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
-            }
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END_INTENSITY, aStrValue );
 
-            // Border
-            rUnitConverter.convertPercent( aOut, aGradient.Border );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
+                // Angle
+                if( aGradient.Style != awt::GradientStyle_RADIAL )
+                {
+                    rUnitConverter.convertNumber( aOut, sal_Int32( aGradient.Angle ) );
+                    aStrValue = aOut.makeStringAndClear();
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
+                }
 
-            // Do Write
-            SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_GRADIENT,
+                // Border
+                rUnitConverter.convertPercent( aOut, aGradient.Border );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
+
+                // Do Write
+                SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_GRADIENT,
                                       sal_True, sal_False );
+            }
         }
     }
 
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 4938dad60cf7..bb44d96dc350 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HatchStyle.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: cl $ $Date: 2001-10-25 16:03:55 $
+ *  last change: $Author: cl $ $Date: 2002-09-25 16:19:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -262,33 +262,38 @@ sal_Bool XMLHatchStyleExport::exportXML(
             SvXMLUnitConverter& rUnitConverter =
                 rExport.GetMM100UnitConverter();
 
-            // Name
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
-
             // Style
             if( !rUnitConverter.convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
-                return sal_False;
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
-
-            // Color
-            rUnitConverter.convertColor( aOut, Color( aHatch.Color ) );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, aStrValue );
-
-            // Distance
-            rUnitConverter.convertMeasure( aOut, aHatch.Distance );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HATCH_DISTANCE, aStrValue );
-
-            // Angle
-            rUnitConverter.convertNumber( aOut, sal_Int32( aHatch.Angle ) );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ROTATION, aStrValue );
-
-            // Do Write
-            SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_HATCH,
-                                      sal_True, sal_False );
+            {
+                bRet = sal_False;
+            }
+            else
+            {
+                // Name
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
+
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
+
+                // Color
+                rUnitConverter.convertColor( aOut, Color( aHatch.Color ) );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, aStrValue );
+
+                // Distance
+                rUnitConverter.convertMeasure( aOut, aHatch.Distance );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HATCH_DISTANCE, aStrValue );
+
+                // Angle
+                rUnitConverter.convertNumber( aOut, sal_Int32( aHatch.Angle ) );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ROTATION, aStrValue );
+
+                // Do Write
+                SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_HATCH,
+                                          sal_True, sal_False );
+            }
         }
     }
 
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index f765efae81bb..9a2ef3b04c4e 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransGradientStyle.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: thb $ $Date: 2001-10-23 10:05:52 $
+ *  last change: $Author: cl $ $Date: 2002-09-25 16:19:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -301,62 +301,67 @@ sal_Bool XMLTransGradientStyleExport::exportXML(
             SvXMLUnitConverter& rUnitConverter =
                 rExport.GetMM100UnitConverter();
 
-            // Name
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
-
             // Style
             if( !rUnitConverter.convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
-                return sal_False;
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
-
-            // Center x/y
-            if( aGradient.Style != awt::GradientStyle_LINEAR &&
-                aGradient.Style != awt::GradientStyle_AXIAL   )
             {
-                rUnitConverter.convertPercent( aOut, aGradient.XOffset );
-                aStrValue = aOut.makeStringAndClear();
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
+                bRet = sal_False;
+            }
+            else
+            {
+                // Name
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
 
-                rUnitConverter.convertPercent( aOut, aGradient.YOffset );
                 aStrValue = aOut.makeStringAndClear();
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
-            }
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
 
+                // Center x/y
+                if( aGradient.Style != awt::GradientStyle_LINEAR &&
+                    aGradient.Style != awt::GradientStyle_AXIAL   )
+                {
+                    rUnitConverter.convertPercent( aOut, aGradient.XOffset );
+                    aStrValue = aOut.makeStringAndClear();
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
 
-            Color aColor;
+                    rUnitConverter.convertPercent( aOut, aGradient.YOffset );
+                    aStrValue = aOut.makeStringAndClear();
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
+                }
 
-            // Transparency start
-            aColor.SetColor( aGradient.StartColor );
-            sal_Int32 aStartValue = (sal_Int32)(((aColor.GetRed() + 1) * 100) / 255);
-            rUnitConverter.convertPercent( aOut, aStartValue );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START, aStrValue );
 
-            // Transparency end
-            aColor.SetColor( aGradient.EndColor );
-            sal_Int32 aEndValue = (sal_Int32)(((aColor.GetRed() + 1) * 100) / 255);
-            rUnitConverter.convertPercent( aOut, aEndValue );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END, aStrValue );
+                Color aColor;
 
-            // Angle
-            if( aGradient.Style != awt::GradientStyle_RADIAL )
-            {
-                rUnitConverter.convertNumber( aOut, sal_Int32( aGradient.Angle ) );
+                // Transparency start
+                aColor.SetColor( aGradient.StartColor );
+                sal_Int32 aStartValue = (sal_Int32)(((aColor.GetRed() + 1) * 100) / 255);
+                rUnitConverter.convertPercent( aOut, aStartValue );
                 aStrValue = aOut.makeStringAndClear();
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
-            }
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START, aStrValue );
+
+                // Transparency end
+                aColor.SetColor( aGradient.EndColor );
+                sal_Int32 aEndValue = (sal_Int32)(((aColor.GetRed() + 1) * 100) / 255);
+                rUnitConverter.convertPercent( aOut, aEndValue );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END, aStrValue );
+
+                // Angle
+                if( aGradient.Style != awt::GradientStyle_RADIAL )
+                {
+                    rUnitConverter.convertNumber( aOut, sal_Int32( aGradient.Angle ) );
+                    aStrValue = aOut.makeStringAndClear();
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
+                }
 
-            // Border
-            rUnitConverter.convertPercent( aOut, aGradient.Border );
-            aStrValue = aOut.makeStringAndClear();
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
+                // Border
+                rUnitConverter.convertPercent( aOut, aGradient.Border );
+                aStrValue = aOut.makeStringAndClear();
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
 
-            // Do Write
-            SvXMLElementExport rElem( rExport,
-                                      XML_NAMESPACE_DRAW, XML_TRANSPARENCY,
-                                      sal_True, sal_False );
+                // Do Write
+                SvXMLElementExport rElem( rExport,
+                                          XML_NAMESPACE_DRAW, XML_TRANSPARENCY,
+                                          sal_True, sal_False );
+            }
         }
     }