drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 12 +++---- drawinglayer/source/dumper/XShapeDumper.cxx | 34 ++++++++++----------- 2 files changed, 23 insertions(+), 23 deletions(-)
New commits: commit 9ae07fcc7791ca9324f9e60b2b66d1023a69d9b4 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Jul 19 10:46:49 2012 +0200 Work around bogus Mac GCC uninitialized warnings Change-Id: If16ce75845383cf697a2f1e4cef438a8bc43c125 diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx index a0ad98a..d24fea1 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx @@ -831,13 +831,13 @@ void EnhancedShapeDumper::dumpEnhancedCustomShapePathService(uno::Reference< bea } { uno::Any anotherAny = xPropSet->getPropertyValue("StretchX"); - sal_Int32 aStretchX; + sal_Int32 aStretchX = sal_Int32(); if(anotherAny >>= aStretchX) dumpStretchXAsAttribute(aStretchX); } { uno::Any anotherAny = xPropSet->getPropertyValue("StretchY"); - sal_Int32 aStretchY; + sal_Int32 aStretchY = sal_Int32(); if(anotherAny >>= aStretchY) dumpStretchYAsAttribute(aStretchY); } @@ -861,25 +861,25 @@ void EnhancedShapeDumper::dumpEnhancedCustomShapePathService(uno::Reference< bea } { uno::Any anotherAny = xPropSet->getPropertyValue("GluePointType"); - sal_Int32 aGluePointType; + sal_Int32 aGluePointType = sal_Int32(); if(anotherAny >>= aGluePointType) dumpGluePointTypeAsAttribute(aGluePointType); } { uno::Any anotherAny = xPropSet->getPropertyValue("ExtrusionAllowed"); - sal_Bool bExtrusionAllowed; + sal_Bool bExtrusionAllowed = sal_Bool(); if(anotherAny >>= bExtrusionAllowed) dumpExtrusionAllowedAsAttribute(bExtrusionAllowed); } { uno::Any anotherAny = xPropSet->getPropertyValue("ConcentricGradientFillAllowed"); - sal_Bool bConcentricGradientFillAllowed; + sal_Bool bConcentricGradientFillAllowed = sal_Bool(); if(anotherAny >>= bConcentricGradientFillAllowed) dumpConcentricGradientFillAllowedAsAttribute(bConcentricGradientFillAllowed); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextPathAllowed"); - sal_Bool bTextPathAllowed; + sal_Bool bTextPathAllowed = sal_Bool(); if(anotherAny >>= bTextPathAllowed) dumpTextPathAllowedAsAttribute(bTextPathAllowed); } diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index ee588be..37bf0f4 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -1146,25 +1146,25 @@ void dumpTextPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x if(xInfo->hasPropertyByName("IsNumbering")) { uno::Any anotherAny = xPropSet->getPropertyValue("IsNumbering"); - sal_Bool bIsNumbering; + sal_Bool bIsNumbering = sal_Bool(); if(anotherAny >>= bIsNumbering) dumpIsNumberingAsAttribute(bIsNumbering, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextAutoGrowHeight"); - sal_Bool bTextAutoGrowHeight; + sal_Bool bTextAutoGrowHeight = sal_Bool(); if(anotherAny >>= bTextAutoGrowHeight) dumpTextAutoGrowHeightAsAttribute(bTextAutoGrowHeight, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextAutoGrowWidth"); - sal_Bool bTextAutoGrowWidth; + sal_Bool bTextAutoGrowWidth = sal_Bool(); if(anotherAny >>= bTextAutoGrowWidth) dumpTextAutoGrowWidthAsAttribute(bTextAutoGrowWidth, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextContourFrame"); - sal_Bool bTextContourFrame; + sal_Bool bTextContourFrame = sal_Bool(); if(anotherAny >>= bTextContourFrame) dumpTextContourFrameAsAttribute(bTextContourFrame, xmlWriter); } @@ -1188,67 +1188,67 @@ void dumpTextPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("TextLeftDistance"); - sal_Int32 aTextLeftDistance; + sal_Int32 aTextLeftDistance = sal_Int32(); if(anotherAny >>= aTextLeftDistance) dumpTextLeftDistanceAsAttribute(aTextLeftDistance, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextRightDistance"); - sal_Int32 aTextRightDistance; + sal_Int32 aTextRightDistance = sal_Int32(); if(anotherAny >>= aTextRightDistance) dumpTextRightDistanceAsAttribute(aTextRightDistance, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextUpperDistance"); - sal_Int32 aTextUpperDistance; + sal_Int32 aTextUpperDistance = sal_Int32(); if(anotherAny >>= aTextUpperDistance) dumpTextUpperDistanceAsAttribute(aTextUpperDistance, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextLowerDistance"); - sal_Int32 aTextLowerDistance; + sal_Int32 aTextLowerDistance = sal_Int32(); if(anotherAny >>= aTextLowerDistance) dumpTextLowerDistanceAsAttribute(aTextLowerDistance, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextMaximumFrameHeight"); - sal_Int32 aTextMaximumFrameHeight; + sal_Int32 aTextMaximumFrameHeight = sal_Int32(); if(anotherAny >>= aTextMaximumFrameHeight) dumpTextMaximumFrameHeightAsAttribute(aTextMaximumFrameHeight, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextMaximumFrameWidth"); - sal_Int32 aTextMaximumFrameWidth; + sal_Int32 aTextMaximumFrameWidth = sal_Int32(); if(anotherAny >>= aTextMaximumFrameWidth) dumpTextMaximumFrameWidthAsAttribute(aTextMaximumFrameWidth, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextMinimumFrameHeight"); - sal_Int32 aTextMinimumFrameHeight; + sal_Int32 aTextMinimumFrameHeight = sal_Int32(); if(anotherAny >>= aTextMinimumFrameHeight) dumpTextMinimumFrameHeightAsAttribute(aTextMinimumFrameHeight, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextMinimumFrameWidth"); - sal_Int32 aTextMinimumFrameWidth; + sal_Int32 aTextMinimumFrameWidth = sal_Int32(); if(anotherAny >>= aTextMinimumFrameWidth) dumpTextMinimumFrameWidthAsAttribute(aTextMinimumFrameWidth, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextAnimationAmount"); - sal_Int32 aTextAnimationAmount; + sal_Int32 aTextAnimationAmount = sal_Int32(); if(anotherAny >>= aTextAnimationAmount) dumpTextAnimationAmountAsAttribute(aTextAnimationAmount, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextAnimationCount"); - sal_Int32 aTextAnimationCount; + sal_Int32 aTextAnimationCount = sal_Int32(); if(anotherAny >>= aTextAnimationCount) dumpTextAnimationCountAsAttribute(aTextAnimationCount, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextAnimationDelay"); - sal_Int32 aTextAnimationDelay; + sal_Int32 aTextAnimationDelay = sal_Int32(); if(anotherAny >>= aTextAnimationDelay) dumpTextAnimationDelayAsAttribute(aTextAnimationDelay, xmlWriter); } @@ -1266,13 +1266,13 @@ void dumpTextPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("TextAnimationStartInside"); - sal_Bool bTextAnimationStartInside; + sal_Bool bTextAnimationStartInside = sal_Bool(); if(anotherAny >>= bTextAnimationStartInside) dumpTextAnimationStartInsideAsAttribute(bTextAnimationStartInside, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("TextAnimationStopInside"); - sal_Bool bTextAnimationStopInside; + sal_Bool bTextAnimationStopInside = sal_Bool(); if(anotherAny >>= bTextAnimationStopInside) dumpTextAnimationStopInsideAsAttribute(bTextAnimationStopInside, xmlWriter); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits